Merged revisions 229282 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r229282 | file | 2009-11-10 16:06:13 -0400 (Tue, 10 Nov 2009) | 15 lines

  Merged revisions 229281 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r229281 | file | 2009-11-10 16:03:14 -0400 (Tue, 10 Nov 2009) | 8 lines

    Remove broken support for direct transcoding between G.726 RFC3551 and G.726 AAL2.

    On some systems the translation core would actually consider g726aal2 -> g726 -> signed linear
    to be a quicker path then g726aal2 -> signed linear which exposed this problem.

    (closes issue #15504)
    Reported by: globalnetinc
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@229283 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c
index c8a671ee83285e53d8296ea4eda6398782809a5a..87c072bd58a2e9aab35e6e7cd591152b2802c7e8 100644 (file)
--- a/codecs/codec_g726.c
+++ b/codecs/codec_g726.c
@@ -770,22 +770,6 @@ static int lintog726_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
        return 0;
 }
 
-/*! \brief convert G726-32 RFC3551 packed data into AAL2 packed data (or vice-versa) */
-static int g726tog726aal2_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
-{
-       unsigned char *src = f->data;
-       unsigned char *dst = (unsigned char *) pvt->outbuf + pvt->samples;
-       unsigned int i;
-
-       for (i = 0; i < f->datalen; i++)
-               *dst++ = ((src[i] & 0xf) << 4) | (src[i] >> 4);
-
-       pvt->samples += f->samples;
-       pvt->datalen += f->samples; /* 1 byte/sample */
-
-       return 0;
-}
-
 static struct ast_frame *g726tolin_sample(void)
 {
        static struct ast_frame f = {
@@ -864,26 +848,6 @@ static struct ast_translator lintog726aal2 = {
        .buf_size = BUFFER_SAMPLES / 2,
 };
 
-static struct ast_translator g726tog726aal2 = {
-       .name = "g726tog726aal2",
-       .srcfmt = AST_FORMAT_G726,
-       .dstfmt = AST_FORMAT_G726_AAL2,
-       .framein = g726tog726aal2_framein,      /* same for both directions */
-       .sample = lintog726_sample,
-       .buffer_samples = BUFFER_SAMPLES,
-       .buf_size = BUFFER_SAMPLES,
-};
-
-static struct ast_translator g726aal2tog726 = {
-       .name = "g726aal2tog726",
-       .srcfmt = AST_FORMAT_G726_AAL2,
-       .dstfmt = AST_FORMAT_G726,
-       .framein = g726tog726aal2_framein,      /* same for both directions */
-       .sample = lintog726_sample,
-       .buffer_samples = BUFFER_SAMPLES,
-       .buf_size = BUFFER_SAMPLES,
-};
-
 static int parse_config(int reload)
 {
        struct ast_variable *var;
@@ -922,9 +886,6 @@ static int unload_module(void)
        res |= ast_unregister_translator(&g726aal2tolin);
        res |= ast_unregister_translator(&lintog726aal2);
 
-       res |= ast_unregister_translator(&g726aal2tog726);
-       res |= ast_unregister_translator(&g726tog726aal2);
-
        return res;
 }
 
@@ -942,9 +903,6 @@ static int load_module(void)
        res |= ast_register_translator(&g726aal2tolin);
        res |= ast_register_translator(&lintog726aal2);
 
-       res |= ast_register_translator(&g726aal2tog726);
-       res |= ast_register_translator(&g726tog726aal2);
-
        if (res) {
                unload_module();
                return AST_MODULE_LOAD_FAILURE;