remove skeleton support for G.723.1 codec since we will never ship the rest of what...
authorKevin P. Fleming <kpfleming@digium.com>
Sun, 9 Jul 2006 14:32:08 +0000 (14:32 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Sun, 9 Jul 2006 14:32:08 +0000 (14:32 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37320 65c4cc65-6c06-0410-ace0-fbb531ad65f3

codecs/codec_g723_1.c [deleted file]
codecs/g723_slin_ex.h [deleted file]
codecs/slin_g723_ex.h [deleted file]

diff --git a/codecs/codec_g723_1.c b/codecs/codec_g723_1.c
deleted file mode 100644 (file)
index 5da9492..0000000
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * The G.723.1 code is not included in the Asterisk distribution because
- * it is covered with patents, and in spite of statements to the contrary,
- * the "technology" is extremely expensive to license.
- * 
- * Copyright (C) 1999 - 2005, Digium, Inc.
- *
- * Mark Spencer <markster@digium.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-/*! \file
- *
- * \brief Translate between signed linear and G.723.1
- *
- * \ingroup codecs
- */
-
-/*** MODULEINFO
-       <defaultenabled>no</defaultenabled>
- ***/
-
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <netinet/in.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "asterisk/lock.h"
-#include "asterisk/translate.h"
-#include "asterisk/module.h"
-#include "asterisk/logger.h"
-#include "asterisk/channel.h"
-#include "asterisk/utils.h"
-
-#ifdef ANNEX_B
-#include "g723.1b/typedef2.h"
-#include "g723.1b/cst2.h"
-#include "g723.1b/coder2.h"
-#include "g723.1b/decod2.h"
-#include "g723.1b/deccng2.h"
-#include "g723.1b/codcng2.h"
-#include "g723.1b/vad2.h"
-#else
-#include "g723.1/typedef.h"
-#include "g723.1/cst_lbc.h"
-#include "g723.1/coder.h"
-#include "g723.1/decod.h"
-#include "g723.1/dec_cng.h"
-#include "g723.1/cod_cng.h"
-#include "g723.1/vad.h"
-#endif
-
-/* Sample frame data */
-#include "slin_g723_ex.h"
-#include "g723_slin_ex.h"
-
-#define TYPE_HIGH       0x0
-#define TYPE_LOW        0x1
-#define TYPE_SILENCE    0x2
-#define TYPE_DONTSEND   0x3
-#define TYPE_MASK       0x3
-
-/* g723_1 has 240 samples per buffer.
- * We want a buffer which is a multiple...
- */
-#define        G723_SAMPLES    240
-#define        BUFFER_SAMPLES  8160    /* 240 * 34 */
-
-/* Globals */
-Flag UsePf = True;
-Flag UseHp = True;
-Flag UseVx = True;
-
-enum Crate WrkRate = Rate63;
-
-struct g723_encoder_pvt {
-       struct cod_state cod;
-       int16_t buf[BUFFER_SAMPLES];    /* input buffer */
-};
-
-struct g723_decoder_pvt {
-       struct dec_state dec;
-};
-
-static struct ast_trans_pvt *g723tolin_new(struct ast *pvt)
-{
-       struct g723_decoder_pvt *tmp = pvt;
-
-       Init_Decod(&tmp->dec);
-       Init_Dec_Cng(&tmp->dec);
-       return tmp;
-}
-
-static struct ast_frame *lintog723_sample(void)
-{
-       static struct ast_frame f;
-       f.frametype = AST_FRAME_VOICE;
-       f.subclass = AST_FORMAT_SLINEAR;
-       f.datalen = sizeof(slin_g723_ex);
-       f.samples = sizeof(slin_g723_ex)/2;
-       f.mallocd = 0;
-       f.offset = 0;
-       f.src = __PRETTY_FUNCTION__;
-       f.data = slin_g723_ex;
-       return &f;
-}
-
-static struct ast_frame *g723tolin_sample(void)
-{
-       static struct ast_frame f;
-       f.frametype = AST_FRAME_VOICE;
-       f.subclass = AST_FORMAT_G723_1;
-       f.datalen = sizeof(g723_slin_ex);
-       /* All frames are 30 ms long */
-       f.samples = 240;
-       f.mallocd = 0;
-       f.offset = 0;
-       f.src = __PRETTY_FUNCTION__;
-       f.data = g723_slin_ex;
-       return &f;
-}
-
-static void *lintog723_new(void *pvt)
-{
-       struct g723_encoder_pvt *tmp = pvt;
-       Init_Coder(&tmp->cod);
-       /* Init Comfort Noise Functions */
-       if( UseVx ) {
-               Init_Vad(&tmp->cod);
-               Init_Cod_Cng(&tmp->cod);
-       }
-       return tmp;
-}
-
-static int g723_len(unsigned char buf)
-{
-       switch(buf & TYPE_MASK) {
-       case TYPE_DONTSEND:
-               return 0;
-               break;
-       case TYPE_SILENCE:
-               return 4;
-               break;
-       case TYPE_HIGH:
-               return 24;
-               break;
-       case TYPE_LOW:
-               return 20;
-               break;
-       default:
-               ast_log(LOG_WARNING, "Badly encoded frame (%d)\n", buf & TYPE_MASK);
-       }
-       return -1;
-}
-
-static int g723tolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
-{
-       struct g723_decoder_pvt *tmp = pvt->pvt;
-       int len = 0;
-       int res;
-       int16_t *dst = pvt->outbuf;
-#ifdef  ANNEX_B
-       FLOAT tmpdata[Frame];
-       int x;
-#endif
-       unsigned char *src = f->data;
-
-       while(len < f->datalen) {
-               /* Assuming there's space left, decode into the current buffer at
-                  the tail location */
-               res = g723_len(src[len]);
-               if (res < 0) {
-                       ast_log(LOG_WARNING, "Invalid data\n");
-                       return -1;
-               }
-               if (res + len > f->datalen) {
-                       ast_log(LOG_WARNING, "Measured length exceeds frame length\n");
-                       return -1;
-               }
-               if (pvt->samples + Frame > BUFFER_SAMPLES) {    
-                       ast_log(LOG_WARNING, "Out of buffer space\n");
-                       return -1;
-               }
-#ifdef ANNEX_B
-               Decod(&tmp->dec, tmpdata, f->data + len, 0);
-               for (x=0;x<Frame;x++)
-                       dst[pvt->samples + x] = (int16_t)(tmpdata[x]); 
-#else
-               Decod(&tmp->dec, dst + pvt->samples, f->data + len, 0);
-#endif
-               pvt->samples += Frame;
-               pvt->datalen += 2*Frame; /* 2 bytes/sample */
-               len += res;
-       }
-       return 0;
-}
-
-static int lintog723_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
-{
-       /* Just add the frames to our stream */
-       /* XXX We should look at how old the rest of our stream is, and if it
-          is too old, then we should overwrite it entirely, otherwise we can
-          get artifacts of earlier talk that do not belong */
-       struct g723_encoder_pvt *tmp = pvt->pvt;
-
-       if (tmp->samples + f->samples > BUFFER_SAMPLES) {
-               ast_log(LOG_WARNING, "Out of buffer space\n");
-               return -1;
-       }
-       memcpy(&tmp->buf[pvt->samples], f->data, f->datalen);
-       pvt->samples += f->samples;
-       return 0;
-}
-
-static struct ast_frame *lintog723_frameout(void *pvt)
-{
-       struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt;
-       int samples = 0;        /* how many samples in buffer */
-#ifdef ANNEX_B
-       int x;
-       FLOAT tmpdata[Frame];
-#endif
-       int cnt = 0;    /* how many bytes so far */
-
-       /* We can't work on anything less than a frame in size */
-       if (pvt->samples < Frame)
-               return NULL;
-       while (pvt->samples >= Frame) {
-               /* Encode a frame of data */
-               /* at most 24 bytes/frame... */
-               if (cnt + 24 > pvt->buf_size) {
-                       ast_log(LOG_WARNING, "Out of buffer space\n");
-                       return NULL;
-               }
-#ifdef ANNEX_B
-               for ( x = 0; x < Frame ; x++)
-                       tmpdata[x] = tmp->buf[x];
-               Coder(&tmp->cod, tmpdata, pvt->outbuf + cnt);
-#else
-               Coder(&tmp->cod, tmp->buf, pvt->outbuf + cnt);
-#endif
-               /* Assume 8000 Hz */
-               samples += G723_SAMPLES;
-               cnt += g723_len(tmp->outbuf[cnt]);
-               pvt->samples -= Frame;
-               /* Move the data at the end of the buffer to the front */
-               /* XXX inefficient... */
-               if (pvt->samples)
-                       memmove(tmp->buf, tmp->buf + Frame, pvt->samples * 2);
-       }
-       return ast_trans_frameout(pvt, cnt, samples);
-}
-
-static struct ast_translator g723tolin = {
-       .name =
-#ifdef ANNEX_B
-       "g723btolin", 
-#else
-       "g723tolin", 
-#endif
-       .srcfmt = AST_FORMAT_G723_1,
-       .dstfmt =  AST_FORMAT_SLINEAR,
-       .newpvt = g723tolin_new,
-       .framein = g723tolin_framein,
-       .sample = g723tolin_sample,
-       .desc_size = sizeof(struct ...),
-};
-
-static struct ast_translator lintog723 = {
-       .name =
-#ifdef ANNEX_B
-       "lintog723b", 
-#else
-       "lintog723", 
-#endif
-       .srcfmt = AST_FORMAT_SLINEAR,
-       .dstfmt =  AST_FORMAT_G723_1,
-       .new = lintog723_new,
-       .framein = lintog723_framein,
-       .frameout = lintog723_frameout,
-       .destroy = g723_destroy,
-       .sample = lintog723_sample,
-       .desc_size = sizeof(struct ...),
-};
-
-/*! \brief standard module glue */
-
-static int unload_module(void *mod)
-{
-       int res;
-       res = ast_unregister_translator(&lintog723);
-       res |= ast_unregister_translator(&g723tolin);
-       return res;
-}
-
-static int load_module(void *mod)
-{
-       int res;
-       res=ast_register_translator(&g723tolin, mod);
-       if (!res) 
-               res=ast_register_translator(&lintog723, mod);
-       else
-               ast_unregister_translator(&g723tolin);
-       return res;
-}
-
-static const char *description(void)
-{
-#ifdef ANNEX_B
-       return "Annex B (floating point) G.723.1/PCM16 Codec Translator";
-#else
-       return "Annex A (fixed point) G.723.1/PCM16 Codec Translator";
-#endif
-
-}
-
-static const char *key(void)
-{
-       return ASTERISK_GPL_KEY;
-}
-
-STD_MOD(MOD_1, reload, NULL, NULL);
diff --git a/codecs/g723_slin_ex.h b/codecs/g723_slin_ex.h
deleted file mode 100644 (file)
index 0bae82d..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/*! \file
-  * \brief 8-bit raw data
-  *
-  * Source: g723.example
-  *
-  * Copyright (C) 1999-2005, Digium, Inc.
-  *
-  * Distributed under the terms of the GNU General Public License
-  *
-  */
-
-static unsigned char g723_slin_ex[] = {
-0x4c, 0x34, 0xc2, 0xd9, 0x81, 0x80, 0xa8, 0x50, 0xd7, 0x8d, 
-0x8, 0x80, 0xf0, 0xb4, 0x40, 0x53, 0xe3, 0xe1, 0x63, 0x4e, 
-0x1a, 0x37, 0xd6, 0x0037 };
diff --git a/codecs/slin_g723_ex.h b/codecs/slin_g723_ex.h
deleted file mode 100644 (file)
index c6dccd7..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*! \file
-  * \brief Signed 16-bit audio data
-  *
-  * Source: g723.example
-  *
-  * Copyright (C) 1999-2005, Digium Inc.
-  *
-  * Distributed under the terms of the GNU General Public License
-  *
-  */
-
-static signed short slin_g723_ex[] = {
-0x0873, 0x06d9, 0x038c, 0x0588, 0x0409, 0x033d, 0x0311, 0xff6c, 0xfeef, 0xfd3e, 
-0xfdff, 0xff7a, 0xff6d, 0xffec, 0xff36, 0xfd62, 0xfda7, 0xfc6c, 0xfe67, 0xffe1, 
-0x003d, 0x01cc, 0x0065, 0x002a, 0xff83, 0xfed9, 0xffba, 0xfece, 0xff42, 0xff16, 
-0xfe85, 0xff31, 0xff02, 0xfdff, 0xfe32, 0xfe3f, 0xfed5, 0xff65, 0xffd4, 0x005b, 
-0xff88, 0xff01, 0xfebd, 0xfe95, 0xff46, 0xffe1, 0x00e2, 0x0165, 0x017e, 0x01c9, 
-0x0182, 0x0146, 0x00f9, 0x00ab, 0x006f, 0xffe8, 0xffd8, 0xffc4, 0xffb2, 0xfff9, 
-0xfffe, 0x0023, 0x0018, 0x000b, 0x001a, 0xfff7, 0x0014, 0x000b, 0x0004, 0x000b, 
-0xfff1, 0xff4f, 0xff3f, 0xff42, 0xff5e, 0xffd4, 0x0014, 0x0067, 0x0051, 0x003b, 
-0x0034, 0xfff9, 0x000d, 0xff54, 0xff54, 0xff52, 0xff3f, 0xffcc, 0xffe6, 0x00fc, 
-0x00fa, 0x00e4, 0x00f3, 0x0021, 0x0011, 0xffa1, 0xffab, 0xffdb, 0xffa5, 0x0009, 
-0xffd2, 0xffe6, 0x0007, 0x0096, 0x00e4, 0x00bf, 0x00ce, 0x0048, 0xffe8, 0xffab, 
-0xff8f, 0xffc3, 0xffc1, 0xfffc, 0x0002, 0xfff1, 0x000b, 0x00a7, 0x00c5, 0x00cc, 
-0x015e, 0x00e4, 0x0094, 0x0029, 0xffc7, 0xffc3, 0xff86, 0xffe4, 0xffe6, 0xffec, 
-0x000f, 0xffe3, 0x0028, 0x004b, 0xffaf, 0xffcb, 0xfedd, 0xfef8, 0xfe83, 0xfeba, 
-0xff94, 0xff94, 0xffbe, 0xffa8, 0xff0d, 0xff32, 0xff58, 0x0021, 0x0087, 0x00be, 
-0x0115, 0x007e, 0x0052, 0xfff0, 0xffc9, 0xffe8, 0xffc4, 0x0014, 0xfff0, 0xfff5, 
-0xfffe, 0xffda, 0x000b, 0x0010, 0x006f, 0x006f, 0x0052, 0x0045, 0xffee, 0xffea, 
-0xffcb, 0xffdf, 0xfffc, 0xfff0, 0x0012, 0xfff7, 0xfffe, 0x0018, 0x0050, 0x0066, 
-0x0047, 0x0028, 0xfff7, 0xffe8, 0xffec, 0x0007, 0x001d, 0x0016, 0x00c4, 0x0093, 
-0x007d, 0x0052, 0x00a5, 0x0091, 0x003c, 0x0041, 0xffd1, 0xffda, 0xffc6, 0xfff0, 
-0x001d, 0xfffe, 0x0024, 0xffee, 0xfff3, 0xfff0, 0xffea, 0x0012, 0xfff3, 0xfff7, 
-0xffda, 0xffca, 0xffda, 0xffdf, 0xfff3, 0xfff7, 0xff54, 0xff7c, 0xff8c, 0xffb9, 
-0x0012, 0x0012, 0x004c, 0x0007, 0xff50, 0xff66, 0xff54, 0xffa9, 0xffdc, 0xfff9, 
-0x0038, 0xfff9, 0x00d2, 0x0096, 0x008a, 0x0079, 0xfff5, 0x0019, 0xffad, 0xfffc };