]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7500: video_decoded_echo to echo_decode_video
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 19 Nov 2014 23:59:57 +0000 (17:59 -0600)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:46:45 +0000 (12:46 -0500)
src/switch_ivr_async.c

index 9fa11c9f787008071a368f60f88fab1e73023212..af127feb9ea4482611c2f96e349edee1bc7855eb 100644 (file)
@@ -644,7 +644,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_session_echo(switch_core_session_t *s
 
        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);
        }
 
@@ -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);
 
-#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)) {
                        switch_channel_clear_flag(channel, CF_BREAK);
                        break;