mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-06-06 13:08:55 +00:00
unhold before media timeout
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13963 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
8c45434ae7
commit
bbd67f4c17
@ -620,6 +620,10 @@ static switch_status_t sofia_read_video_frame(switch_core_session_t *session, sw
|
|||||||
status = switch_rtp_zerocopy_read_frame(tech_pvt->video_rtp_session, &tech_pvt->video_read_frame, flags);
|
status = switch_rtp_zerocopy_read_frame(tech_pvt->video_rtp_session, &tech_pvt->video_read_frame, flags);
|
||||||
if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) {
|
if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) {
|
||||||
if (status == SWITCH_STATUS_TIMEOUT) {
|
if (status == SWITCH_STATUS_TIMEOUT) {
|
||||||
|
if (sofia_test_flag(tech_pvt, TFLAG_SIP_HOLD)) {
|
||||||
|
sofia_glue_toggle_hold(tech_pvt, 0);
|
||||||
|
sofia_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD);
|
||||||
|
}
|
||||||
switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_MEDIA_TIMEOUT);
|
switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_MEDIA_TIMEOUT);
|
||||||
}
|
}
|
||||||
return status;
|
return status;
|
||||||
@ -728,6 +732,12 @@ static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_f
|
|||||||
|
|
||||||
if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) {
|
if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) {
|
||||||
if (status == SWITCH_STATUS_TIMEOUT) {
|
if (status == SWITCH_STATUS_TIMEOUT) {
|
||||||
|
|
||||||
|
if (sofia_test_flag(tech_pvt, TFLAG_SIP_HOLD)) {
|
||||||
|
sofia_glue_toggle_hold(tech_pvt, 0);
|
||||||
|
sofia_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD);
|
||||||
|
}
|
||||||
|
|
||||||
switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_MEDIA_TIMEOUT);
|
switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_MEDIA_TIMEOUT);
|
||||||
}
|
}
|
||||||
return status;
|
return status;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user