Fix iLBC with valgrind, add iLBC format from bkw_
authorMark Spencer <markster@digium.com>
Thu, 22 Apr 2004 03:34:13 +0000 (03:34 +0000)
committerMark Spencer <markster@digium.com>
Thu, 22 Apr 2004 03:34:13 +0000 (03:34 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2740 65c4cc65-6c06-0410-ace0-fbb531ad65f3

codecs/codec_ilbc.c
formats/Makefile
formats/format_ilbc.c [new file with mode: 0755]

index e11c970..d3497ba 100755 (executable)
@@ -60,6 +60,8 @@ static struct ast_translator_pvt *lintoilbc_new(void)
        struct ilbc_coder_pvt *tmp;
        tmp = malloc(sizeof(struct ilbc_coder_pvt));
        if (tmp) {
+               /* Shut valgrind up */
+               memset(&tmp->enc, 0, sizeof(tmp->enc));
                initEncode(&tmp->enc);
                tmp->tail = 0;
                localusecnt++;
@@ -72,6 +74,8 @@ static struct ast_translator_pvt *ilbctolin_new(void)
        struct ilbc_coder_pvt *tmp;
        tmp = malloc(sizeof(struct ilbc_coder_pvt));
        if (tmp) {
+               /* Shut valgrind up */
+               memset(&tmp->dec, 0, sizeof(tmp->dec));
                initDecode(&tmp->dec, USE_ILBC_ENHANCER);
                tmp->tail = 0;
                localusecnt++;
index e1c913d..711c2db 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_g726.so
+       format_pcm_alaw.so format_h263.so format_g726.so format_ilbc.so
 FORMAT_LIBS+=format_jpeg.so
 #
 # G723 simple frame is depricated
diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c
new file mode 100755 (executable)
index 0000000..41ec40a
--- /dev/null
@@ -0,0 +1,253 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * Save to raw, headerless iLBC data.
+ *
+ * Brian K. West <brian@bkw.org>
+ * 
+ * Copyright (C) 1999, Mark Spencer
+ *
+ * Mark Spencer <markster@linux-support.net>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+#include <asterisk/lock.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
+
+/* Some Ideas for this code came from makeg729e.c by Jeffrey Chilton */
+
+/* Portions of the conversion code are by guido@sienanet.it */
+
+struct ast_filestream {
+       void *reserved[AST_RESERVED_POINTERS];
+       /* Believe it or not, we must decode/recode to account for the
+          weird MS format */
+       /* This is what a filestream means to us */
+       int fd; /* Descriptor */
+       struct ast_frame fr;                            /* Frame information */
+       char waste[AST_FRIENDLY_OFFSET];        /* Buffer for sending frames, etc */
+       char empty;                                                     /* Empty character */
+       unsigned char ilbc[50];                         /* Two Real Speex Frames */
+};
+
+
+static ast_mutex_t ilbc_lock = AST_MUTEX_INITIALIZER;
+static int glistcnt = 0;
+
+static char *name = "iLBC";
+static char *desc = "Raw iLBC data";
+static char *exts = "ilbc";
+
+static struct ast_filestream *ilbc_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(&ilbc_lock)) {
+                       ast_log(LOG_WARNING, "Unable to lock ilbc list\n");
+                       free(tmp);
+                       return NULL;
+               }
+               tmp->fd = fd;
+               tmp->fr.data = tmp->ilbc;
+               tmp->fr.frametype = AST_FRAME_VOICE;
+               tmp->fr.subclass = AST_FORMAT_ILBC;
+               /* datalen will vary for each frame */
+               tmp->fr.src = name;
+               tmp->fr.mallocd = 0;
+               glistcnt++;
+               ast_mutex_unlock(&ilbc_lock);
+               ast_update_use_count();
+       }
+       return tmp;
+}
+
+static struct ast_filestream *ilbc_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(&ilbc_lock)) {
+                       ast_log(LOG_WARNING, "Unable to lock ilbc list\n");
+                       free(tmp);
+                       return NULL;
+               }
+               tmp->fd = fd;
+               glistcnt++;
+               ast_mutex_unlock(&ilbc_lock);
+               ast_update_use_count();
+       } else
+               ast_log(LOG_WARNING, "Out of memory\n");
+       return tmp;
+}
+
+static void ilbc_close(struct ast_filestream *s)
+{
+       if (ast_mutex_lock(&ilbc_lock)) {
+               ast_log(LOG_WARNING, "Unable to lock ilbc list\n");
+               return;
+       }
+       glistcnt--;
+       ast_mutex_unlock(&ilbc_lock);
+       ast_update_use_count();
+       close(s->fd);
+       free(s);
+       s = NULL;
+}
+
+static struct ast_frame *ilbc_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_ILBC;
+       s->fr.offset = AST_FRIENDLY_OFFSET;
+       s->fr.samples = 240;
+       s->fr.datalen = 50;
+       s->fr.mallocd = 0;
+       s->fr.data = s->ilbc;
+       if ((res = read(s->fd, s->ilbc, 50)) != 50) {
+               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 ilbc_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_ILBC) {
+               ast_log(LOG_WARNING, "Asked to write non-iLBC frame (%d)!\n", f->subclass);
+               return -1;
+       }
+       if (f->datalen % 50) {
+               ast_log(LOG_WARNING, "Invalid data length, %d, should be multiple of 50\n", f->datalen);
+               return -1;
+       }
+       if ((res = write(fs->fd, f->data, f->datalen)) != f->datalen) {
+                       ast_log(LOG_WARNING, "Bad write (%d/23): %s\n", res, strerror(errno));
+                       return -1;
+       }
+       return 0;
+}
+
+static char *ilbc_getcomment(struct ast_filestream *s)
+{
+       return NULL;
+}
+
+static int ilbc_seek(struct ast_filestream *fs, long sample_offset, int whence)
+{
+       long bytes;
+       off_t min,cur,max,offset=0;
+       min = 0;
+       cur = lseek(fs->fd, 0, SEEK_CUR);
+       max = lseek(fs->fd, 0, SEEK_END);
+       
+       bytes = 36 * (sample_offset / 240);
+       if (whence == SEEK_SET)
+               offset = bytes;
+       else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
+               offset = cur + bytes;
+       else if (whence == SEEK_END)
+               offset = max - bytes;
+       if (whence != SEEK_FORCECUR) {
+               offset = (offset > max)?max:offset;
+       }
+       // protect against seeking beyond begining.
+       offset = (offset < min)?min:offset;
+       if (lseek(fs->fd, offset, SEEK_SET) < 0)
+               return -1;
+       return 0;
+}
+
+static int ilbc_trunc(struct ast_filestream *fs)
+{
+       /* Truncate file to current length */
+       if (ftruncate(fs->fd, lseek(fs->fd, 0, SEEK_CUR)) < 0)
+               return -1;
+       return 0;
+}
+
+static long ilbc_tell(struct ast_filestream *fs)
+{
+       off_t offset;
+       offset = lseek(fs->fd, 0, SEEK_CUR);
+       return (offset/50)*240;
+}
+
+int load_module()
+{
+       return ast_format_register(name, exts, AST_FORMAT_ILBC,
+                                                               ilbc_open,
+                                                               ilbc_rewrite,
+                                                               ilbc_write,
+                                                               ilbc_seek,
+                                                               ilbc_trunc,
+                                                               ilbc_tell,
+                                                               ilbc_read,
+                                                               ilbc_close,
+                                                               ilbc_getcomment);
+                                                               
+                                                               
+}
+
+int unload_module()
+{
+       return ast_format_unregister(name);
+}      
+
+int usecount()
+{
+       int res;
+       if (ast_mutex_lock(&ilbc_lock)) {
+               ast_log(LOG_WARNING, "Unable to lock ilbc list\n");
+               return -1;
+       }
+       res = glistcnt;
+       ast_mutex_unlock(&ilbc_lock);
+       return res;
+}
+
+char *description()
+{
+       return desc;
+}
+
+
+char *key()
+{
+       return ASTERISK_GPL_KEY;
+}