<!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][16950] </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=16950">16950</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2010-03-08 21:29:25 -0600 (Mon, 08 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre> commit contribution from a community member </pre>
<h3>Modified Paths</h3>
<ul>
<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="freeswitchtrunksrcmodcodecsmod_silkmod_silkc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/codecs/mod_silk/mod_silk.c (16949 => 16950)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/codecs/mod_silk/mod_silk.c 2010-03-09 03:21:47 UTC (rev 16949)
+++ freeswitch/trunk/src/mod/codecs/mod_silk/mod_silk.c 2010-03-09 03:29:25 UTC (rev 16950)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
</span><del>- * Copyright (C) 2005-2010, Anthony Minessale II <anthm@freeswitch.org>
</del><ins>+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
</ins><span class="cx"> *
</span><span class="cx"> * Version: MPL 1.1
</span><span class="cx"> *
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> SWITCH_MODULE_LOAD_FUNCTION(mod_silk_load);
</span><span class="cx"> SWITCH_MODULE_DEFINITION(mod_silk, mod_silk_load, NULL, NULL);
</span><span class="cx">
</span><del>-#define MAX_BYTES_PER_FRAME 250
</del><ins>+#define MAX_BYTES_PER_FRAME 250
</ins><span class="cx"> #define MAX_INPUT_FRAMES 5
</span><span class="cx"> #define MAX_LBRR_DELAY 2
</span><span class="cx"> #define MAX_FRAME_LENGTH 480
</span><span class="lines">@@ -48,20 +48,21 @@
</span><span class="cx"> void *dec_state;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-static switch_status_t switch_silk_init(switch_codec_t *codec, switch_codec_flag_t freeswitch_flags, const switch_codec_settings_t *codec_settings)
</del><ins>+static switch_status_t switch_silk_init(switch_codec_t *codec,
+ switch_codec_flag_t freeswitch_flags,
+ const switch_codec_settings_t *codec_settings)
</ins><span class="cx"> {
</span><span class="cx"> struct silk_context *context = NULL;
</span><del>- SKP_int useinbandfec = 0, usedtx = 0, maxaveragebitrate = 0;
</del><ins>+ SKP_int useinbandfec = 0, usedtx = 0, maxaveragebitrate = 0, plpct =0;
</ins><span class="cx"> SKP_int32 encSizeBytes;
</span><span class="cx"> SKP_int32 decSizeBytes;
</span><span class="cx"> int encoding = (freeswitch_flags & SWITCH_CODEC_FLAG_ENCODE);
</span><span class="cx"> int decoding = (freeswitch_flags & SWITCH_CODEC_FLAG_DECODE);
</span><span class="cx">
</span><del>- if (!(encoding || decoding)
- || (!(context = switch_core_alloc(codec->memory_pool, sizeof(*context))))) {
</del><ins>+ if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(*context))))) {
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (codec->fmtp_in) {
</span><span class="cx"> int x, argc;
</span><span class="cx"> char *argv[10];
</span><span class="lines">@@ -78,6 +79,7 @@
</span><span class="cx"> if (!strcasecmp(data, "useinbandfec")) {
</span><span class="cx"> if (switch_true(arg)) {
</span><span class="cx"> useinbandfec = 1;
</span><ins>+ plpct = 10;// 10% for now
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (!strcasecmp(data, "usedtx")) {
</span><span class="lines">@@ -87,70 +89,70 @@
</span><span class="cx"> }
</span><span class="cx"> if (!strcasecmp(data, "maxaveragebitrate")) {
</span><span class="cx"> maxaveragebitrate = atoi(arg);
</span><del>- switch (codec->implementation->actual_samples_per_second) {
</del><ins>+ switch(codec->implementation->actual_samples_per_second) {
</ins><span class="cx"> case 8000:
</span><span class="cx"> {
</span><del>- if (maxaveragebitrate < 6000 || maxaveragebitrate > 20000) {
</del><ins>+ if(maxaveragebitrate < 6000 || maxaveragebitrate > 20000) {
</ins><span class="cx"> maxaveragebitrate = 20000;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case 12000:
</span><span class="cx"> {
</span><del>- if (maxaveragebitrate < 7000 || maxaveragebitrate > 25000) {
</del><ins>+ if(maxaveragebitrate < 7000 || maxaveragebitrate > 25000) {
</ins><span class="cx"> maxaveragebitrate = 25000;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case 16000:
</span><span class="cx"> {
</span><del>- if (maxaveragebitrate < 8000 || maxaveragebitrate > 30000) {
</del><ins>+ if(maxaveragebitrate < 8000 || maxaveragebitrate > 30000) {
</ins><span class="cx"> maxaveragebitrate = 30000;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case 24000:
</span><span class="cx"> {
</span><del>- if (maxaveragebitrate < 12000 || maxaveragebitrate > 40000) {
</del><ins>+ if(maxaveragebitrate < 12000 || maxaveragebitrate > 40000) {
</ins><span class="cx"> maxaveragebitrate = 40000;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> default:
</span><span class="cx"> /* this should never happen but 20000 is common among all rates */
</span><span class="cx"> maxaveragebitrate = 20000;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ 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);
</ins><span class="cx">
</span><del>- 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);
-
</del><span class="cx"> if (encoding) {
</span><span class="cx"> if (SKP_Silk_SDK_Get_Encoder_Size(&encSizeBytes)) {
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> context->enc_state = switch_core_alloc(codec->memory_pool, encSizeBytes);
</span><span class="cx">
</span><span class="cx"> if (SKP_Silk_SDK_InitEncoder(context->enc_state, &context->encoder_object)) {
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> context->encoder_object.sampleRate = codec->implementation->actual_samples_per_second;
</span><span class="cx"> context->encoder_object.packetSize = codec->implementation->samples_per_packet;
</span><span class="cx"> context->encoder_object.useInBandFec = useinbandfec;
</span><span class="cx"> context->encoder_object.complexity = 2;
</span><span class="cx"> context->encoder_object.bitRate = maxaveragebitrate ? maxaveragebitrate : codec->implementation->bits_per_second;
</span><span class="cx"> context->encoder_object.useDtx = usedtx;
</span><ins>+ context->encoder_object.packetLossPercentage = plpct;;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (decoding) {
</span><span class="lines">@@ -172,56 +174,121 @@
</span><span class="cx">
</span><span class="cx"> static switch_status_t switch_silk_destroy(switch_codec_t *codec)
</span><span class="cx"> {
</span><del>- codec->private_info = NULL;
</del><ins>+ codec->private_info = NULL;
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void printSilkError(SKP_int16 ret){
+ char * message;
+ switch (ret) {
+ case SKP_SILK_NO_ERROR: message = "No errors";
+ break;
+ case SKP_SILK_ENC_INPUT_INVALID_NO_OF_SAMPLES:
+ message = "Input length is not multiplum of 10 ms, or length is longer than the packet length";
+ break;
+ case SKP_SILK_ENC_FS_NOT_SUPPORTED:
+ message = "Sampling frequency not 8000 , 12000, 16000 or 24000 Hertz";
+ break;
+ case SKP_SILK_ENC_PACKET_SIZE_NOT_SUPPORTED:
+ message ="Packet size not 20, 40 , 60 , 80 or 100 ms ";
+ break;
+ case SKP_SILK_ENC_PAYLOAD_BUF_TOO_SHORT:
+ message = "Allocated payload buffer too short";
+ break;
+ case SKP_SILK_ENC_WRONG_LOSS_RATE:
+ message = " Loss rate not between 0 and 100 % ";
+ break;
+ case SKP_SILK_ENC_WRONG_COMPLEXITY_SETTING:
+ message = "Complexity setting not valid, use 0 ,1 or 2";
+ break;
+ case SKP_SILK_ENC_WRONG_INBAND_FEC_SETTING:
+ message = "Inband FEC setting not valid, use 0 or 1 ";
+ break;
+ case SKP_SILK_ENC_WRONG_DTX_SETTING:
+ message = "DTX setting not valid, use 0 or 1";
+ break;
+ case SKP_SILK_ENC_INTERNAL_ERROR:
+ message = "Internal Encoder Error ";
+ break;
+ case SKP_SILK_DEC_WRONG_SAMPLING_FREQUENCY:
+ message = "Output sampling frequency lower than internal decoded sampling frequency";
+ break;
+ case SKP_SILK_DEC_PAYLOAD_TOO_LARGE:
+ message = "Payload size exceeded the maximum allowed 1024 bytes";
+ break;
+ case SKP_SILK_DEC_PAYLOAD_ERROR :
+ message = "Payload has bit errors";
+ break;
+ default:
+ message = "unknown";
+ break;
+ }
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR," Silk Error message= %s\n",message);
+}
</ins><span class="cx">
</span><del>-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)
</del><ins>+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)
</ins><span class="cx"> {
</span><span class="cx"> struct silk_context *context = codec->private_info;
</span><span class="cx"> SKP_int16 ret;
</span><del>- 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);
</del><ins>+ SKP_int16 pktsz = context->encoder_object.packetSize;
+ SKP_int16 nBytes = MAX_BYTES_PER_FRAME * MAX_INPUT_FRAMES;
+ SKP_int16 *lindata = (SKP_int16 *)decoded_data;
+ SKP_int16 samples = decoded_data_len /sizeof(SKP_int16);
+ *encoded_data_len = 0;
+ while (samples >= pktsz){
+ ret = SKP_Silk_SDK_Encode(context->enc_state,
+ &context->encoder_object,
+ lindata,
+ pktsz,
+ encoded_data,
+ &nBytes);
+
+ if (ret) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SKP_Silk_Encode returned %d!\n", ret);
+ printSilkError(ret);
+ }
+ *encoded_data_len += nBytes;
+ samples-=pktsz;
+ lindata+= pktsz;
</ins><span class="cx"> }
</span><ins>+ if (samples != 0){
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "switch_silk_encode dumping partial frame %d!\n", samples);
+ }
</ins><span class="cx">
</span><del>- *encoded_data_len = nBytes;
-
</del><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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)
</del><ins>+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)
</ins><span class="cx"> {
</span><span class="cx"> struct silk_context *context = codec->private_info;
</span><del>- SKP_int16 ret, len;
</del><ins>+ SKP_int16 ret, len;
</ins><span class="cx"> int16_t *target = decoded_data;
</span><span class="cx">
</span><span class="cx"> *decoded_data_len = 0;
</span><span class="cx">
</span><span class="cx"> do {
</span><del>- ret = SKP_Silk_SDK_Decode(context->dec_state, &context->decoder_object, ((*flag & SFF_PLC)), encoded_data, encoded_data_len, target, &len);
- if (ret) {
</del><ins>+ ret = SKP_Silk_SDK_Decode(context->dec_state,
+ &context->decoder_object,
+ ((*flag & SFF_PLC)),
+ encoded_data,
+ encoded_data_len,
+ target,
+ &len);
+ if (ret){
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SKP_Silk_Decode returned %d!\n", ret);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> target += len;
</span><span class="cx"> *decoded_data_len += (len * 2);
</span><del>- }
- while (context->decoder_object.internalDecoderFrames);
</del><ins>+ } while (context->decoder_object.internalDecoderFrames);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -232,77 +299,81 @@
</span><span class="cx"> *module_interface = switch_loadable_module_create_module_interface(pool, modname);
</span><span class="cx">
</span><span class="cx"> SWITCH_ADD_CODEC(codec_interface, "SILK");
</span><del>- 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 */
</del><ins>+ 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=true; 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 */
</ins><span class="cx">
</span><del>- 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 */
</del><ins>+ 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 */
</ins><span class="cx"> "useinbandfec=false; usedtx=false", /* default fmtp to send (can be overridden by the init function) */
</span><del>- 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 */
</del><ins>+ 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 */
</ins><span class="cx">
</span><del>- 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 */
</del><ins>+ 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 */
</ins><span class="cx"> "useinbandfec=false; usedtx=false", /* default fmtp to send (can be overridden by the init function) */
</span><del>- 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 */
</del><ins>+ 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 */
</ins><span class="cx">
</span><del>- 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 */
</del><ins>+ 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 */
</ins><span class="cx"> "useinbandfec=false; usedtx=false", /* default fmtp to send (can be overridden by the init function) */
</span><del>- 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 */
</del><ins>+ 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 */
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> /* indicate that the module should continue to be loaded */
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>