<!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][16945] </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=16945">16945</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2010-03-08 19:01:36 -0600 (Mon, 08 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre> mod_silk</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibssilkMakefile">freeswitch/trunk/libs/silk/Makefile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>freeswitch/trunk/src/mod/codecs/mod_silk/</li>
<li><a href="#freeswitchtrunksrcmodcodecsmod_silkMakefile">freeswitch/trunk/src/mod/codecs/mod_silk/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodcodecsmod_silkmod_silkc">freeswitch/trunk/src/mod/codecs/mod_silk/mod_silk.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibssilkMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/silk/Makefile (16944 => 16945)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/silk/Makefile 2010-03-09 00:45:20 UTC (rev 16944)
+++ freeswitch/trunk/libs/silk/Makefile 2010-03-09 01:01:36 UTC (rev 16945)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> ldflags-from-ldlibdirs = $(addprefix -L,$(1))
</span><span class="cx"> ldlibs-from-libs = $(addprefix -l,$(1))
</span><span class="cx">
</span><del>-CFLAGS += -Wall -enable-threads -O3
</del><ins>+CFLAGS += -Wall -enable-threads -O3 -fPIC
</ins><span class="cx">
</span><span class="cx"> CFLAGS += $(call cppflags-from-defines,$(CDEFINES))
</span><span class="cx"> CFLAGS += $(call cppflags-from-includes,$(CINCLUDES))
</span></span></pre></div>
<a id="freeswitchtrunksrcmodcodecsmod_silkMakefile"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/src/mod/codecs/mod_silk/Makefile (0 => 16945)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/codecs/mod_silk/Makefile (rev 0)
+++ freeswitch/trunk/src/mod/codecs/mod_silk/Makefile 2010-03-09 01:01:36 UTC (rev 16945)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+BASE=../../../..
+
+A=../../../../libs/silk/libSKP_SILK_SDK.a
+
+LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I../../../../libs/silk/interface" ; else echo "-DNOTFOUND" ; fi ;
+LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A)
+
+include $(BASE)/build/modmake.rules
</ins></span></pre></div>
<a id="freeswitchtrunksrcmodcodecsmod_silkmod_silkc"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/src/mod/codecs/mod_silk/mod_silk.c (0 => 16945)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/codecs/mod_silk/mod_silk.c (rev 0)
+++ freeswitch/trunk/src/mod/codecs/mod_silk/mod_silk.c 2010-03-09 01:01:36 UTC (rev 16945)
</span><span class="lines">@@ -0,0 +1,312 @@
</span><ins>+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2010, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Brian K. West <brian@freeswitch.org>
+ *
+ * The silk codec itself is not distributed with this module.
+ *
+ * mod_silk.c -- Skype(tm) SILK Codec Module
+ *
+ */
+
+#include "switch.h"
+#include "SKP_Silk_SDK_API.h"
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_silk_load);
+SWITCH_MODULE_DEFINITION(mod_silk, mod_silk_load, NULL, NULL);
+
+#define MAX_BYTES_PER_FRAME 250
+#define MAX_INPUT_FRAMES 5
+#define MAX_LBRR_DELAY 2
+#define MAX_FRAME_LENGTH 480
+
+struct silk_context {
+ SKP_SILK_SDK_EncControlStruct encoder_object;
+ SKP_SILK_SDK_DecControlStruct decoder_object;
+ void *enc_state;
+ void *dec_state;
+};
+
+static switch_status_t switch_silk_init(switch_codec_t *codec, switch_codec_flag_t freeswitch_flags, const switch_codec_settings_t *codec_settings)
+{
+ struct silk_context *context = NULL;
+ SKP_int useinbandfec = 0, usedtx = 0, maxaveragebitrate = 0;
+ SKP_int32 encSizeBytes;
+ SKP_int32 decSizeBytes;
+ int encoding = (freeswitch_flags & SWITCH_CODEC_FLAG_ENCODE);
+ int decoding = (freeswitch_flags & SWITCH_CODEC_FLAG_DECODE);
+
+ if (!(encoding || decoding)
+ || (!(context = switch_core_alloc(codec->memory_pool, sizeof(*context))))) {
+ return SWITCH_STATUS_FALSE;
+ }
+
+ if (codec->fmtp_in) {
+ int x, argc;
+ char *argv[10];
+ argc = switch_separate_string(codec->fmtp_in, ';', argv, (sizeof(argv) / sizeof(argv[0])));
+ for (x = 0; x < argc; x++) {
+ char *data = argv[x];
+ char *arg;
+ switch_assert(data);
+ while (*data == ' ') {
+ data++;
+ }
+ if ((arg = strchr(data, '='))) {
+ *arg++ = '\0';
+ if (!strcasecmp(data, "useinbandfec")) {
+ if (switch_true(arg)) {
+ useinbandfec = 1;
+ }
+ }
+ if (!strcasecmp(data, "usedtx")) {
+ if (switch_true(arg)) {
+ usedtx = 1;
+ }
+ }
+ if (!strcasecmp(data, "maxaveragebitrate")) {
+ maxaveragebitrate = atoi(arg);
+ switch (codec->implementation->actual_samples_per_second) {
+ case 8000:
+ {
+ if (maxaveragebitrate < 6000 || maxaveragebitrate > 20000) {
+ maxaveragebitrate = 20000;
+ }
+ break;
+ }
+ case 12000:
+ {
+ if (maxaveragebitrate < 7000 || maxaveragebitrate > 25000) {
+ maxaveragebitrate = 25000;
+ }
+ break;
+ }
+ case 16000:
+ {
+ if (maxaveragebitrate < 8000 || maxaveragebitrate > 30000) {
+ maxaveragebitrate = 30000;
+ }
+ break;
+ }
+ case 24000:
+ {
+ if (maxaveragebitrate < 12000 || maxaveragebitrate > 40000) {
+ maxaveragebitrate = 40000;
+ }
+ break;
+ }
+
+ default:
+ /* this should never happen but 20000 is common among all rates */
+ maxaveragebitrate = 20000;
+ break;
+ }
+
+ }
+ }
+ }
+ }
+
+ codec->fmtp_out =
+ switch_core_sprintf(codec->memory_pool,
+ "useinbandfec=%s; usedtx=%s; maxaveragebitrate=%d",
+ useinbandfec ? "true" : "false",
+ usedtx ? "true" : "false", maxaveragebitrate ? maxaveragebitrate : codec->implementation->bits_per_second);
+
+ if (encoding) {
+ if (SKP_Silk_SDK_Get_Encoder_Size(&encSizeBytes)) {
+ return SWITCH_STATUS_FALSE;
+ }
+
+ context->enc_state = switch_core_alloc(codec->memory_pool, encSizeBytes);
+
+ if (SKP_Silk_SDK_InitEncoder(context->enc_state, &context->encoder_object)) {
+ return SWITCH_STATUS_FALSE;
+ }
+
+ context->encoder_object.sampleRate = codec->implementation->actual_samples_per_second;
+ context->encoder_object.packetSize = codec->implementation->samples_per_packet;
+ context->encoder_object.useInBandFec = useinbandfec;
+ context->encoder_object.complexity = 2;
+ context->encoder_object.bitRate = maxaveragebitrate ? maxaveragebitrate : codec->implementation->bits_per_second;
+ context->encoder_object.useDtx = usedtx;
+ }
+
+ if (decoding) {
+ if (SKP_Silk_SDK_Get_Decoder_Size(&decSizeBytes)) {
+ return SWITCH_STATUS_FALSE;
+ }
+ context->dec_state = switch_core_alloc(codec->memory_pool, decSizeBytes);
+
+ if (SKP_Silk_SDK_InitDecoder(context->dec_state)) {
+ return SWITCH_STATUS_FALSE;
+ }
+ context->decoder_object.sampleRate = codec->implementation->actual_samples_per_second;
+ }
+
+ codec->private_info = context;
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t switch_silk_destroy(switch_codec_t *codec)
+{
+ codec->private_info = NULL;
+ return SWITCH_STATUS_SUCCESS;
+}
+
+
+static switch_status_t
+switch_silk_encode(switch_codec_t *codec,
+ switch_codec_t *other_codec,
+ void *decoded_data,
+ uint32_t decoded_data_len,
+ uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate, unsigned int *flag)
+{
+ struct silk_context *context = codec->private_info;
+ SKP_int16 ret;
+ SKP_int16 nBytes = MAX_BYTES_PER_FRAME * MAX_INPUT_FRAMES;
+
+ ret = SKP_Silk_SDK_Encode(context->enc_state, &context->encoder_object, decoded_data, (SKP_int16) decoded_data_len / 2, encoded_data, &nBytes);
+
+ if (ret) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SKP_Silk_Encode returned %d!\n", ret);
+ }
+
+ *encoded_data_len = nBytes;
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t
+switch_silk_decode(switch_codec_t *codec,
+ switch_codec_t *other_codec,
+ void *encoded_data,
+ uint32_t encoded_data_len,
+ uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate, unsigned int *flag)
+{
+ struct silk_context *context = codec->private_info;
+ SKP_int16 ret, len;
+ int16_t *target = decoded_data;
+
+ *decoded_data_len = 0;
+
+ do {
+ ret = SKP_Silk_SDK_Decode(context->dec_state, &context->decoder_object, ((*flag & SFF_PLC)), encoded_data, encoded_data_len, target, &len);
+ if (ret) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SKP_Silk_Decode returned %d!\n", ret);
+ }
+
+ target += len;
+ *decoded_data_len += (len * 2);
+ }
+ while (context->decoder_object.internalDecoderFrames);
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_silk_load)
+{
+ switch_codec_interface_t *codec_interface;
+ *module_interface = switch_loadable_module_create_module_interface(pool, modname);
+
+ SWITCH_ADD_CODEC(codec_interface, "SILK");
+ switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
+ 117, /* the IANA code number */
+ "SILK", /* the IANA code name */
+ "useinbandfec=false; usedtx=false", /* default fmtp to send (can be overridden by the init function) */
+ 8000, /* samples transferred per second */
+ 8000, /* actual samples transferred per second */
+ 20000, /* bits transferred per second */
+ 20000, /* number of microseconds per frame */
+ 160, /* number of samples per frame */
+ 320, /* number of bytes per frame decompressed */
+ 0, /* number of bytes per frame compressed */
+ 1, /* number of channels represented */
+ 1, /* number of frames per network packet */
+ switch_silk_init, /* function to initialize a codec handle using this implementation */
+ switch_silk_encode, /* function to encode raw data into encoded data */
+ switch_silk_decode, /* function to decode encoded data into raw data */
+ switch_silk_destroy); /* deinitalize a codec handle using this implementation */
+
+ switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
+ 118, /* the IANA code number */
+ "SILK", /* the IANA code name */
+ "useinbandfec=false; usedtx=false", /* default fmtp to send (can be overridden by the init function) */
+ 12000, /* samples transferred per second */
+ 12000, /* actual samples transferred per second */
+ 25000, /* bits transferred per second */
+ 20000, /* number of microseconds per frame */
+ 240, /* number of samples per frame */
+ 480, /* number of bytes per frame decompressed */
+ 0, /* number of bytes per frame compressed */
+ 1, /* number of channels represented */
+ 1, /* number of frames per network packet */
+ switch_silk_init, /* function to initialize a codec handle using this implementation */
+ switch_silk_encode, /* function to encode raw data into encoded data */
+ switch_silk_decode, /* function to decode encoded data into raw data */
+ switch_silk_destroy); /* deinitalize a codec handle using this implementation */
+
+ switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
+ 119, /* the IANA code number */
+ "SILK", /* the IANA code name */
+ "useinbandfec=false; usedtx=false", /* default fmtp to send (can be overridden by the init function) */
+ 16000, /* samples transferred per second */
+ 16000, /* actual samples transferred per second */
+ 30000, /* bits transferred per second */
+ 20000, /* number of microseconds per frame */
+ 320, /* number of samples per frame */
+ 640, /* number of bytes per frame decompressed */
+ 0, /* number of bytes per frame compressed */
+ 1, /* number of channels represented */
+ 1, /* number of frames per network packet */
+ switch_silk_init, /* function to initialize a codec handle using this implementation */
+ switch_silk_encode, /* function to encode raw data into encoded data */
+ switch_silk_decode, /* function to decode encoded data into raw data */
+ switch_silk_destroy); /* deinitalize a codec handle using this implementation */
+
+ switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
+ 120, /* the IANA code number */
+ "SILK", /* the IANA code name */
+ "useinbandfec=false; usedtx=false", /* default fmtp to send (can be overridden by the init function) */
+ 24000, /* samples transferred per second */
+ 24000, /* actual samples transferred per second */
+ 40000, /* bits transferred per second */
+ 20000, /* number of microseconds per frame */
+ 480, /* number of samples per frame */
+ 960, /* number of bytes per frame decompressed */
+ 0, /* number of bytes per frame compressed */
+ 1, /* number of channels represented */
+ 1, /* number of frames per network packet */
+ switch_silk_init, /* function to initialize a codec handle using this implementation */
+ switch_silk_encode, /* function to encode raw data into encoded data */
+ switch_silk_decode, /* function to decode encoded data into raw data */
+ switch_silk_destroy); /* deinitalize a codec handle using this implementation */
+
+
+ /* indicate that the module should continue to be loaded */
+ return SWITCH_STATUS_SUCCESS;
+}
</ins></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>