Add G.726, revise Changelog
authorMark Spencer <markster@digium.com>
Fri, 27 Feb 2004 05:16:26 +0000 (05:16 +0000)
committerMark Spencer <markster@digium.com>
Fri, 27 Feb 2004 05:16:26 +0000 (05:16 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2260 65c4cc65-6c06-0410-ace0-fbb531ad65f3

CHANGES
formats/Makefile
formats/format_g726.c [new file with mode: 0755]

diff --git a/CHANGES b/CHANGES
index 62bc5d9..58728c7 100755 (executable)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+ -- Add IAX2 Firmware Support
+ -- Add G.726 support
  -- Add ices/icecast support
  -- Numerous bug fixes
 Asterisk 0.7.2
index c3714e9..e1c913d 100755 (executable)
@@ -13,7 +13,7 @@
 
 FORMAT_LIBS=format_gsm.so format_wav.so \
        format_wav_gsm.so format_vox.so format_pcm.so format_g729.so \
-       format_pcm_alaw.so format_h263.so
+       format_pcm_alaw.so format_h263.so format_g726.so
 FORMAT_LIBS+=format_jpeg.so
 #
 # G723 simple frame is depricated
diff --git a/formats/format_g726.c b/formats/format_g726.c
new file mode 100755 (executable)
index 0000000..7d14da7
--- /dev/null
@@ -0,0 +1,504 @@
+/*
+ * Headerless G.726 (16/24/32/40kbps) data format for Asterisk.
+ * 
+ * Copyright (c) 2004, inAccess Networks
+ *
+ * Michael Manousos <manousos@inaccessnetworks.com>
+ * 
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+#include <asterisk/lock.h>
+#include <asterisk/options.h>
+#include <asterisk/channel.h>
+#include <asterisk/file.h>
+#include <asterisk/logger.h>
+#include <asterisk/sched.h>
+#include <asterisk/module.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <pthread.h>
+#ifdef __linux__
+#include <endian.h>
+#else
+#include <machine/endian.h>
+#endif
+
+#define        RATE_40         0
+#define        RATE_32         1
+#define        RATE_24         2
+#define        RATE_16         3
+
+/* We can only read/write chunks of FRAME_TIME ms G.726 data */
+#define        FRAME_TIME      10      /* 10 ms size */
+
+/* Frame sizes in bytes */
+static int frame_size[4] = { 
+               FRAME_TIME * 5,
+               FRAME_TIME * 4,
+               FRAME_TIME * 3,
+               FRAME_TIME * 2
+};
+
+struct ast_filestream {
+       /* Do not place anything before "reserved" */
+       void *reserved[AST_RESERVED_POINTERS];
+       /* This is what a filestream means to us */
+       int fd;                                                         /* Open file descriptor */
+       int rate;                                                       /* RATE_* defines */
+       struct ast_frame fr;                            /* Frame information */
+       char waste[AST_FRIENDLY_OFFSET];        /* Buffer for sending frames, etc */
+       char empty;                                                     /* Empty character */
+       unsigned char g726[FRAME_TIME * 5];     /* G.726 encoded voice */
+};
+
+static ast_mutex_t g726_lock = AST_MUTEX_INITIALIZER;
+static int glistcnt = 0;
+
+static char *desc = "Raw G.726 (16/24/32/40kbps) data";
+static char *name40 = "g726-40";
+static char *name32 = "g726-32";
+static char *name24 = "g726-24";
+static char *name16 = "g726-16";
+static char *exts40 = "g726-40";
+static char *exts32 = "g726-32";
+static char *exts24 = "g726-24";
+static char *exts16 = "g726-16";
+
+/*
+ * Rate dependant format functions (open, rewrite)
+ */
+static struct ast_filestream *g726_40_open(int fd)
+{
+       /* We don't have any header to read or anything really, but
+          if we did, it would go here.  We also might want to check
+          and be sure it's a valid file.  */
+       struct ast_filestream *tmp;
+       if ((tmp = malloc(sizeof(struct ast_filestream)))) {
+               memset(tmp, 0, sizeof(struct ast_filestream));
+               if (ast_mutex_lock(&g726_lock)) {
+                       ast_log(LOG_WARNING, "Unable to lock g726 list.\n");
+                       free(tmp);
+                       return NULL;
+               }
+               tmp->fd = fd;
+               tmp->rate = RATE_40;
+               tmp->fr.data = tmp->g726;
+               tmp->fr.frametype = AST_FRAME_VOICE;
+               tmp->fr.subclass = AST_FORMAT_G726;
+               /* datalen will vary for each frame */
+               tmp->fr.src = name40;
+               tmp->fr.mallocd = 0;
+               glistcnt++;
+               if (option_debug)
+                       ast_log(LOG_DEBUG, "Created filestream G.726-%dk.\n", 
+                                                                       40 - tmp->rate * 8);
+               ast_mutex_unlock(&g726_lock);
+               ast_update_use_count();
+       }
+       return tmp;
+}
+
+static struct ast_filestream *g726_32_open(int fd)
+{
+       /* We don't have any header to read or anything really, but
+          if we did, it would go here.  We also might want to check
+          and be sure it's a valid file.  */
+       struct ast_filestream *tmp;
+       if ((tmp = malloc(sizeof(struct ast_filestream)))) {
+               memset(tmp, 0, sizeof(struct ast_filestream));
+               if (ast_mutex_lock(&g726_lock)) {
+                       ast_log(LOG_WARNING, "Unable to lock g726 list.\n");
+                       free(tmp);
+                       return NULL;
+               }
+               tmp->fd = fd;
+               tmp->rate = RATE_32;
+               tmp->fr.data = tmp->g726;
+               tmp->fr.frametype = AST_FRAME_VOICE;
+               tmp->fr.subclass = AST_FORMAT_G726;
+               /* datalen will vary for each frame */
+               tmp->fr.src = name32;
+               tmp->fr.mallocd = 0;
+               glistcnt++;
+               if (option_debug)
+                       ast_log(LOG_DEBUG, "Created filestream G.726-%dk.\n", 
+                                                                       40 - tmp->rate * 8);
+               ast_mutex_unlock(&g726_lock);
+               ast_update_use_count();
+       }
+       return tmp;
+}
+
+static struct ast_filestream *g726_24_open(int fd)
+{
+       /* We don't have any header to read or anything really, but
+          if we did, it would go here.  We also might want to check
+          and be sure it's a valid file.  */
+       struct ast_filestream *tmp;
+       if ((tmp = malloc(sizeof(struct ast_filestream)))) {
+               memset(tmp, 0, sizeof(struct ast_filestream));
+               if (ast_mutex_lock(&g726_lock)) {
+                       ast_log(LOG_WARNING, "Unable to lock g726 list.\n");
+                       free(tmp);
+                       return NULL;
+               }
+               tmp->fd = fd;
+               tmp->rate = RATE_24;
+               tmp->fr.data = tmp->g726;
+               tmp->fr.frametype = AST_FRAME_VOICE;
+               tmp->fr.subclass = AST_FORMAT_G726;
+               /* datalen will vary for each frame */
+               tmp->fr.src = name24;
+               tmp->fr.mallocd = 0;
+               glistcnt++;
+               if (option_debug)
+                       ast_log(LOG_DEBUG, "Created filestream G.726-%dk.\n", 
+                                                                       40 - tmp->rate * 8);
+               ast_mutex_unlock(&g726_lock);
+               ast_update_use_count();
+       }
+       return tmp;
+}
+
+static struct ast_filestream *g726_16_open(int fd)
+{
+       /* We don't have any header to read or anything really, but
+          if we did, it would go here.  We also might want to check
+          and be sure it's a valid file.  */
+       struct ast_filestream *tmp;
+       if ((tmp = malloc(sizeof(struct ast_filestream)))) {
+               memset(tmp, 0, sizeof(struct ast_filestream));
+               if (ast_mutex_lock(&g726_lock)) {
+                       ast_log(LOG_WARNING, "Unable to lock g726 list.\n");
+                       free(tmp);
+                       return NULL;
+               }
+               tmp->fd = fd;
+               tmp->rate = RATE_16;
+               tmp->fr.data = tmp->g726;
+               tmp->fr.frametype = AST_FRAME_VOICE;
+               tmp->fr.subclass = AST_FORMAT_G726;
+               /* datalen will vary for each frame */
+               tmp->fr.src = name16;
+               tmp->fr.mallocd = 0;
+               glistcnt++;
+               if (option_debug)
+                       ast_log(LOG_DEBUG, "Created filestream G.726-%dk.\n", 
+                                                                       40 - tmp->rate * 8);
+               ast_mutex_unlock(&g726_lock);
+               ast_update_use_count();
+       }
+       return tmp;
+}
+
+static struct ast_filestream *g726_40_rewrite(int fd, char *comment)
+{
+       /* We don't have any header to read or anything really, but
+          if we did, it would go here.  We also might want to check
+          and be sure it's a valid file.  */
+       struct ast_filestream *tmp;
+       if ((tmp = malloc(sizeof(struct ast_filestream)))) {
+               memset(tmp, 0, sizeof(struct ast_filestream));
+               if (ast_mutex_lock(&g726_lock)) {
+                       ast_log(LOG_WARNING, "Unable to lock g726 list.\n");
+                       free(tmp);
+                       return NULL;
+               }
+               tmp->fd = fd;
+               tmp->rate = RATE_40;
+               glistcnt++;
+               if (option_debug)
+                       ast_log(LOG_DEBUG, "Created filestream G.726-%dk.\n", 
+                                                                       40 - tmp->rate * 8);
+               ast_mutex_unlock(&g726_lock);
+               ast_update_use_count();
+       } else
+               ast_log(LOG_WARNING, "Out of memory\n");
+       return tmp;
+}
+
+static struct ast_filestream *g726_32_rewrite(int fd, char *comment)
+{
+       /* We don't have any header to read or anything really, but
+          if we did, it would go here.  We also might want to check
+          and be sure it's a valid file.  */
+       struct ast_filestream *tmp;
+       if ((tmp = malloc(sizeof(struct ast_filestream)))) {
+               memset(tmp, 0, sizeof(struct ast_filestream));
+               if (ast_mutex_lock(&g726_lock)) {
+                       ast_log(LOG_WARNING, "Unable to lock g726 list.\n");
+                       free(tmp);
+                       return NULL;
+               }
+               tmp->fd = fd;
+               tmp->rate = RATE_32;
+               glistcnt++;
+               if (option_debug)
+                       ast_log(LOG_DEBUG, "Created filestream G.726-%dk.\n", 
+                                                                       40 - tmp->rate * 8);
+               ast_mutex_unlock(&g726_lock);
+               ast_update_use_count();
+       } else
+               ast_log(LOG_WARNING, "Out of memory\n");
+       return tmp;
+}
+
+static struct ast_filestream *g726_24_rewrite(int fd, char *comment)
+{
+       /* We don't have any header to read or anything really, but
+          if we did, it would go here.  We also might want to check
+          and be sure it's a valid file.  */
+       struct ast_filestream *tmp;
+       if ((tmp = malloc(sizeof(struct ast_filestream)))) {
+               memset(tmp, 0, sizeof(struct ast_filestream));
+               if (ast_mutex_lock(&g726_lock)) {
+                       ast_log(LOG_WARNING, "Unable to lock g726 list.\n");
+                       free(tmp);
+                       return NULL;
+               }
+               tmp->fd = fd;
+               tmp->rate = RATE_24;
+               glistcnt++;
+               if (option_debug)
+                       ast_log(LOG_DEBUG, "Created filestream G.726-%dk.\n", 
+                                                                       40 - tmp->rate * 8);
+               ast_mutex_unlock(&g726_lock);
+               ast_update_use_count();
+       } else
+               ast_log(LOG_WARNING, "Out of memory\n");
+       return tmp;
+}
+
+static struct ast_filestream *g726_16_rewrite(int fd, char *comment)
+{
+       /* We don't have any header to read or anything really, but
+          if we did, it would go here.  We also might want to check
+          and be sure it's a valid file.  */
+       struct ast_filestream *tmp;
+       if ((tmp = malloc(sizeof(struct ast_filestream)))) {
+               memset(tmp, 0, sizeof(struct ast_filestream));
+               if (ast_mutex_lock(&g726_lock)) {
+                       ast_log(LOG_WARNING, "Unable to lock g726 list.\n");
+                       free(tmp);
+                       return NULL;
+               }
+               tmp->fd = fd;
+               tmp->rate = RATE_16;
+               glistcnt++;
+               if (option_debug)
+                       ast_log(LOG_DEBUG, "Created filestream G.726-%dk.\n", 
+                                                                       40 - tmp->rate * 8);
+               ast_mutex_unlock(&g726_lock);
+               ast_update_use_count();
+       } else
+               ast_log(LOG_WARNING, "Out of memory\n");
+       return tmp;
+}
+
+/*
+ * Rate independent format functions (close, read, write)
+ */
+static void g726_close(struct ast_filestream *s)
+{
+       if (ast_mutex_lock(&g726_lock)) {
+               ast_log(LOG_WARNING, "Unable to lock g726 list.\n");
+               return;
+       }
+       glistcnt--;
+       if (option_debug)
+               ast_log(LOG_DEBUG, "Closed filestream G.726-%dk.\n", 40 - s->rate * 8);
+       ast_mutex_unlock(&g726_lock);
+       ast_update_use_count();
+       close(s->fd);
+       free(s);
+       s = NULL;
+}
+
+static struct ast_frame *g726_read(struct ast_filestream *s, int *whennext)
+{
+       int res;
+       /* Send a frame from the file to the appropriate channel */
+       s->fr.frametype = AST_FRAME_VOICE;
+       s->fr.subclass = AST_FORMAT_G726;
+       s->fr.offset = AST_FRIENDLY_OFFSET;
+       s->fr.samples = 8 * FRAME_TIME;
+       s->fr.datalen = frame_size[s->rate];
+       s->fr.mallocd = 0;
+       s->fr.data = s->g726;
+       if ((res = read(s->fd, s->g726, s->fr.datalen)) != s->fr.datalen) {
+               if (res)
+                       ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
+               return NULL;
+       }
+       *whennext = s->fr.samples;
+       return &s->fr;
+}
+
+static int g726_write(struct ast_filestream *fs, struct ast_frame *f)
+{
+       int res;
+       if (f->frametype != AST_FRAME_VOICE) {
+               ast_log(LOG_WARNING, "Asked to write non-voice frame!\n");
+               return -1;
+       }
+       if (f->subclass != AST_FORMAT_G726) {
+               ast_log(LOG_WARNING, "Asked to write non-G726 frame (%d)!\n", 
+                                               f->subclass);
+               return -1;
+       }
+       if (f->datalen % frame_size[fs->rate]) {
+               ast_log(LOG_WARNING, "Invalid data length %d, should be multiple of %d\n", 
+                                               f->datalen, frame_size[fs->rate]);
+               return -1;
+       }
+       if ((res = write(fs->fd, f->data, f->datalen)) != f->datalen) {
+                       ast_log(LOG_WARNING, "Bad write (%d/%d): %s\n", 
+                                                       res, frame_size[fs->rate], strerror(errno));
+                       return -1;
+       }
+       return 0;
+}
+
+static char *g726_getcomment(struct ast_filestream *s)
+{
+       return NULL;
+}
+
+static int g726_seek(struct ast_filestream *fs, long sample_offset, int whence)
+{
+       return -1;
+}
+
+static int g726_trunc(struct ast_filestream *fs)
+{
+       return -1;
+}
+
+static long g726_tell(struct ast_filestream *fs)
+{
+       return -1;
+}
+
+/*
+ * Module interface (load_module, unload_module, usecount, description, key)
+ */
+int load_module()
+{
+       int res;
+
+       res = ast_format_register(name40, exts40, AST_FORMAT_G726,
+                                                               g726_40_open,
+                                                               g726_40_rewrite,
+                                                               g726_write,
+                                                               g726_seek,
+                                                               g726_trunc,
+                                                               g726_tell,
+                                                               g726_read,
+                                                               g726_close,
+                                                               g726_getcomment);
+       if (res) {
+               ast_log(LOG_WARNING, "Failed to register format %s.\n", name40);
+               return(-1);
+       }
+       res = ast_format_register(name32, exts32, AST_FORMAT_G726,
+                                                               g726_32_open,
+                                                               g726_32_rewrite,
+                                                               g726_write,
+                                                               g726_seek,
+                                                               g726_trunc,
+                                                               g726_tell,
+                                                               g726_read,
+                                                               g726_close,
+                                                               g726_getcomment);
+       if (res) {
+               ast_log(LOG_WARNING, "Failed to register format %s.\n", name32);
+               return(-1);
+       }
+       res = ast_format_register(name24, exts24, AST_FORMAT_G726,
+                                                               g726_24_open,
+                                                               g726_24_rewrite,
+                                                               g726_write,
+                                                               g726_seek,
+                                                               g726_trunc,
+                                                               g726_tell,
+                                                               g726_read,
+                                                               g726_close,
+                                                               g726_getcomment);
+       if (res) {
+               ast_log(LOG_WARNING, "Failed to register format %s.\n", name24);
+               return(-1);
+       }
+       res = ast_format_register(name16, exts16, AST_FORMAT_G726,
+                                                               g726_16_open,
+                                                               g726_16_rewrite,
+                                                               g726_write,
+                                                               g726_seek,
+                                                               g726_trunc,
+                                                               g726_tell,
+                                                               g726_read,
+                                                               g726_close,
+                                                               g726_getcomment);
+       if (res) {
+               ast_log(LOG_WARNING, "Failed to register format %s.\n", name16);
+               return(-1);
+       }
+       return(0);
+}
+
+int unload_module()
+{
+       int res;
+
+       res = ast_format_unregister(name40);
+       if (res) {
+               ast_log(LOG_WARNING, "Failed to unregister format %s.\n", name40);
+               return(-1);
+       }
+       res = ast_format_unregister(name32);
+       if (res) {
+               ast_log(LOG_WARNING, "Failed to unregister format %s.\n", name32);
+               return(-1);
+       }
+       res = ast_format_unregister(name24);
+       if (res) {
+               ast_log(LOG_WARNING, "Failed to unregister format %s.\n", name24);
+               return(-1);
+       }
+       res = ast_format_unregister(name16);
+       if (res) {
+               ast_log(LOG_WARNING, "Failed to unregister format %s.\n", name16);
+               return(-1);
+       }
+       return(0);
+}      
+
+int usecount()
+{
+       int res;
+       if (ast_mutex_lock(&g726_lock)) {
+               ast_log(LOG_WARNING, "Unable to lock g726 list.\n");
+               return -1;
+       }
+       res = glistcnt;
+       ast_mutex_unlock(&g726_lock);
+       return res;
+}
+
+char *description()
+{
+       return desc;
+}
+
+char *key()
+{
+       return ASTERISK_GPL_KEY;
+}
+