From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 19 Nov 2014 23:59:57 +0000 (-0600)
Subject: FS-7500: video_decoded_echo to echo_decode_video
X-Git-Tag: v1.6.2~614^2~580
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6822994d255f4af851d2309175079a4b65a7394a;p=thirdparty%2Ffreeswitch.git

FS-7500: video_decoded_echo to echo_decode_video
---

diff --git a/src/switch_ivr_async.c b/src/switch_ivr_async.c
index 9fa11c9f78..af127feb9e 100644
--- a/src/switch_ivr_async.c
+++ b/src/switch_ivr_async.c
@@ -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;