<!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][17151] </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=17151">17151</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2010-03-30 18:20:26 -0500 (Tue, 30 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>added load/noload options for the supported codecs</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkconfautoload_configssangoma_codecconfxml">freeswitch/trunk/conf/autoload_configs/sangoma_codec.conf.xml</a></li>
<li><a href="#freeswitchtrunksrcmodcodecsmod_sangoma_codecMakefile">freeswitch/trunk/src/mod/codecs/mod_sangoma_codec/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodcodecsmod_sangoma_codecmod_sangoma_codecc">freeswitch/trunk/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkconfautoload_configssangoma_codecconfxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/conf/autoload_configs/sangoma_codec.conf.xml (17150 => 17151)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/conf/autoload_configs/sangoma_codec.conf.xml 2010-03-30 23:20:18 UTC (rev 17150)
+++ freeswitch/trunk/conf/autoload_configs/sangoma_codec.conf.xml 2010-03-30 23:20:26 UTC (rev 17151)
</span><span class="lines">@@ -1,11 +1,23 @@
</span><span class="cx"> <configuration name="sangoma_codec.conf" description="Sangoma Codec Configuration">
</span><span class="cx">
</span><span class="cx"> <settings>
</span><del>- <!-- nothing to put here yet -->
</del><ins>+ <!--
+ Comma separated list of codecs to register with FreeSWITCH,
+ by default (if this parameter is not set) all available codecs are registered.
+ Valid codec values are: PCMU,PCMA,L16,G729,G726-32,GSM
+ <param name="load" value="all"/>
+ -->
+
+ <!-- List of codecs to not register with FreeSWITCH, by default this is empty,
+ but you may want to not load PCMU and PCMA or may be others to not use your
+ vocallo resources in codecs that are done well and fast in software.
+ <param name="noload" value="PCMU,PCMA"/>
+ -->
</ins><span class="cx"> </settings>
</span><span class="cx">
</span><span class="cx"> <vocallos>
</span><span class="cx">
</span><ins>+ <!-- The name of the vocallo is the ethernet device name as displayed by ifconfig -->
</ins><span class="cx"> <vocallo name="eth5">
</span><span class="cx"> <!-- Starting UDP port for the vocallo -->
</span><span class="cx"> <param name="baseudp" value="5000"/>
</span></span></pre></div>
<a id="freeswitchtrunksrcmodcodecsmod_sangoma_codecMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/codecs/mod_sangoma_codec/Makefile (17150 => 17151)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/codecs/mod_sangoma_codec/Makefile 2010-03-30 23:20:18 UTC (rev 17150)
+++ freeswitch/trunk/src/mod/codecs/mod_sangoma_codec/Makefile 2010-03-30 23:20:26 UTC (rev 17151)
</span><span class="lines">@@ -1,3 +1,3 @@
</span><span class="cx"> BASE=../../../..
</span><del>-LOCAL_LDFLAGS += -lsangoma_transcode
</del><ins>+LOCAL_LDFLAGS += -lsng-tc
</ins><span class="cx"> include $(BASE)/build/modmake.rules
</span></span></pre></div>
<a id="freeswitchtrunksrcmodcodecsmod_sangoma_codecmod_sangoma_codecc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c (17150 => 17151)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c 2010-03-30 23:20:18 UTC (rev 17150)
+++ freeswitch/trunk/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c 2010-03-30 23:20:26 UTC (rev 17151)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include "switch.h"
</span><span class="cx"> #include "g711.h"
</span><span class="cx">
</span><del>-#include <sangoma_transcode.h>
</del><ins>+#include <sng_tc/sng_tc.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __linux__
</span><span class="cx"> /* for ethernet device query */
</span><span class="lines">@@ -101,13 +101,21 @@
</span><span class="cx"> { SNGTC_CODEC_G729AB, 18, "G729", "Sangoma G729", 40, 8000, 10000, 80, 160, 10, 1 },
</span><span class="cx"> { SNGTC_CODEC_G726_32, 122, "G726-32", "Sangoma G.726 32k", 40, 32000, 10000, 80, 160, 40, 1 },
</span><span class="cx"> { SNGTC_CODEC_GSM_FR, 3, "GSM", "Sangoma GSM", 20, 13200, 20000, 160, 320, 33, 0 },
</span><ins>+#if 0
</ins><span class="cx"> /* FIXME: grandstream crashes with iLBC implementation */
</span><span class="cx"> { SNGTC_CODEC_ILBC, 97, "iLBC", "Sangoma ILBC", -1, -1, -1, -1, -1, -1, 0 },
</span><span class="cx"> /* FIXME: sampling rate seems wrong with this, audioooo soooundssssss sloooooow ... */
</span><span class="cx"> { SNGTC_CODEC_G722, 9, "G722", "Sangoma G722", 20, 64000, 20000, 160, 640, 160, 0 },
</span><ins>+#endif
</ins><span class="cx"> { -1, -1, NULL, NULL, -1, -1, -1, -1, -1, -1 },
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+/* default codec list to load, users may override, special codec 'all' loads everything available unless listed in noload */
+static char g_codec_load_list[1024] = "all";
+
+/* default codec list to NOT load, users may override */
+static char g_codec_noload_list[1024] = "";
+
</ins><span class="cx"> struct codec_data {
</span><span class="cx"> /* sngtc request and reply */
</span><span class="cx"> sngtc_codec_request_t request;
</span><span class="lines">@@ -206,8 +214,8 @@
</span><span class="cx"> rtp_session = switch_rtp_new(local_ip, rtp_port,
</span><span class="cx"> codec_ip, codec_reply_leg->codec_udp_port,
</span><span class="cx"> iana,
</span><del>- codec_reg_leg->ms*8, /* samples per interval, FIXME: do based on sampling rate */
- codec_reg_leg->ms*1000, /* ms per packet */
</del><ins>+ sess->impl->samples_per_packet,
+ codec_reg_leg->ms*1000, /* microseconds per packet */
</ins><span class="cx"> flags, NULL, &err, g_pool);
</span><span class="cx">
</span><span class="cx"> if (!rtp_session) {
</span><span class="lines">@@ -845,6 +853,21 @@
</span><span class="cx">
</span><span class="cx"> if ((settings = switch_xml_child(cfg, "settings"))) {
</span><span class="cx"> /* nothing here yet */
</span><ins>+ for (param = switch_xml_child(settings, "param"); param; param = param->next) {
+ char *var = (char *)switch_xml_attr_soft(param, "name");
+ char *val = (char *)switch_xml_attr_soft(param, "value");
+
+ /* this parameter overrides the default list of codecs to load */
+ if (!strcasecmp(var, "load")) {
+ strncpy(g_codec_load_list, val, sizeof(g_codec_load_list)-1);
+ g_codec_load_list[sizeof(g_codec_load_list)-1] = 0;
+ } else if (!strcasecmp(var, "noload")) {
+ strncpy(g_codec_noload_list, val, sizeof(g_codec_noload_list)-1);
+ g_codec_noload_list[sizeof(g_codec_noload_list)-1] = 0;
+ } else {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ignored unknown Sangoma codec setting %s\n", var);
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((vocallos = switch_xml_child(cfg, "vocallos"))) {
</span><span class="lines">@@ -888,7 +911,7 @@
</span><span class="cx"> }
</span><span class="cx"> g_init_cfg.host_nic_vocallo_cfg[vidx].vocallo_ip = ntohl(vocallo_base_ip.s_addr);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ignored unknown Sangoma codec setting %s\n", val);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ignored unknown Sangoma vocallo setting %s\n", var);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -966,11 +989,28 @@
</span><span class="cx"> *module_interface = switch_loadable_module_create_module_interface(pool, modname);
</span><span class="cx">
</span><span class="cx">
</span><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Loading codecs, load='%s', noload='%s'\n", g_codec_load_list, g_codec_noload_list);
</ins><span class="cx"> for (c = 0; g_codec_map[c].codec_id != -1; c++) {
</span><span class="cx">
</span><ins>+ /* check if the codec is in the load list, otherwise skip it */
+ if (strcasecmp(g_codec_load_list, "all") && !strcasestr(g_codec_load_list, g_codec_map[c].iana_name)) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Not loading codec %s because was not found in the load list\n",
+ g_codec_map[c].iana_name);
+ continue;
+ }
+
+ /* load it unless is named in the noload list */
+ if (strcasestr(g_codec_noload_list, g_codec_map[c].iana_name)) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Not loading codec %s because was not found in the noload list\n",
+ g_codec_map[c].iana_name);
+ continue;
+ }
+
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Registering implementations for codec %s\n", g_codec_map[c].iana_name);
+
</ins><span class="cx"> /* let know the library which iana to use */
</span><span class="cx"> sngtc_set_iana_code_based_on_codec_id(g_codec_map[c].codec_id, g_codec_map[c].iana);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Mapped codec %d to IANA %d\n", g_codec_map[c].codec_id, g_codec_map[c].iana);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Mapped codec %d to IANA %d\n", g_codec_map[c].codec_id, g_codec_map[c].iana);
</ins><span class="cx">
</span><span class="cx"> /* SWITCH_ADD_CODEC allocates a codec interface structure from the pool the core gave us and adds it to the internal interface
</span><span class="cx"> * list the core keeps, gets a codec id and set the given codec name to it.
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>