Formatting fixes.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@469 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
5d0589e64e
commit
f006188a87
|
@ -31,57 +31,89 @@
|
||||||
*/
|
*/
|
||||||
#include "switch.h"
|
#include "switch.h"
|
||||||
#include "g729.h"
|
#include "g729.h"
|
||||||
|
|
||||||
static const char modname[] = "mod_codec_g729";
|
static const char modname[] = "mod_codec_g729";
|
||||||
|
|
||||||
|
|
||||||
struct g729_context {
|
struct g729_context {
|
||||||
|
|
||||||
struct dec_state decoder_object;
|
struct dec_state decoder_object;
|
||||||
struct cod_state encoder_object;
|
struct cod_state encoder_object;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static switch_status switch_g729_init(switch_codec *codec, switch_codec_flag flags,
|
static switch_status switch_g729_init(switch_codec *codec, switch_codec_flag flags,
|
||||||
const struct switch_codec_settings *codec_settings)
|
const struct switch_codec_settings *codec_settings)
|
||||||
{
|
{
|
||||||
|
|
||||||
struct g729_context *context = NULL;
|
struct g729_context *context = NULL;
|
||||||
int encoding, decoding;
|
int encoding, decoding;
|
||||||
|
|
||||||
encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
|
encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
|
||||||
decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
|
decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
|
||||||
|
|
||||||
if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(struct g729_context))))) {
|
if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(struct g729_context))))) {
|
||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
if (encoding) {
|
if (encoding) {
|
||||||
g729_init_coder(&context->encoder_object, 0);
|
g729_init_coder(&context->encoder_object, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (decoding) {
|
if (decoding) {
|
||||||
g729_init_decoder(&context->decoder_object);
|
g729_init_decoder(&context->decoder_object);
|
||||||
}
|
}
|
||||||
|
|
||||||
codec->private = context;
|
codec->private = context;
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static switch_status switch_g729_destroy(switch_codec *codec)
|
static switch_status switch_g729_destroy(switch_codec *codec)
|
||||||
{
|
{
|
||||||
codec->private = NULL;
|
codec->private = NULL;
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
static switch_status switch_g729_encode(switch_codec *codec,
switch_codec *other_codec,
void *decoded_data,
|
|
||||||
size_t decoded_data_len,
int decoded_rate,
void *encoded_data,
|
|
||||||
size_t *encoded_data_len,
int *encoded_rate,
unsigned int *flag)
|
|
||||||
|
static switch_status switch_g729_encode(switch_codec *codec,
|
||||||
|
switch_codec *other_codec,
|
||||||
|
void *decoded_data,
|
||||||
|
|
||||||
|
size_t decoded_data_len,
|
||||||
|
int decoded_rate,
|
||||||
|
void *encoded_data,
|
||||||
|
|
||||||
|
size_t *encoded_data_len,
|
||||||
|
int *encoded_rate,
|
||||||
|
unsigned int *flag)
|
||||||
{
|
{
|
||||||
|
|
||||||
struct g729_context *context = codec->private;
|
struct g729_context *context = codec->private;
|
||||||
int cbret = 0;
|
int cbret = 0;
|
||||||
|
|
||||||
if (!context) {
|
if (!context) {
|
||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (decoded_data_len % 160 == 0) {
|
if (decoded_data_len % 160 == 0) {
|
||||||
unsigned int new_len = 0;
|
unsigned int new_len = 0;
|
||||||
INT16 * ddp = decoded_data;
|
INT16 * ddp = decoded_data;
|
||||||
char *edp = encoded_data;
|
char *edp = encoded_data;
|
||||||
int x;
|
int x;
|
||||||
int loops = (int) decoded_data_len / 160;
|
int loops = (int) decoded_data_len / 160;
|
||||||
|
|
||||||
for (x = 0; x < loops && new_len < *encoded_data_len; x++) {
|
for (x = 0; x < loops && new_len < *encoded_data_len; x++) {
|
||||||
g729_coder(&context->encoder_object, ddp, edp, &cbret);
|
g729_coder(&context->encoder_object, ddp, edp, &cbret);
|
||||||
edp += 10;
|
edp += 10;
|
||||||
ddp += 80;
|
ddp += 80;
|
||||||
new_len += 10;
|
new_len += 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (new_len <= *encoded_data_len) {
|
if (new_len <= *encoded_data_len) {
|
||||||
*encoded_data_len = new_len;
|
*encoded_data_len = new_len;
|
||||||
} else {
|
} else {
|
||||||
|
@ -91,40 +123,85 @@
|
||||||
}
|
}
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
static switch_status switch_g729_decode(switch_codec *codec,
switch_codec *other_codec,
void *encoded_data,
|
|
||||||
size_t encoded_data_len,
int encoded_rate,
void *decoded_data,
|
|
||||||
size_t *decoded_data_len,
int *decoded_rate,
unsigned int *flag)
|
|
||||||
|
static switch_status switch_g729_decode(switch_codec *codec,
|
||||||
|
switch_codec *other_codec,
|
||||||
|
void *encoded_data,
|
||||||
|
|
||||||
|
size_t encoded_data_len,
|
||||||
|
int encoded_rate,
|
||||||
|
void *decoded_data,
|
||||||
|
|
||||||
|
size_t *decoded_data_len,
|
||||||
|
int *decoded_rate,
|
||||||
|
unsigned int *flag)
|
||||||
{
|
{
|
||||||
|
|
||||||
struct g729_context *context = codec->private;
|
struct g729_context *context = codec->private;
|
||||||
|
|
||||||
|
|
||||||
if (!context) {
|
if (!context) {
|
||||||
|
|
||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (encoded_data_len % 10 == 0) {
|
if (encoded_data_len % 10 == 0) {
|
||||||
|
|
||||||
int loops = (int) encoded_data_len / 10;
|
int loops = (int) encoded_data_len / 10;
|
||||||
|
|
||||||
char *edp = encoded_data;
|
char *edp = encoded_data;
|
||||||
|
|
||||||
short *ddp = decoded_data;
|
short *ddp = decoded_data;
|
||||||
|
|
||||||
int x;
|
int x;
|
||||||
|
|
||||||
unsigned int new_len = 0;
|
unsigned int new_len = 0;
|
||||||
|
|
||||||
for (x = 0; x < loops && new_len < *decoded_data_len; x++) {
|
for (x = 0; x < loops && new_len < *decoded_data_len; x++) {
|
||||||
|
|
||||||
g729_decoder(&context->decoder_object, ddp, edp, 10);
|
g729_decoder(&context->decoder_object, ddp, edp, 10);
|
||||||
|
|
||||||
ddp += 80;
|
ddp += 80;
|
||||||
|
|
||||||
edp += 10;
|
edp += 10;
|
||||||
|
|
||||||
new_len += 160;
|
new_len += 160;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
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_console_printf(SWITCH_CHANNEL_CONSOLE, "buffer overflow!!!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "buffer overflow!!!\n");
|
||||||
|
|
||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "yo this frame is an odd size [%d]\n", encoded_data_len);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "yo this frame is an odd size [%d]\n", encoded_data_len);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* Registration */
|
/* Registration */
|
||||||
|
|
||||||
static const switch_codec_implementation g729_8k_implementation = {
|
static const switch_codec_implementation g729_8k_implementation = {
|
||||||
/*.samples_per_second */ 8000,
|
/*.samples_per_second */ 8000,
|
||||||
/*.bits_per_second */ 64000,
|
/*.bits_per_second */ 64000,
|
||||||
|
@ -140,6 +217,8 @@
|
||||||
/*.decode */ switch_g729_decode,
|
/*.decode */ switch_g729_decode,
|
||||||
/*.destroy */ switch_g729_destroy,
|
/*.destroy */ switch_g729_destroy,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static const switch_codec_interface g729_codec_interface = {
|
static const switch_codec_interface g729_codec_interface = {
|
||||||
/*.interface_name */ "g729",
|
/*.interface_name */ "g729",
|
||||||
/*.codec_type */ SWITCH_CODEC_TYPE_AUDIO,
|
/*.codec_type */ SWITCH_CODEC_TYPE_AUDIO,
|
||||||
|
@ -147,6 +226,8 @@
|
||||||
/*.iananame */ "G729",
|
/*.iananame */ "G729",
|
||||||
/*.implementations */ &g729_8k_implementation,
|
/*.implementations */ &g729_8k_implementation,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static switch_loadable_module_interface g729_module_interface = {
|
static switch_loadable_module_interface g729_module_interface = {
|
||||||
/*.module_name */ modname,
|
/*.module_name */ modname,
|
||||||
/*.endpoint_interface */ NULL,
|
/*.endpoint_interface */ NULL,
|
||||||
|
@ -155,6 +236,9 @@
|
||||||
/*.codec_interface */ &g729_codec_interface,
|
/*.codec_interface */ &g729_codec_interface,
|
||||||
/*.application_interface */ NULL
|
/*.application_interface */ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface,
|
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface,
|
||||||
char *filename)
|
char *filename)
|
||||||
{
|
{
|
||||||
|
@ -162,8 +246,8 @@
|
||||||
/* connect my internal structure to the blank pointer passed to me */
|
/* connect my internal structure to the blank pointer passed to me */
|
||||||
*interface = &g729_module_interface;
|
*interface = &g729_module_interface;
|
||||||
|
|
||||||
|
|
||||||
/* indicate that the module should continue to be loaded */
|
/* indicate that the module should continue to be loaded */
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue