<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16898] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16898">16898</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-03-04 11:16:19 -0600 (Thu, 04 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>move exception for iLBC hack to sdp up to sofia (see Moc if anything breaks)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_codecc">freeswitch/trunk/src/switch_core_codec.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (16897 => 16898)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-03-04 16:51:24 UTC (rev 16897)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-03-04 17:16:19 UTC (rev 16898)
</span><span class="lines">@@ -3222,6 +3222,7 @@
</span><span class="cx"> sdp_attribute_t *attr;
</span><span class="cx"> int first = 0, last = 0;
</span><span class="cx"> int ptime = 0, dptime = 0, maxptime = 0, dmaxptime = 0;
</span><ins>+ int codec_ms = 0;
</ins><span class="cx"> int sendonly = 0;
</span><span class="cx"> int greedy = 0, x = 0, skip = 0, mine = 0;
</span><span class="cx"> switch_channel_t *channel = switch_core_session_get_channel(session);
</span><span class="lines">@@ -3523,6 +3524,21 @@
</span><span class="cx"> ptime = 20;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!strcasecmp((char *) rm_encoding, "ilbc")) {
+ char *mode = NULL;
+ if ((mode = strstr(map->rm_fmtp, "mode=")) && mode) {
+ codec_ms = atoi(mode + 5);
+ }
+ if (!codec_ms) {
+ /* default to 30 when no mode is defined for ilbc ONLY */
+ codec_ms = 30;
+ }
+ } else {
+ codec_ms = ptime;
+ }
+
+
+
</ins><span class="cx"> for (i = first; i < last && i < tech_pvt->num_codecs; i++) {
</span><span class="cx"> const switch_codec_implementation_t *imp = tech_pvt->codecs[i];
</span><span class="cx"> uint32_t codec_rate = imp->samples_per_second;
</span><span class="lines">@@ -3531,7 +3547,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Audio Codec Compare [%s:%d:%u:%d]/[%s:%d:%u:%d]\n",
</span><del>- rm_encoding, map->rm_pt, (int) map->rm_rate, ptime,
</del><ins>+ rm_encoding, map->rm_pt, (int) map->rm_rate, codec_ms,
</ins><span class="cx"> imp->iananame, imp->ianacode, codec_rate, imp->microseconds_per_packet / 1000);
</span><span class="cx"> if ((zstr(map->rm_encoding) || (tech_pvt->profile->ndlb & PFLAG_NDLB_ALLOW_BAD_IANANAME)) && map->rm_pt < 96) {
</span><span class="cx"> match = (map->rm_pt == imp->ianacode) ? 1 : 0;
</span><span class="lines">@@ -3545,7 +3561,7 @@
</span><span class="cx"> "Bah HUMBUG! Sticking with %s@%uh@%ui\n",
</span><span class="cx"> imp->iananame, imp->samples_per_second, imp->microseconds_per_packet / 1000);
</span><span class="cx"> } else {
</span><del>- if ((ptime && ptime * 1000 != imp->microseconds_per_packet) || map->rm_rate != codec_rate) {
</del><ins>+ if ((codec_ms && codec_ms * 1000 != imp->microseconds_per_packet) || map->rm_rate != codec_rate) {
</ins><span class="cx"> near_rate = map->rm_rate;
</span><span class="cx"> near_match = imp;
</span><span class="cx"> match = 0;
</span><span class="lines">@@ -3565,7 +3581,7 @@
</span><span class="cx"> char tmp[80];
</span><span class="cx"> int num;
</span><span class="cx">
</span><del>- switch_snprintf(tmp, sizeof(tmp), "%s@%uh@%ui", near_match->iananame, near_rate ? near_rate : near_match->samples_per_second, ptime);
</del><ins>+ switch_snprintf(tmp, sizeof(tmp), "%s@%uh@%ui", near_match->iananame, near_rate ? near_rate : near_match->samples_per_second, codec_ms);
</ins><span class="cx">
</span><span class="cx"> prefs[0] = tmp;
</span><span class="cx"> num = switch_loadable_module_get_codecs_sorted(search, 1, prefs, 1);
</span><span class="lines">@@ -3598,12 +3614,7 @@
</span><span class="cx"> tech_pvt->iananame = switch_core_session_strdup(session, (char *) mimp->iananame);
</span><span class="cx"> tech_pvt->pt = (switch_payload_t) map->rm_pt;
</span><span class="cx"> tech_pvt->rm_rate = map->rm_rate;
</span><del>- if (!strcasecmp((char *) mimp->iananame, "ilbc") && zstr((char *) map->rm_fmtp)) {
- /* default to 30 when no mode is defined for ilbc ONLY */
- tech_pvt->codec_ms = 30;
- } else {
- tech_pvt->codec_ms = mimp->microseconds_per_packet / 1000;
- }
</del><ins>+ tech_pvt->codec_ms = mimp->microseconds_per_packet / 1000;
</ins><span class="cx"> tech_pvt->remote_sdp_audio_ip = switch_core_session_strdup(session, (char *) connection->c_address);
</span><span class="cx"> tech_pvt->rm_fmtp = switch_core_session_strdup(session, (char *) map->rm_fmtp);
</span><span class="cx"> tech_pvt->remote_sdp_audio_port = (switch_port_t) m->m_port;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_codecc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_codec.c (16897 => 16898)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_codec.c 2010-03-04 16:51:24 UTC (rev 16897)
+++ freeswitch/trunk/src/switch_core_codec.c 2010-03-04 17:16:19 UTC (rev 16898)
</span><span class="lines">@@ -507,19 +507,6 @@
</span><span class="cx"> return SWITCH_STATUS_GENERR;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!strcasecmp(codec_name, "ilbc") && mode && !strncasecmp(mode, "mode=", 5)) {
- int mms;
- mode += 5;
- if (mode) {
- mms = atoi(mode);
- if (mms == 20 || mms == 30) {
- ms = mms;
- }
- }
- } else if (!strcasecmp(codec_name, "ilbc")) {
- ms = 30;
- }
-
</del><span class="cx"> /* If no specific codec interval is requested opt for 20ms above all else because lots of stuff assumes it */
</span><span class="cx"> if (!ms) {
</span><span class="cx"> for (iptr = codec_interface->implementations; iptr; iptr = iptr->next) {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>