Mildly resurect G.723.1 file format
authorMark Spencer <markster@digium.com>
Wed, 29 Dec 2004 12:12:59 +0000 (12:12 +0000)
committerMark Spencer <markster@digium.com>
Wed, 29 Dec 2004 12:12:59 +0000 (12:12 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4583 65c4cc65-6c06-0410-ace0-fbb531ad65f3

formats/Makefile
formats/format_g723.c

index 7501322..745038f 100755 (executable)
@@ -19,7 +19,7 @@ FORMAT_LIBS+=format_jpeg.so
 #
 # G723 simple frame is depricated
 #
-#FORMAT_LIBS+=format_g723.so
+FORMAT_LIBS+=format_g723.so
 
 GSMLIB=../codecs/gsm/lib/libgsm.a
 
index 3687773..1c02ada 100755 (executable)
@@ -55,6 +55,7 @@ static struct ast_filestream *g723_open(int fd)
           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(&g723_lock)) {
                        ast_log(LOG_WARNING, "Unable to lock g723 list\n");
                        free(tmp);
@@ -68,9 +69,6 @@ static struct ast_filestream *g723_open(int fd)
                /* datalen will vary for each frame */
                tmp->fr->src = name;
                tmp->fr->mallocd = 0;
-               tmp->lasttimeout = -1;
-               tmp->orig.tv_usec = 0;
-               tmp->orig.tv_sec = 0;
                glistcnt++;
                ast_mutex_unlock(&g723_lock);
                ast_update_use_count();
@@ -85,17 +83,13 @@ static struct ast_filestream *g723_rewrite(int fd, const char *comment)
           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(&g723_lock)) {
                        ast_log(LOG_WARNING, "Unable to lock g723 list\n");
                        free(tmp);
                        return NULL;
                }
                tmp->fd = fd;
-               tmp->owner = NULL;
-               tmp->fr = NULL;
-               tmp->lasttimeout = -1;
-               tmp->orig.tv_usec = 0;
-               tmp->orig.tv_sec = 0;
                glistcnt++;
                ast_mutex_unlock(&g723_lock);
                ast_update_use_count();
@@ -104,86 +98,38 @@ static struct ast_filestream *g723_rewrite(int fd, const char *comment)
        return tmp;
 }
 
-static struct ast_frame *g723_read(struct ast_filestream *s)
+static struct ast_frame *g723_read(struct ast_filestream *s, int *whennext)
 {
-       return NULL;
-}
-
-static void g723_close(struct ast_filestream *s)
-{
-       struct ast_filestream *tmp, *tmpl = NULL;
-       if (ast_mutex_lock(&g723_lock)) {
-               ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-               return;
+       unsigned short size;
+       int res;
+       int delay;
+       /* Read the delay for the next packet, and schedule again if necessary */
+       if (read(s->fd, &delay, 4) == 4) 
+               delay = ntohl(delay);
+       else
+               delay = -1;
+       if (read(s->fd, &size, 2) != 2) {
+               /* Out of data, or the file is no longer valid.  In any case
+                  go ahead and stop the stream */
+               return NULL;
        }
-       tmp = glist;
-       while(tmp) {
-               if (tmp == s) {
-                       if (tmpl)
-                               tmpl->next = tmp->next;
-                       else
-                               glist = tmp->next;
-                       break;
-               }
-               tmpl = tmp;
-               tmp = tmp->next;
+       /* Looks like we have a frame to read from here */
+       size = ntohs(size);
+       if (size > G723_MAX_SIZE - sizeof(struct ast_frame)) {
+               ast_log(LOG_WARNING, "Size %d is invalid\n", size);
+               /* The file is apparently no longer any good, as we
+                  shouldn't ever get frames even close to this 
+                  size.  */
+               return NULL;
        }
-       glistcnt--;
-       if (s->owner) {
-               s->owner->stream = NULL;
-               if (s->owner->streamid > -1)
-                       ast_sched_del(s->owner->sched, s->owner->streamid);
-               s->owner->streamid = -1;
+       /* Read the data into the buffer */
+       s->fr->offset = AST_FRIENDLY_OFFSET;
+       s->fr->datalen = size;
+       s->fr->data = s->buf + sizeof(struct ast_frame) + AST_FRIENDLY_OFFSET;
+       if ((res = read(s->fd, s->fr->data , size)) != size) {
+               ast_log(LOG_WARNING, "Short read (%d of %d bytes) (%s)!\n", res, size, strerror(errno));
+               return NULL;
        }
-       ast_mutex_unlock(&g723_lock);
-       ast_update_use_count();
-       if (!tmp) 
-               ast_log(LOG_WARNING, "Freeing a filestream we don't seem to own\n");
-       close(s->fd);
-       free(s);
-       s = NULL;
-}
-
-static int ast_read_callback(void *data)
-{
-       u_int16_t size;
-       u_int32_t delay = -1;
-       int looper = 1;
-       int retval = 0;
-       int res;
-       struct ast_filestream *s = data;
-       /* Send a frame from the file to the appropriate channel */
-       while(looper) {
-               if (read(s->fd, &size, 2) != 2) {
-                       /* Out of data, or the file is no longer valid.  In any case
-                          go ahead and stop the stream */
-                       s->owner->streamid = -1;
-                       return 0;
-               }
-               /* Looks like we have a frame to read from here */
-               size = ntohs(size);
-               if (size > G723_MAX_SIZE - sizeof(struct ast_frame)) {
-                       ast_log(LOG_WARNING, "Size %d is invalid\n", size);
-                       /* The file is apparently no longer any good, as we
-                          shouldn't ever get frames even close to this 
-                          size.  */
-                       s->owner->streamid = -1;
-                       return 0;
-               }
-               /* Read the data into the buffer */
-               s->fr->offset = AST_FRIENDLY_OFFSET;
-               s->fr->datalen = size;
-               s->fr->data = s->buf + sizeof(struct ast_frame) + AST_FRIENDLY_OFFSET;
-               if ((res = read(s->fd, s->fr->data , size)) != size) {
-                       ast_log(LOG_WARNING, "Short read (%d of %d bytes) (%s)!\n", res, size, strerror(errno));
-                       s->owner->streamid = -1;
-                       return 0;
-               }
-               /* Read the delay for the next packet, and schedule again if necessary */
-               if (read(s->fd, &delay, 4) == 4) 
-                       delay = ntohl(delay);
-               else
-                       delay = -1;
 #if 0
                /* Average out frames <= 50 ms */
                if (delay < 50)
@@ -193,51 +139,25 @@ static int ast_read_callback(void *data)
 #else
                s->fr->samples = 240;
 #endif
-               /* Unless there is no delay, we're going to exit out as soon as we
-                  have processed the current frame. */
-               if (delay > VOFR_FUDGE) {
-                       looper = 0;
-                       /* If there is a delay, lets schedule the next event */
-                       if (delay != s->lasttimeout) {
-                               /* We'll install the next timeout now. */
-                               s->owner->streamid = ast_sched_add(s->owner->sched, 
-                                                                                                         delay - VOFR_FUDGE, 
-                                                                                                         ast_read_callback, s);
-                               
-                               s->lasttimeout = delay;
-                       } else
-                               /* Just come back again at the same time */
-                               retval = -1;
-               }
-               /* Lastly, process the frame */
-               if (ast_write(s->owner, s->fr)) {
-                       ast_log(LOG_WARNING, "Failed to write frame\n");
-                       s->owner->streamid = -1;
-                       return 0;
-               }
-       }
-       return retval;
-}
-
-static int g723_apply(struct ast_channel *c, struct ast_filestream *s)
-{
-       /* Select our owner for this stream, and get the ball rolling. */
-       s->owner = c;
-       return 0;
+       *whennext = s->fr->samples;
+       return s->fr;
 }
 
-static int g723_play(struct ast_filestream *s)
+static void g723_close(struct ast_filestream *s)
 {
-       u_int32_t delay;
-       /* Read and ignore the first delay */
-       if (read(s->fd, &delay, 4) != 4) {
-               /* Empty file */
-               return 0;
+       if (ast_mutex_lock(&g723_lock)) {
+               ast_log(LOG_WARNING, "Unable to lock g723 list\n");
+               return;
        }
-       ast_read_callback(s);
-       return 0;
+       glistcnt--;
+       ast_mutex_unlock(&g723_lock);
+       ast_update_use_count();
+       close(s->fd);
+       free(s);
+       s = NULL;
 }
 
+
 static int g723_write(struct ast_filestream *fs, struct ast_frame *f)
 {
        struct timeval now;
@@ -256,23 +176,7 @@ static int g723_write(struct ast_filestream *fs, struct ast_frame *f)
                ast_log(LOG_WARNING, "Asked to write non-g723 frame!\n");
                return -1;
        }
-       if (!(fs->orig.tv_usec || fs->orig.tv_sec)) {
-               /* First frame should have zeros for delay */
-               delay = 0;
-               if (gettimeofday(&fs->orig, NULL)) {
-                       ast_log(LOG_WARNING, "gettimeofday() failed??  What is this?  Y2k?\n");
-                       return -1;
-               }
-       } else {
-               if (gettimeofday(&now, NULL)) {
-                       ast_log(LOG_WARNING, "gettimeofday() failed??  What is this?  Y2k?\n");
-                       return -1;
-               }
-               delay = (now.tv_sec - fs->orig.tv_sec) * 1000 + (now.tv_usec - fs->orig.tv_usec) / 1000;
-               delay = htonl(delay);
-               fs->orig.tv_sec = now.tv_sec;
-               fs->orig.tv_usec = now.tv_usec;
-       }
+       delay = 0;
        if (f->datalen <= 0) {
                ast_log(LOG_WARNING, "Short frame ignored (%d bytes long?)\n", f->datalen);
                return 0;
@@ -300,7 +204,10 @@ static int g723_seek(struct ast_filestream *fs, long sample_offset, int whence)
 
 static int g723_trunc(struct ast_filestream *fs)
 {
-       return -1;
+       /* Truncate file to current length */
+       if (ftruncate(fs->fd, lseek(fs->fd, 0, SEEK_CUR)) < 0)
+               return -1;
+       return 0;
 }
 
 static long g723_tell(struct ast_filestream *fs)
@@ -318,8 +225,6 @@ int load_module()
        return ast_format_register(name, exts, AST_FORMAT_G723_1,
                                                                g723_open,
                                                                g723_rewrite,
-                                                               g723_apply,
-                                                               g723_play,
                                                                g723_write,
                                                                g723_seek,
                                                                g723_trunc,
@@ -333,20 +238,6 @@ int load_module()
 
 int unload_module()
 {
-       struct ast_filestream *tmp, *tmpl;
-       if (ast_mutex_lock(&g723_lock)) {
-               ast_log(LOG_WARNING, "Unable to lock g723 list\n");
-               return -1;
-       }
-       tmp = glist;
-       while(tmp) {
-               if (tmp->owner)
-                       ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD);
-               tmpl = tmp;
-               tmp = tmp->next;
-               free(tmpl);
-       }
-       ast_mutex_unlock(&g723_lock);
        return ast_format_unregister(name);
 }