<p>Paulo Vicentini has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/13902">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">chan_pjsip: Check audio frame when remote SSRC changes.<br><br>If the SSRC of a received RTP packet differed from the previous SSRC<br>an SSRC change control frame would be queued ahead of the media<br>frame. In the case of audio this would result in the format of the<br>audio frame not being checked, and if it differed or was not allowed<br>then it could cause the call to drop due to failure to set up a<br>translation path.<br><br>The chan_pjsip module will now no longer assume the first frame<br>will be the audio frame and instead goes through the complete list<br>to find it.<br><br>ASTERISK-28759<br><br>Change-Id: I6d854cc523f343e299a615636fc65bdbd5f809ec<br>---<br>M channels/chan_pjsip.c<br>1 file changed, 16 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/02/13902/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c</span><br><span>index 976dd01..fddfa8e 100644</span><br><span>--- a/channels/chan_pjsip.c</span><br><span>+++ b/channels/chan_pjsip.c</span><br><span>@@ -693,6 +693,7 @@</span><br><span> struct ast_sip_session_media *media = NULL;</span><br><span> int rtcp = 0;</span><br><span> int fdno = ast_channel_fdno(ast);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ast_frame *cur;</span><br><span> </span><br><span> switch (fdno) {</span><br><span> case 0:</span><br><span>@@ -721,7 +722,13 @@</span><br><span> </span><br><span> ast_rtp_instance_set_last_rx(media->rtp, time(NULL));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (f->frametype != AST_FRAME_VOICE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (cur = f; cur; cur = AST_LIST_NEXT(cur, frame_list)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cur->frametype == AST_FRAME_VOICE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cur) {</span><br><span> return f;</span><br><span> }</span><br><span> </span><br><span>@@ -733,35 +740,35 @@</span><br><span> * raw read format BEFORE the native format check</span><br><span> */</span><br><span> if (!session->endpoint->asymmetric_rtp_codec &&</span><br><span style="color: hsl(0, 100%, 40%);">- ast_format_cmp(ast_channel_rawwriteformat(ast), f->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_format_cmp(ast_channel_rawwriteformat(ast), cur->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) {</span><br><span> struct ast_format_cap *caps;</span><br><span> </span><br><span> /* For maximum compatibility we ensure that the formats match that of the received media */</span><br><span> ast_debug(1, "Oooh, got a frame with format of %s on channel '%s' when we're sending '%s', switching to match\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ast_format_get_name(f->subclass.format), ast_channel_name(ast),</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_format_get_name(cur->subclass.format), ast_channel_name(ast),</span><br><span> ast_format_get_name(ast_channel_rawwriteformat(ast)));</span><br><span> </span><br><span> caps = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);</span><br><span> if (caps) {</span><br><span> ast_format_cap_append_from_cap(caps, ast_channel_nativeformats(ast), AST_MEDIA_TYPE_UNKNOWN);</span><br><span> ast_format_cap_remove_by_type(caps, AST_MEDIA_TYPE_AUDIO);</span><br><span style="color: hsl(0, 100%, 40%);">- ast_format_cap_append(caps, f->subclass.format, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_format_cap_append(caps, cur->subclass.format, 0);</span><br><span> ast_channel_nativeformats_set(ast, caps);</span><br><span> ao2_ref(caps, -1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ast_set_write_format_path(ast, ast_channel_writeformat(ast), f->subclass.format);</span><br><span style="color: hsl(0, 100%, 40%);">- ast_set_read_format_path(ast, ast_channel_readformat(ast), f->subclass.format);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_set_write_format_path(ast, ast_channel_writeformat(ast), cur->subclass.format);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_set_read_format_path(ast, ast_channel_readformat(ast), cur->subclass.format);</span><br><span> </span><br><span> if (ast_channel_is_bridged(ast)) {</span><br><span> ast_channel_set_unbridged_nolock(ast, 1);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (ast_format_cap_iscompatible_format(ast_channel_nativeformats(ast), f->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ast_format_cap_iscompatible_format(ast_channel_nativeformats(ast), cur->subclass.format)</span><br><span style="color: hsl(120, 100%, 40%);">+ == AST_FORMAT_CMP_NOT_EQUAL) {</span><br><span> ast_debug(1, "Oooh, got a frame with format of %s on channel '%s' when it has not been negotiated\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ast_format_get_name(f->subclass.format), ast_channel_name(ast));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_format_get_name(cur->subclass.format), ast_channel_name(ast));</span><br><span> ast_frfree(f);</span><br><span> return &ast_null_frame;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/13902">change 13902</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/13902"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 14 </div>
<div style="display:none"> Gerrit-Change-Id: I6d854cc523f343e299a615636fc65bdbd5f809ec </div>
<div style="display:none"> Gerrit-Change-Number: 13902 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Paulo Vicentini <paulo.vicentini@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>