]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7500: remove temp bridge echo hack
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 19 Nov 2014 20:49:09 +0000 (14:49 -0600)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:46:45 +0000 (12:46 -0500)
src/switch_ivr_bridge.c

index 5f68032120e45833f3a4b8cce95c6a9dfb17fcbc..cee19190e82fc6dc9afd26c0c6978f439a8d49ad 100644 (file)
@@ -69,13 +69,11 @@ static void video_bridge_thread(switch_core_session_t *session, void *obj)
                        switch_codec_t *b_codec = switch_core_session_get_video_write_codec(vh->session_b);
 
                        if (!b_codec || !a_codec || a_codec->implementation->impl_id == b_codec->implementation->impl_id) {
-                               //switch_channel_clear_flag(channel, CF_VIDEO_DECODED_READ);
+                               switch_channel_clear_flag(channel, CF_VIDEO_DECODED_READ);
                        } else {
-                               //switch_channel_set_flag(channel, CF_VIDEO_DECODED_READ);
+                               switch_channel_set_flag(channel, CF_VIDEO_DECODED_READ);
                        }
                        
-                       switch_channel_set_flag(channel, CF_VIDEO_DECODED_READ);
-
                        status = switch_core_session_read_video_frame(vh->session_a, &read_frame, SWITCH_IO_FLAG_NONE, 0);
                        
                        if (!SWITCH_READ_ACCEPTABLE(status)) {
@@ -412,10 +410,7 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
                        vid_launch++;
                        vh.session_a = session_a;
                        vh.session_b = session_b;
-                       //DFF TEMP
-                       if (switch_channel_test_flag(chan_a, CF_BRIDGE_ORIGINATOR)) {
-                               launch_video(&vh);
-                       }
+                       launch_video(&vh);
                }
 #endif