mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-04-01 02:52:32 +00:00
add new macro to make sure we don't send bypass command too soon
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15165 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
3a77cb0ed0
commit
165fdd250f
@ -286,7 +286,7 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
|
|||||||
goto end_of_bridge_loop;
|
goto end_of_bridge_loop;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (loop_count > DEFAULT_LEAD_FRAMES && switch_core_session_private_event_count(session_a)) {
|
if (loop_count > DEFAULT_LEAD_FRAMES && switch_channel_media_ack(chan_a) && switch_core_session_private_event_count(session_a)) {
|
||||||
switch_channel_set_flag(chan_b, CF_SUSPEND);
|
switch_channel_set_flag(chan_b, CF_SUSPEND);
|
||||||
msg.string_arg = data->b_uuid;
|
msg.string_arg = data->b_uuid;
|
||||||
msg.message_id = SWITCH_MESSAGE_INDICATE_UNBRIDGE;
|
msg.message_id = SWITCH_MESSAGE_INDICATE_UNBRIDGE;
|
||||||
@ -318,7 +318,8 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (loop_count > DEFAULT_LEAD_FRAMES && bypass_media_after_bridge && switch_channel_test_flag(chan_a, CF_ANSWERED) &&
|
if (loop_count > DEFAULT_LEAD_FRAMES && switch_channel_media_ack(chan_a) &&
|
||||||
|
bypass_media_after_bridge && switch_channel_test_flag(chan_a, CF_ANSWERED) &&
|
||||||
switch_channel_test_flag(chan_b, CF_ANSWERED)) {
|
switch_channel_test_flag(chan_b, CF_ANSWERED)) {
|
||||||
switch_ivr_nomedia(switch_core_session_get_uuid(session_a), SMF_REBRIDGE);
|
switch_ivr_nomedia(switch_core_session_get_uuid(session_a), SMF_REBRIDGE);
|
||||||
bypass_media_after_bridge = 0;
|
bypass_media_after_bridge = 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user