kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

break CF_MEDIA_PAUSE to CF_AUDIO_PAUSE and CF_VIDEO_PAUSE so we can control them separately

This commit is contained in:
Seven Du 2014-02-25 11:22:11 +08:00
parent f18fe5770d
commit f7dfe71c4c
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/include/switch_types.h
View File

@ -1267,6 +1267,10 @@ CF_EVENT_LOCK - Don't parse events
CF_RESET - Tell extension parser to reset CF_RESET - Tell extension parser to reset
CF_ORIGINATING - Channel is originating CF_ORIGINATING - Channel is originating
CF_STOP_BROADCAST - Signal to stop broadcast CF_STOP_BROADCAST - Signal to stop broadcast
CF_AUDIO_PAUSE - Audio is not ready to read/write
CF_VIDEO_PAUSE - Video is not ready to read/write
</pre> </pre>
*/ */
@ -1398,7 +1402,8 @@ typedef enum {
CF_VIDEO_ECHO, CF_VIDEO_ECHO,
CF_SLA_INTERCEPT, CF_SLA_INTERCEPT,
CF_VIDEO_BREAK, CF_VIDEO_BREAK,
CF_MEDIA_PAUSE, CF_AUDIO_PAUSE,
CF_VIDEO_PAUSE,
CF_BYPASS_MEDIA_AFTER_HOLD, CF_BYPASS_MEDIA_AFTER_HOLD,
/* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */ /* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */
/* IF YOU ADD NEW ONES CHECK IF THEY SHOULD PERSIST OR ZERO THEM IN switch_core_session.c switch_core_session_request_xml() */ /* IF YOU ADD NEW ONES CHECK IF THEY SHOULD PERSIST OR ZERO THEM IN switch_core_session.c switch_core_session_request_xml() */

3
src/mod/languages/mod_managed/managed/swig.2010.cs
View File

@ -26933,7 +26933,8 @@ public enum switch_channel_flag_t {
CF_VIDEO_ECHO, CF_VIDEO_ECHO,
CF_SLA_INTERCEPT, CF_SLA_INTERCEPT,
CF_VIDEO_BREAK, CF_VIDEO_BREAK,
CF_MEDIA_PAUSE, CF_AUDIO_PAUSE,
CF_VIDEO_PAUSE,
CF_BYPASS_MEDIA_AFTER_HOLD, CF_BYPASS_MEDIA_AFTER_HOLD,
CF_FLAG_MAX CF_FLAG_MAX
} }

3
src/mod/languages/mod_managed/managed/swig.cs
View File

@ -26940,7 +26940,8 @@ public enum switch_channel_flag_t {
CF_VIDEO_ECHO, CF_VIDEO_ECHO,
CF_SLA_INTERCEPT, CF_SLA_INTERCEPT,
CF_VIDEO_BREAK, CF_VIDEO_BREAK,
CF_MEDIA_PAUSE, CF_AUDIO_PAUSE,
CF_VIDEO_PAUSE,
CF_BYPASS_MEDIA_AFTER_HOLD, CF_BYPASS_MEDIA_AFTER_HOLD,
CF_FLAG_MAX CF_FLAG_MAX
} }

8
src/switch_core_io.c
View File

@ -46,7 +46,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(switch_cor
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
if (switch_channel_test_flag(session->channel, CF_MEDIA_PAUSE)) { if (switch_channel_test_flag(session->channel, CF_VIDEO_PAUSE)) {
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
@ -74,7 +74,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_video_frame(switch_core
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
if (switch_channel_test_flag(session->channel, CF_MEDIA_PAUSE)) { if (switch_channel_test_flag(session->channel, CF_VIDEO_PAUSE)) {
*frame = &runtime.dummy_cng_frame; *frame = &runtime.dummy_cng_frame;
switch_yield(20000); switch_yield(20000);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
@ -177,7 +177,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
if (switch_channel_test_flag(session->channel, CF_MEDIA_PAUSE)) { if (switch_channel_test_flag(session->channel, CF_AUDIO_PAUSE)) {
switch_yield(20000); switch_yield(20000);
*frame = &runtime.dummy_cng_frame; *frame = &runtime.dummy_cng_frame;
// switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Media Paused!!!!\n"); // switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Media Paused!!!!\n");
@ -1053,7 +1053,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
} }
} }
if (switch_channel_test_flag(session->channel, CF_MEDIA_PAUSE)) { if (switch_channel_test_flag(session->channel, CF_AUDIO_PAUSE)) {
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }