提交 a6fbb7f9 authored 作者: Brian West's avatar Brian West

housekeeping.. *tap* *tap* housekeeping...

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7386 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 aab6766e
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* Anthony Minessale II <anthmct@yahoo.com> * Anthony Minessale II <anthmct@yahoo.com>
* *
* *
* mod_g711codec.c -- G711 Ulaw/Alaw Codec Module * mod_g711.c -- G711 Ulaw/Alaw Codec Module
* *
*/ */
#include <switch.h> #include <switch.h>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
* *
* The g723.1 codec itself is not distributed with this module. * The g723.1 codec itself is not distributed with this module.
* *
* mod_g723.c -- G723.1 Codec Module * mod_g723_1.c -- G723.1 Codec Module
* *
*/ */
#include "switch.h" #include "switch.h"
...@@ -97,7 +97,6 @@ static switch_status_t switch_g723_init(switch_codec_t *codec, switch_codec_flag ...@@ -97,7 +97,6 @@ static switch_status_t switch_g723_init(switch_codec_t *codec, switch_codec_flag
#endif #endif
} }
static switch_status_t switch_g723_destroy(switch_codec_t *codec) static switch_status_t switch_g723_destroy(switch_codec_t *codec)
{ {
#ifndef G723_PASSTHROUGH #ifndef G723_PASSTHROUGH
......
...@@ -39,7 +39,6 @@ SWITCH_MODULE_DEFINITION(mod_g726, mod_g726_load, NULL, NULL); ...@@ -39,7 +39,6 @@ SWITCH_MODULE_DEFINITION(mod_g726, mod_g726_load, NULL, NULL);
typedef int (*encoder_t) (int, int, g726_state *); typedef int (*encoder_t) (int, int, g726_state *);
typedef int (*decoder_t) (int, int, g726_state *); typedef int (*decoder_t) (int, int, g726_state *);
typedef struct { typedef struct {
g726_state context; g726_state context;
switch_byte_t bits_per_frame; switch_byte_t bits_per_frame;
...@@ -101,15 +100,12 @@ static switch_status_t switch_g726_init(switch_codec_t *codec, switch_codec_flag ...@@ -101,15 +100,12 @@ static switch_status_t switch_g726_init(switch_codec_t *codec, switch_codec_flag
} }
} }
static switch_status_t switch_g726_destroy(switch_codec_t *codec) static switch_status_t switch_g726_destroy(switch_codec_t *codec)
{ {
codec->private_info = NULL; codec->private_info = NULL;
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
static switch_status_t switch_g726_encode(switch_codec_t *codec, static switch_status_t switch_g726_encode(switch_codec_t *codec,
switch_codec_t *other_codec, switch_codec_t *other_codec,
void *decoded_data, void *decoded_data,
...@@ -117,11 +113,9 @@ static switch_status_t switch_g726_encode(switch_codec_t *codec, ...@@ -117,11 +113,9 @@ static switch_status_t switch_g726_encode(switch_codec_t *codec,
uint32_t decoded_rate, void *encoded_data, uint32_t * encoded_data_len, uint32_t * encoded_rate, uint32_t decoded_rate, void *encoded_data, uint32_t * encoded_data_len, uint32_t * encoded_rate,
unsigned int *flag) unsigned int *flag)
{ {
g726_handle_t *handle = codec->private_info; g726_handle_t *handle = codec->private_info;
g726_state *context = &handle->context; g726_state *context = &handle->context;
uint32_t len = codec->implementation->bytes_per_frame; uint32_t len = codec->implementation->bytes_per_frame;
//uint32_t elen = codec->implementation->encoded_bytes_per_frame;
if (!context) { if (!context) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error!\n");
...@@ -155,8 +149,6 @@ static switch_status_t switch_g726_encode(switch_codec_t *codec, ...@@ -155,8 +149,6 @@ static switch_status_t switch_g726_encode(switch_codec_t *codec,
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
static switch_status_t switch_g726_decode(switch_codec_t *codec, static switch_status_t switch_g726_decode(switch_codec_t *codec,
switch_codec_t *other_codec, switch_codec_t *other_codec,
void *encoded_data, void *encoded_data,
...@@ -164,7 +156,6 @@ static switch_status_t switch_g726_decode(switch_codec_t *codec, ...@@ -164,7 +156,6 @@ static switch_status_t switch_g726_decode(switch_codec_t *codec,
uint32_t encoded_rate, void *decoded_data, uint32_t * decoded_data_len, uint32_t * decoded_rate, uint32_t encoded_rate, void *decoded_data, uint32_t * decoded_data_len, uint32_t * decoded_rate,
unsigned int *flag) unsigned int *flag)
{ {
g726_handle_t *handle = codec->private_info; g726_handle_t *handle = codec->private_info;
g726_state *context = &handle->context; g726_state *context = &handle->context;
int16_t *ddp = decoded_data; int16_t *ddp = decoded_data;
...@@ -195,13 +186,9 @@ static switch_status_t switch_g726_decode(switch_codec_t *codec, ...@@ -195,13 +186,9 @@ static switch_status_t switch_g726_decode(switch_codec_t *codec,
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
/* Registration */ /* Registration */
static switch_codec_implementation_t g726_16k_implementation = { static switch_codec_implementation_t g726_16k_implementation = {
...@@ -225,7 +212,6 @@ static switch_codec_implementation_t g726_16k_implementation = { ...@@ -225,7 +212,6 @@ static switch_codec_implementation_t g726_16k_implementation = {
/*.destroy */ switch_g726_destroy, /*.destroy */ switch_g726_destroy,
}; };
static switch_codec_implementation_t g726_24k_implementation = { static switch_codec_implementation_t g726_24k_implementation = {
/*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO,
/*.ianacode */ 126, /*.ianacode */ 126,
...@@ -289,8 +275,6 @@ static switch_codec_implementation_t g726_40k_implementation = { ...@@ -289,8 +275,6 @@ static switch_codec_implementation_t g726_40k_implementation = {
/*.destroy */ switch_g726_destroy, /*.destroy */ switch_g726_destroy,
}; };
static switch_codec_implementation_t aal2_g726_16k_implementation = { static switch_codec_implementation_t aal2_g726_16k_implementation = {
/*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO,
/*.ianacode */ 124, /*.ianacode */ 124,
...@@ -312,7 +296,6 @@ static switch_codec_implementation_t aal2_g726_16k_implementation = { ...@@ -312,7 +296,6 @@ static switch_codec_implementation_t aal2_g726_16k_implementation = {
/*.destroy */ switch_g726_destroy, /*.destroy */ switch_g726_destroy,
}; };
static switch_codec_implementation_t aal2_g726_24k_implementation = { static switch_codec_implementation_t aal2_g726_24k_implementation = {
/*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO,
/*.ianacode */ 123, /*.ianacode */ 123,
......
...@@ -78,7 +78,6 @@ static switch_status_t switch_g729_init(switch_codec_t *codec, switch_codec_flag ...@@ -78,7 +78,6 @@ static switch_status_t switch_g729_init(switch_codec_t *codec, switch_codec_flag
codec->private_info = context; codec->private_info = context;
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
#endif #endif
} }
...@@ -151,7 +150,6 @@ static switch_status_t switch_g729_decode(switch_codec_t *codec, ...@@ -151,7 +150,6 @@ static switch_status_t switch_g729_decode(switch_codec_t *codec,
if (!context) { if (!context) {
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
if (encoded_data_len % 2 == 0) { if (encoded_data_len % 2 == 0) {
...@@ -192,11 +190,8 @@ static switch_status_t switch_g729_decode(switch_codec_t *codec, ...@@ -192,11 +190,8 @@ static switch_status_t switch_g729_decode(switch_codec_t *codec,
} }
if (new_len <= *decoded_data_len) { if (new_len <= *decoded_data_len) {
*decoded_data_len = new_len; *decoded_data_len = new_len;
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "buffer overflow!!!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "buffer overflow!!!\n");
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* Anthony Minessale II <anthmct@yahoo.com> * Anthony Minessale II <anthmct@yahoo.com>
* Michael Jerris <mike@jerris.com> * Michael Jerris <mike@jerris.com>
* *
* mod_codec_gsm.c -- gsm Codec Module * mod_gsm.c -- gsm Codec Module
* *
*/ */
#include "switch.h" #include "switch.h"
......
...@@ -71,7 +71,6 @@ static switch_status_t switch_h26x_decode(switch_codec_t *codec, ...@@ -71,7 +71,6 @@ static switch_status_t switch_h26x_decode(switch_codec_t *codec,
static switch_status_t switch_h26x_destroy(switch_codec_t *codec) static switch_status_t switch_h26x_destroy(switch_codec_t *codec)
{ {
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
......
...@@ -51,7 +51,6 @@ static switch_status_t switch_ilbc_init(switch_codec_t *codec, switch_codec_flag ...@@ -51,7 +51,6 @@ static switch_status_t switch_ilbc_init(switch_codec_t *codec, switch_codec_flag
int encoding, decoding; int encoding, decoding;
uint8_t ms = (uint8_t) (codec->implementation->microseconds_per_frame / 1000); uint8_t ms = (uint8_t) (codec->implementation->microseconds_per_frame / 1000);
if (ms != 20 && ms != 30) { if (ms != 20 && ms != 30) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid speed! (I should never happen)\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid speed! (I should never happen)\n");
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* Anthony Minessale II <anthmct@yahoo.com> * Anthony Minessale II <anthmct@yahoo.com>
* *
* *
* mod_rawaudio.c -- Raw Signed Linear Codec * mod_l16.c -- Raw Signed Linear Codec
* *
*/ */
#include <switch.h> #include <switch.h>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论