diff options
| author | Joshua Colp <jcolp@digium.com> | 2008-03-04 18:08:42 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2008-03-04 18:08:42 +0000 |
| commit | 4de0d8368fd835f682a6c1ed0d233052c625ad6f (patch) | |
| tree | 3c694cacd2589a20ba8082115a507e1c811319b5 /channels/chan_sip.c | |
| parent | e8a8319aadeaa4e6610ece9b498c4655e2afcde7 (diff) | |
Merged revisions 105674 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r105674 | file | 2008-03-04 14:05:28 -0400 (Tue, 04 Mar 2008) | 8 lines
When a new source of audio comes in (such as music on hold) make sure the marker bit gets set.
(closes issue #10355)
Reported by: wdecarne
Patches:
10355.diff uploaded by file (license 11)
(closes issue #11491)
Reported by: kanderson
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 4ed3e3d75..f5cbda2b5 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -4824,8 +4824,10 @@ static int sip_answer(struct ast_channel *ast) if (p->t38.state == T38_PEER_DIRECT) { change_t38_state(p, T38_ENABLED); res = transmit_response_with_t38_sdp(p, "200 OK", &p->initreq, XMIT_CRITICAL); - } else + } else { + ast_rtp_new_source(p->rtp); res = transmit_response_with_sdp(p, "200 OK", &p->initreq, XMIT_CRITICAL, FALSE); + } } sip_pvt_unlock(p); return res; @@ -4858,6 +4860,7 @@ static int sip_write(struct ast_channel *ast, struct ast_frame *frame) if ((ast->_state != AST_STATE_UP) && !ast_test_flag(&p->flags[0], SIP_PROGRESS_SENT) && !ast_test_flag(&p->flags[0], SIP_OUTGOING)) { + ast_rtp_new_source(p->rtp); transmit_response_with_sdp(p, "183 Session Progress", &p->initreq, XMIT_UNRELIABLE, FALSE); ast_set_flag(&p->flags[0], SIP_PROGRESS_SENT); } @@ -5095,9 +5098,11 @@ static int sip_indicate(struct ast_channel *ast, int condition, const void *data res = -1; break; case AST_CONTROL_HOLD: + ast_rtp_new_source(p->rtp); ast_moh_start(ast, data, p->mohinterpret); break; case AST_CONTROL_UNHOLD: + ast_rtp_new_source(p->rtp); ast_moh_stop(ast); break; case AST_CONTROL_VIDUPDATE: /* Request a video frame update */ |