FS-7500: video_decoded_echo to echo_decode_video

This commit is contained in:
Anthony Minessale 2014-11-19 17:59:57 -06:00 committed by Michael Jerris
parent 1093139271
commit 6822994d25
1 changed files with 1 additions and 16 deletions

View File

@ -644,7 +644,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_session_echo(switch_core_session_t *s
arg_recursion_check_start(args); arg_recursion_check_start(args);
if (switch_true(switch_channel_get_variable(channel, "video_decoded_echo"))) { if (switch_true(switch_channel_get_variable(channel, "echo_decode_video"))) {
switch_channel_set_flag(channel, CF_VIDEO_DECODED_READ); switch_channel_set_flag(channel, CF_VIDEO_DECODED_READ);
} }
@ -691,23 +691,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_session_echo(switch_core_session_t *s
} }
} }
switch_core_session_write_frame(session, read_frame, SWITCH_IO_FLAG_NONE, 0); switch_core_session_write_frame(session, read_frame, SWITCH_IO_FLAG_NONE, 0);
#ifndef SWITCH_VIDEO_IN_THREADS
status = switch_core_session_read_video_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
if (!SWITCH_READ_ACCEPTABLE(status)) {
break;
}
if (switch_test_flag(read_frame, SFF_CNG)) {
continue;
}
switch_core_session_write_video_frame(session, read_frame, SWITCH_IO_FLAG_NONE, 0);
#endif
if (switch_channel_test_flag(channel, CF_BREAK)) { if (switch_channel_test_flag(channel, CF_BREAK)) {
switch_channel_clear_flag(channel, CF_BREAK); switch_channel_clear_flag(channel, CF_BREAK);
break; break;