kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-14 01:49:05 +00:00
Code Issues Projects Releases Wiki Activity

eat inbound vid while playing fsv files

Browse Source
This commit is contained in:
Anthony Minessale
2012-01-17 12:19:23 -06:00
parent 362c571647
commit c358f67fe4
4 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/switch_core.c
View File

@@ -397,19 +397,37 @@ static void *SWITCH_THREAD_FUNC switch_core_service_thread(switch_thread_t *thre
switch_channel_set_flag(channel, CF_SERVICE);
while (switch_channel_test_flag(channel, CF_SERVICE)) {
switch (switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0)) {
case SWITCH_STATUS_SUCCESS:
case SWITCH_STATUS_TIMEOUT:
case SWITCH_STATUS_BREAK:
break;
default:
switch_channel_clear_flag(channel, CF_SERVICE);
continue;
if (switch_channel_test_flag(channel, CF_SERVICE_AUDIO)) {
switch (switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0)) {
case SWITCH_STATUS_SUCCESS:
case SWITCH_STATUS_TIMEOUT:
case SWITCH_STATUS_BREAK:
break;
default:
switch_channel_clear_flag(channel, CF_SERVICE);
break;
}
}
if (switch_channel_test_flag(channel, CF_SERVICE_VIDEO) && switch_channel_test_flag(channel, CF_VIDEO)) {
switch (switch_core_session_read_video_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0)) {
case SWITCH_STATUS_SUCCESS:
case SWITCH_STATUS_TIMEOUT:
case SWITCH_STATUS_BREAK:
break;
default:
switch_channel_clear_flag(channel, CF_SERVICE);
break;
}
}
}
switch_mutex_unlock(session->frame_read_mutex);
switch_channel_clear_flag(channel, CF_SERVICE_AUDIO);
switch_channel_clear_flag(channel, CF_SERVICE_VIDEO);
switch_core_session_rwunlock(session);
return NULL;
@@ -425,9 +443,14 @@ SWITCH_DECLARE(void) switch_core_thread_session_end(switch_core_session_t *sessi
switch_assert(channel);
switch_channel_clear_flag(channel, CF_SERVICE);
switch_channel_clear_flag(channel, CF_SERVICE_AUDIO);
switch_channel_clear_flag(channel, CF_SERVICE_VIDEO);
switch_core_session_kill_channel(session, SWITCH_SIG_BREAK);
}
SWITCH_DECLARE(void) switch_core_service_session(switch_core_session_t *session)
SWITCH_DECLARE(void) switch_core_service_session_av(switch_core_session_t *session, switch_bool_t audio, switch_bool_t video)
{
switch_channel_t *channel;
switch_assert(session);
@@ -435,6 +458,9 @@ SWITCH_DECLARE(void) switch_core_service_session(switch_core_session_t *session)
channel = switch_core_session_get_channel(session);
switch_assert(channel);
if (audio) switch_channel_set_flag(channel, CF_SERVICE_AUDIO);
if (video) switch_channel_set_flag(channel, CF_SERVICE_VIDEO);
switch_core_session_launch_thread(session, (void *(*)(switch_thread_t *,void *))switch_core_service_thread, session);
}