fix codec

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@113 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/modules.conf b/modules.conf
index f85c99176dc7fa52c4ae734455a6f56635598b07..7c00f2874b1e7be0a7adcac13f44f2c51f116a52 100644 (file)
--- a/modules.conf
+++ b/modules.conf
@@ -11,3 +11,4 @@ mod_g711codec
 mod_rawaudio
 mod_iaxchan
 #mod_opalchan
+mod_codec_g729

diff --git a/src/mod/mod_codec_g729/mod_codec_g729.c b/src/mod/mod_codec_g729/mod_codec_g729.c
index 1927fbb929e492dd3f6417eb2e9ef4b7a2e14f50..3181048619ef4188203da2dc63def58b10bc9fed 100644 (file)
--- a/src/mod/mod_codec_g729/mod_codec_g729.c
+++ b/src/mod/mod_codec_g729/mod_codec_g729.c
@@ -79,22 +79,15 @@ static switch_status switch_g729_encode(switch_codec *codec,
                                                                   unsigned int *flag)\r
 {\r
        struct g729_context *context = codec->private;\r
-       short *dbuf;\r
-       unsigned char *ebuf;\r
        int cbret = 0;\r
 \r
-       if (!context)\r
+       if (!context) {\r
                return SWITCH_STATUS_FALSE;\r
+       }\r
 \r
-       dbuf = decoded_data;\r
-       ebuf = encoded_data;\r
+       g729_coder(&context->encoder_object, (short *) decoded_data,  encoded_data, &cbret);\r
        \r
-       if (decoded_data_len < (size_t)codec->implementation->samples_per_frame*2 || *encoded_data_len < (size_t)codec->implementation->encoded_bytes_per_frame)\r
-               return SWITCH_STATUS_FALSE;\r
-\r
-       g729_coder(&context->encoder_object, (short *) dbuf, ebuf, &cbret);\r
-\r
-       *encoded_data_len   = (codec->implementation->encoded_bytes_per_frame / 2);\r
+       *encoded_data_len = codec->implementation->encoded_bytes_per_frame;\r
 \r
        return SWITCH_STATUS_SUCCESS;\r
 }\r
@@ -112,20 +105,15 @@ static switch_status switch_g729_decode(switch_codec *codec,
        short *dbuf;\r
        unsigned char *ebuf;\r
 \r
-       if (!context)\r
-               return SWITCH_STATUS_FALSE;\r
-\r
-       dbuf = decoded_data;\r
-       ebuf = encoded_data;\r
-\r
-       if ((encoded_data_len * 2) < (size_t)codec->implementation->encoded_bytes_per_frame)\r
+       if (!context) {\r
                return SWITCH_STATUS_FALSE;\r
+       }\r
 \r
        if (*flag & SWITCH_CODEC_FLAG_SILENCE) {\r
                memset(dbuf, 0, codec->implementation->bytes_per_frame);\r
                *decoded_data_len = codec->implementation->bytes_per_frame;\r
        } else {\r
-               g729_decoder(&context->decoder_object, decoded_data, (void *) encoded_data, (int)encoded_data_len);\r
+               g729_decoder(&context->decoder_object, decoded_data, encoded_data, encoded_data_len);\r
                *decoded_data_len = codec->implementation->bytes_per_frame;\r
        }\r
 \r

diff --git a/src/switch_console.c b/src/switch_console.c
index cf44351191881cc45575fe5f85006d344da49d83..62ebb88e20e9e6011cfad8d5800d65f0481a245d 100644 (file)
--- a/src/switch_console.c
+++ b/src/switch_console.c
@@ -56,12 +56,12 @@ char *arg = NULL;
                return 1;
        }
 
-       if (arg = strchr(cmd, ' ')) {
+       if ((arg = strchr(cmd, ' '))) {
                *arg++ = '\0';
        }
        if ((api = loadable_module_get_api_interface(cmd))) {
                char retbuf[512] = "";
-               switch_status status = api->function(arg, retbuf, sizeof(retbuf));
+               api->function(arg, retbuf, sizeof(retbuf));
                switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "API CALL [%s(%s)] output:\n%s\n", cmd, arg ? arg : "", retbuf);
                return 1;
        }