<p>Robert Cripps has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/10495">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_pjsip_sdp_rtp: Properly set packetization on the codec<br><br>In the transcode case (Alaw to Ulaw) the ptime was being discarded.<br><br>res_rtp_asterisk:<br><br>In the native bridge case the framing was never checked.<br><br>ASTERISK-28110 #close<br><br>Change-Id: Ic64b8fc6a140a93fbdb2f97550a40d0ff334e607<br>---<br>M res/res_pjsip_sdp_rtp.c<br>M res/res_rtp_asterisk.c<br>2 files changed, 11 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/95/10495/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c</span><br><span>index 7c7040e..d74c90c 100644</span><br><span>--- a/res/res_pjsip_sdp_rtp.c</span><br><span>+++ b/res/res_pjsip_sdp_rtp.c</span><br><span>@@ -392,7 +392,10 @@</span><br><span>        if (!ast_format_cap_count(joint)) {</span><br><span>          struct ast_str *usbuf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);</span><br><span>            struct ast_str *thembuf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+           if(codecs.framing) {</span><br><span style="color: hsl(120, 100%, 40%);">+                  /* Copy the codecs framing ms even though there is no match */</span><br><span style="color: hsl(120, 100%, 40%);">+                        ast_rtp_codecs_set_framing(ast_rtp_instance_get_codecs(session_media->rtp),codecs.framing);</span><br><span style="color: hsl(120, 100%, 40%);">+                }</span><br><span>            ast_rtp_codecs_payloads_destroy(&codecs);</span><br><span>                ast_log(LOG_NOTICE, "No joint capabilities for '%s' media stream between our configuration(%s) and incoming SDP(%s)\n",</span><br><span>                    session_media->stream_type,</span><br><span>diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c</span><br><span>index 7b006ce..26d4845 100644</span><br><span>--- a/res/res_rtp_asterisk.c</span><br><span>+++ b/res/res_rtp_asterisk.c</span><br><span>@@ -5160,6 +5160,13 @@</span><br><span>                 return -1;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* In p2p mode the framing ms values for both must be equal. If bridged is zero we don't care */</span><br><span style="color: hsl(120, 100%, 40%);">+  unsigned framing1 = ast_rtp_codecs_get_framing(ast_rtp_instance_get_codecs(instance1));</span><br><span style="color: hsl(120, 100%, 40%);">+       unsigned framing = ast_rtp_codecs_get_framing(ast_rtp_instance_get_codecs(instance));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (framing1 != 0 && framing != framing1) {</span><br><span style="color: hsl(120, 100%, 40%);">+           return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+    }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  /* Otherwise adjust bridged payload to match */</span><br><span>      bridged_payload = ast_rtp_codecs_payload_code(ast_rtp_instance_get_codecs(instance1), payload_type->asterisk_format, payload_type->format, payload_type->rtp_code);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10495">change 10495</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/10495"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ic64b8fc6a140a93fbdb2f97550a40d0ff334e607 </div>
<div style="display:none"> Gerrit-Change-Number: 10495 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Robert Cripps <rcripps@voxbone.com> </div>