kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 03:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 105674 via svnmerge from

Browse Source 
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
This commit is contained in:
Joshua Colp
2008-03-04 18:08:42 +00:00
parent e8a8319aad
commit 4de0d8368f
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
channels/chan_sip.c
View File

@@ -4824,8 +4824,10 @@ static int sip_answer(struct ast_channel *ast)
if (p->t38.state == T38_PEER_DIRECT) { if (p->t38.state == T38_PEER_DIRECT) {
change_t38_state(p, T38_ENABLED); change_t38_state(p, T38_ENABLED);
res = transmit_response_with_t38_sdp(p, "200 OK", &p->initreq, XMIT_CRITICAL); 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); res = transmit_response_with_sdp(p, "200 OK", &p->initreq, XMIT_CRITICAL, FALSE);
}
} }
sip_pvt_unlock(p); sip_pvt_unlock(p);
return res; return res;
@@ -4858,6 +4860,7 @@ static int sip_write(struct ast_channel *ast, struct ast_frame *frame)
if ((ast->_state != AST_STATE_UP) && if ((ast->_state != AST_STATE_UP) &&
!ast_test_flag(&p->flags[0], SIP_PROGRESS_SENT) && !ast_test_flag(&p->flags[0], SIP_PROGRESS_SENT) &&
!ast_test_flag(&p->flags[0], SIP_OUTGOING)) { !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); transmit_response_with_sdp(p, "183 Session Progress", &p->initreq, XMIT_UNRELIABLE, FALSE);
ast_set_flag(&p->flags[0], SIP_PROGRESS_SENT); 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; res = -1;
break; break;
case AST_CONTROL_HOLD: case AST_CONTROL_HOLD:
ast_rtp_new_source(p->rtp);
ast_moh_start(ast, data, p->mohinterpret); ast_moh_start(ast, data, p->mohinterpret);
break; break;
case AST_CONTROL_UNHOLD: case AST_CONTROL_UNHOLD:
ast_rtp_new_source(p->rtp);
ast_moh_stop(ast); ast_moh_stop(ast);
break; break;
case AST_CONTROL_VIDUPDATE: /* Request a video frame update */ case AST_CONTROL_VIDUPDATE: /* Request a video frame update */

2
include/asterisk/rtp.h
View File

@@ -170,6 +170,8 @@ int ast_rtp_sendcng(struct ast_rtp *rtp, int level);
int ast_rtp_setqos(struct ast_rtp *rtp, int tos, int cos, char *desc); int ast_rtp_setqos(struct ast_rtp *rtp, int tos, int cos, char *desc);
void ast_rtp_new_source(struct ast_rtp *rtp);
/*! \brief Setting RTP payload types from lines in a SDP description: */ /*! \brief Setting RTP payload types from lines in a SDP description: */
void ast_rtp_pt_clear(struct ast_rtp* rtp); void ast_rtp_pt_clear(struct ast_rtp* rtp);
/*! \brief Set payload types to defaults */ /*! \brief Set payload types to defaults */

15
main/rtp.c
View File

@@ -175,6 +175,8 @@ struct ast_rtp {
enum strict_rtp_state strict_rtp_state; /*!< Current state that strict RTP protection is in */ enum strict_rtp_state strict_rtp_state; /*!< Current state that strict RTP protection is in */
struct sockaddr_in strict_rtp_address; /*!< Remote address information for strict RTP purposes */ struct sockaddr_in strict_rtp_address; /*!< Remote address information for strict RTP purposes */
int set_marker_bit:1; /*!< Whether to set the marker bit or not */
}; };
/* Forward declarations */ /* Forward declarations */
@@ -2324,6 +2326,12 @@ int ast_rtp_setqos(struct ast_rtp *rtp, int tos, int cos, char *desc)
return ast_netsock_set_qos(rtp->s, tos, cos, desc); return ast_netsock_set_qos(rtp->s, tos, cos, desc);
} }
void ast_rtp_new_source(struct ast_rtp *rtp)
{
rtp->set_marker_bit = 1;
return;
}
void ast_rtp_set_peer(struct ast_rtp *rtp, struct sockaddr_in *them) void ast_rtp_set_peer(struct ast_rtp *rtp, struct sockaddr_in *them)
{ {
rtp->them.sin_port = them->sin_port; rtp->them.sin_port = them->sin_port;
@@ -3036,6 +3044,13 @@ static int ast_rtp_raw_write(struct ast_rtp *rtp, struct ast_frame *f, int codec
} }
} }
} }
/* If we have been explicitly told to set the marker bit do so */
if (rtp->set_marker_bit) {
mark = 1;
rtp->set_marker_bit = 0;
}
/* If the timestamp for non-digit packets has moved beyond the timestamp /* If the timestamp for non-digit packets has moved beyond the timestamp
for digits, update the digit timestamp. for digits, update the digit timestamp.
*/ */