kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-16 16:58:35 +00:00
Code Issues Projects Releases Wiki Activity

FS-7500: remove temp bridge echo hack

Browse Source
This commit is contained in:
Anthony Minessale 2014-11-19 14:49:09 -06:00 committed by Michael Jerris
parent d7af2b128c
commit fe957fe66a
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/switch_ivr_bridge.c
View File

@ -69,12 +69,10 @@ 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); 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) { 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 { } 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); status = switch_core_session_read_video_frame(vh->session_a, &read_frame, SWITCH_IO_FLAG_NONE, 0);
@ -412,11 +410,8 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
vid_launch++; vid_launch++;
vh.session_a = session_a; vh.session_a = session_a;
vh.session_b = session_b; vh.session_b = session_b;
//DFF TEMP
if (switch_channel_test_flag(chan_a, CF_BRIDGE_ORIGINATOR)) {
launch_video(&vh); launch_video(&vh);
} }
}
#endif #endif
if (read_frame_count >= DEFAULT_LEAD_FRAMES && switch_channel_media_ack(chan_a)) { if (read_frame_count >= DEFAULT_LEAD_FRAMES && switch_channel_media_ack(chan_a)) {