<!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][16026] </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=16026">16026</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2009-12-22 15:24:15 -0600 (Tue, 22 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre> adding 12kHz and 24kHz </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_loadable_moduleh">freeswitch/trunk/src/include/switch_loadable_module.h</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_utilsh">freeswitch/trunk/src/include/switch_utils.h</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_conferencemod_conferencec">freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c</a></li>
<li><a href="#freeswitchtrunksrcmodformatsmod_local_streammod_local_streamc">freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_pcmc">freeswitch/trunk/src/switch_pcm.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_loadable_moduleh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_loadable_module.h (16025 => 16026)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_loadable_module.h 2009-12-22 20:52:46 UTC (rev 16025)
+++ freeswitch/trunk/src/include/switch_loadable_module.h 2009-12-22 21:24:15 UTC (rev 16026)
</span><span class="lines">@@ -339,10 +339,14 @@
</span><span class="cx"> ptime_div = 2;
</span><span class="cx"> break;
</span><span class="cx"> case 32000:
</span><ins>+ case 24000:
</ins><span class="cx"> case 16000:
</span><span class="cx"> max_ms = 60;
</span><span class="cx"> ptime_div = 2;
</span><span class="cx"> break;
</span><ins>+ case 12000:
+ max_ms = 100;
+ ptime_div = 2;
</ins><span class="cx"> case 8000:
</span><span class="cx"> max_ms = 120;
</span><span class="cx"> ptime_div = 2;
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_utilsh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_utils.h (16025 => 16026)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_utils.h 2009-12-22 20:52:46 UTC (rev 16025)
+++ freeswitch/trunk/src/include/switch_utils.h 2009-12-22 21:24:15 UTC (rev 16026)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> #define switch_arraylen(_a) (sizeof(_a) / sizeof(_a[0]))
</span><span class="cx"> #define switch_split(_data, _delim, _array) switch_separate_string(_data, _delim, _array, switch_arraylen(_array))
</span><span class="cx">
</span><del>-#define switch_is_valid_rate(_tmp) (_tmp == 8000 || _tmp == 16000 || _tmp == 32000 || _tmp == 11025 || _tmp == 22050 || _tmp == 44100 || _tmp == 48000)
</del><ins>+#define switch_is_valid_rate(_tmp) (_tmp == 8000 || _tmp == 12000 || _tmp == 16000 || _tmp == 24000 || _tmp == 32000 || _tmp == 11025 || _tmp == 22050 || _tmp == 44100 || _tmp == 48000)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> static inline int switch_string_has_escaped_data(const char *in)
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_conferencemod_conferencec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (16025 => 16026)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c 2009-12-22 20:52:46 UTC (rev 16025)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c 2009-12-22 21:24:15 UTC (rev 16026)
</span><span class="lines">@@ -5761,7 +5761,7 @@
</span><span class="cx">
</span><span class="cx"> if (!strcasecmp(var, "rate") && !zstr(val)) {
</span><span class="cx"> uint32_t tmp = atoi(val);
</span><del>- if (tmp == 8000 || tmp == 16000 || tmp == 32000 || tmp == 48000) {
</del><ins>+ if (tmp == 8000 || tmp == 12000 || tmp == 16000 || tmp == 24000 || tmp == 32000 || tmp == 48000) {
</ins><span class="cx"> rate = tmp;
</span><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(var, "domain") && !zstr(val)) {
</span></span></pre></div>
<a id="freeswitchtrunksrcmodformatsmod_local_streammod_local_streamc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (16025 => 16026)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c 2009-12-22 20:52:46 UTC (rev 16025)
+++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c 2009-12-22 21:24:15 UTC (rev 16026)
</span><span class="lines">@@ -546,7 +546,7 @@
</span><span class="cx">
</span><span class="cx"> if (!strcasecmp(var, "rate")) {
</span><span class="cx"> int tmp = atoi(val);
</span><del>- if (tmp == 8000 || tmp == 16000 || tmp == 32000 || tmp == 48000) {
</del><ins>+ if (tmp == 8000 || tmp == 12000 || tmp == 16000 || tmp == 24000 || tmp == 32000 || tmp == 48000) {
</ins><span class="cx"> source->rate = tmp;
</span><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(var, "shuffle")) {
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_pcmc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_pcm.c (16025 => 16026)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_pcm.c 2009-12-22 20:52:46 UTC (rev 16025)
+++ freeswitch/trunk/src/switch_pcm.c 2009-12-22 21:24:15 UTC (rev 16026)
</span><span class="lines">@@ -388,6 +388,67 @@
</span><span class="cx"> bpf = bpf * 2;
</span><span class="cx"> ebpf = ebpf * 2;
</span><span class="cx"> }
</span><ins>+
+ samples_per_frame = 240;
+ bytes_per_frame = 480;
+ ms_per_frame = 20000;
+
+ for (x = 0; x < 5; x++) {
+ switch_core_codec_add_implementation(pool, codec_interface,
+ SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
+ 10, /* the IANA code number */
+ "L16", /* the IANA code name */
+ NULL, /* default fmtp to send (can be overridden by the init function) */
+ 12000, /* samples transferred per second */
+ 12000, /* actual samples transferred per second */
+ 192000, /* bits transferred per second */
+ ms_per_frame, /* number of microseconds per frame */
+ samples_per_frame, /* number of samples per frame */
+ bytes_per_frame, /* number of bytes per frame decompressed */
+ bytes_per_frame, /* number of bytes per frame compressed */
+ 1, /* number of channels represented */
+ 1, /* number of frames per network packet */
+ switch_raw_init, /* function to initialize a codec handle using this implementation */
+ switch_raw_encode, /* function to encode raw data into encoded data */
+ switch_raw_decode, /* function to decode encoded data into raw data */
+ switch_raw_destroy); /* deinitalize a codec handle using this implementation */
+
+ samples_per_frame += 240;
+ bytes_per_frame += 480;
+ ms_per_frame += 20000;
+
+ }
+
+ samples_per_frame = 480;
+ bytes_per_frame = 960;
+ ms_per_frame = 20000;
+
+ for (x = 0; x < 3; x++) {
+ switch_core_codec_add_implementation(pool, codec_interface,
+ SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
+ 10, /* the IANA code number */
+ "L16", /* the IANA code name */
+ NULL, /* default fmtp to send (can be overridden by the init function) */
+ 24000, /* samples transferred per second */
+ 24000, /* actual samples transferred per second */
+ 384000, /* bits transferred per second */
+ ms_per_frame, /* number of microseconds per frame */
+ samples_per_frame, /* number of samples per frame */
+ bytes_per_frame, /* number of bytes per frame decompressed */
+ bytes_per_frame, /* number of bytes per frame compressed */
+ 1, /* number of channels represented */
+ 1, /* number of frames per network packet */
+ switch_raw_init, /* function to initialize a codec handle using this implementation */
+ switch_raw_encode, /* function to encode raw data into encoded data */
+ switch_raw_decode, /* function to decode encoded data into raw data */
+ switch_raw_destroy); /* deinitalize a codec handle using this implementation */
+
+ samples_per_frame += 480;
+ bytes_per_frame += 960;
+ ms_per_frame += 20000;
+
+ }
+
</ins><span class="cx"> /* these formats below are for file playing. */
</span><span class="cx">
</span><span class="cx"> samples_per_frame = 96;
</span><span class="lines">@@ -451,8 +512,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> samples_per_frame = 32;
</span><span class="cx"> bytes_per_frame = 64;
</span><span class="cx"> ms_per_frame = 2000;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>