Merged revisions 7799-7800 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7799 | kpfleming | 2006-01-04 17:02:38 -0600 (Wed, 04 Jan 2006) | 2 lines

make monitoring more tolerant of peers that deliver frames in bursts

........
r7800 | kpfleming | 2006-01-04 17:27:57 -0600 (Wed, 04 Jan 2006) | 2 lines

ensure that ulaw/alaw sound files are filled with silence when extended (not zeroes)

........

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

diff --git a/channel.c b/channel.c
index 36a53853ffbd2335a4a1d5834ab69c579f2bda0d..c91a4521df7f26bea7e2d3a132e774d8646d72b3 100644 (file)
--- a/channel.c
+++ b/channel.c
@@ -1889,11 +1889,11 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
 
                        if (chan->monitor && chan->monitor->read_stream ) {
 #ifndef MONITOR_CONSTANT_DELAY
-                               int jump = chan->outsmpl - chan->insmpl - 2 * f->samples;
+                               int jump = chan->outsmpl - chan->insmpl - 4 * f->samples;
                                if (jump >= 0) {
                                        if (ast_seekstream(chan->monitor->read_stream, jump + f->samples, SEEK_FORCECUR) == -1)
                                                ast_log(LOG_WARNING, "Failed to perform seek in monitoring read stream, synchronization between the files may be broken\n");
-                                       chan->insmpl += jump + 2 * f->samples;
+                                       chan->insmpl += jump + 4 * f->samples;
                                } else
                                        chan->insmpl+= f->samples;
 #else
@@ -2250,11 +2250,11 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr)
                                if( chan->monitor && chan->monitor->write_stream &&
                                                f && ( f->frametype == AST_FRAME_VOICE ) ) {
 #ifndef MONITOR_CONSTANT_DELAY
-                                       int jump = chan->insmpl - chan->outsmpl - 2 * f->samples;
+                                       int jump = chan->insmpl - chan->outsmpl - 4 * f->samples;
                                        if (jump >= 0) {
                                                if (ast_seekstream(chan->monitor->write_stream, jump + f->samples, SEEK_FORCECUR) == -1)
                                                        ast_log(LOG_WARNING, "Failed to perform seek in monitoring write stream, synchronization between the files may be broken\n");
-                                               chan->outsmpl += jump + 2 * f->samples;
+                                               chan->outsmpl += jump + 4 * f->samples;
                                        } else
                                                chan->outsmpl += f->samples;
 #else

diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index 4adb076cfcdb104f6cef8c532de562ca5f9df26e..80905cdbf3ae2f1f30cb46118568a753f0604789 100644 (file)
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -1,7 +1,7 @@
 /*
  * Asterisk -- An open source telephony toolkit.
  *
- * Copyright (C) 1999 - 2005, Digium, Inc.
+ * Copyright (C) 1999 - 2006, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
@@ -44,6 +44,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/sched.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
+#include "asterisk/ulaw.h"
 
 #define BUF_SIZE 160           /* 160 samples */
 
@@ -67,6 +68,8 @@ static char *name = "pcm";
 static char *desc = "Raw uLaw 8khz Audio support (PCM)";
 static char *exts = "pcm|ulaw|ul|mu";
 
+static char ulaw_silence[BUF_SIZE];
+
 static struct ast_filestream *pcm_open(FILE *f)
 {
        /* We don't have any header to read or anything really, but
@@ -173,24 +176,44 @@ static int pcm_write(struct ast_filestream *fs, struct ast_frame *f)
 
 static int pcm_seek(struct ast_filestream *fs, long sample_offset, int whence)
 {
-       off_t offset=0,min,cur,max;
+       long cur, max, offset;
 
-       min = 0;
        cur = ftell(fs->f);
-       fseek(fs->f, 0, SEEK_END);
-       max = ftell(fs->f);
-       if (whence == SEEK_SET)
+       max = fseek(fs->f, 0, SEEK_END);
+
+       switch (whence) {
+       case SEEK_SET:
                offset = sample_offset;
-       else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
-               offset = sample_offset + cur;
-       else if (whence == SEEK_END)
+               break;
+       case SEEK_END:
                offset = max - sample_offset;
-       if (whence != SEEK_FORCECUR) {
-               offset = (offset > max)?max:offset;
+               break;
+       case SEEK_CUR:
+       case SEEK_FORCECUR:
+               offset = cur + sample_offset;
+               break;
+       }
+
+       switch (whence) {
+       case SEEK_FORCECUR:
+               if (offset > max) {
+                       size_t left = offset - max;
+                       size_t res;
+
+                       while (left) {
+                               res = fwrite(ulaw_silence, (left > BUF_SIZE) ? BUF_SIZE : left,
+                                            sizeof(ulaw_silence[0]), fs->f);
+                               if (res == -1)
+                                       return res;
+                               left -= res;
+                       }
+               }
+               /* fall through */
+       default:
+               offset = (offset > max) ? max : offset;
+               offset = (offset < 0) ? 0 : offset;
+               return fseek(fs->f, offset, SEEK_SET);
        }
-       /* always protect against seeking past begining. */
-       offset = (offset < min)?min:offset;
-       return fseek(fs->f, offset, SEEK_SET);
 }
 
 static int pcm_trunc(struct ast_filestream *fs)
@@ -212,18 +235,21 @@ static char *pcm_getcomment(struct ast_filestream *s)
 
 int load_module()
 {
+       int index;
+
+       for (index = 0; index < (sizeof(ulaw_silence) / sizeof(ulaw_silence[0])); index++)
+               ulaw_silence[index] = AST_LIN2MU(0);
+
        return ast_format_register(name, exts, AST_FORMAT_ULAW,
-                                                               pcm_open,
-                                                               pcm_rewrite,
-                                                               pcm_write,
-                                                               pcm_seek,
-                                                               pcm_trunc,
-                                                               pcm_tell,
-                                                               pcm_read,
-                                                               pcm_close,
-                                                               pcm_getcomment);
-                                                               
-                                                               
+                                  pcm_open,
+                                  pcm_rewrite,
+                                  pcm_write,
+                                  pcm_seek,
+                                  pcm_trunc,
+                                  pcm_tell,
+                                  pcm_read,
+                                  pcm_close,
+                                  pcm_getcomment);
 }
 
 int unload_module()

diff --git a/formats/format_pcm_alaw.c b/formats/format_pcm_alaw.c
index 0fd7de407e3b5575f197c20d8192ede6011ea478..885246726957bfacfacaf66ee787aea547b25e81 100644 (file)
--- a/formats/format_pcm_alaw.c
+++ b/formats/format_pcm_alaw.c
@@ -1,7 +1,7 @@
 /*
  * Asterisk -- An open source telephony toolkit.
  *
- * Copyright (C) 1999 - 2005, Digium, Inc.
+ * Copyright (C) 1999 - 2006, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
@@ -45,6 +45,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/sched.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
+#include "asterisk/alaw.h"
 
 #define BUF_SIZE 160           /* 160 samples */
 
@@ -73,6 +74,8 @@ static char *name = "alaw";
 static char *desc = "Raw aLaw 8khz PCM Audio support";
 static char *exts = "alaw|al";
 
+static char alaw_silence[BUF_SIZE];
+
 
 #if 0
 /* Returns time in msec since system boot. */
@@ -248,24 +251,44 @@ static int pcm_write(struct ast_filestream *fs, struct ast_frame *f)
 
 static int pcm_seek(struct ast_filestream *fs, long sample_offset, int whence)
 {
-       off_t offset=0,min,cur,max;
+       long cur, max, offset;
 
-       min = 0;
        cur = ftell(fs->f);
-       fseek(fs->f, 0, SEEK_END);
-       max = ftell(fs->f);
-       if (whence == SEEK_SET)
+       max = fseek(fs->f, 0, SEEK_END);
+
+       switch (whence) {
+       case SEEK_SET:
                offset = sample_offset;
-       else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
-               offset = sample_offset + cur;
-       else if (whence == SEEK_END)
+               break;
+       case SEEK_END:
                offset = max - sample_offset;
-       if (whence != SEEK_FORCECUR) {
-               offset = (offset > max)?max:offset;
+               break;
+       case SEEK_CUR:
+       case SEEK_FORCECUR:
+               offset = cur + sample_offset;
+               break;
+       }
+
+       switch (whence) {
+       case SEEK_FORCECUR:
+               if (offset > max) {
+                       size_t left = offset - max;
+                       size_t res;
+
+                       while (left) {
+                               res = fwrite(alaw_silence, (left > BUF_SIZE) ? BUF_SIZE : left,
+                                            sizeof(alaw_silence[0]), fs->f);
+                               if (res == -1)
+                                       return res;
+                               left -= res;
+                       }
+               }
+               /* fall through */
+       default:
+               offset = (offset > max) ? max : offset;
+               offset = (offset < 0) ? 0 : offset;
+               return fseek(fs->f, offset, SEEK_SET);
        }
-       /* Always protect against seeking past begining */
-       offset = (offset < min)?min:offset;
-       return fseek(fs->f, offset, SEEK_SET);
 }
 
 static int pcm_trunc(struct ast_filestream *fs)
@@ -288,16 +311,21 @@ static char *pcm_getcomment(struct ast_filestream *s)
 
 int load_module()
 {
+       int index;
+
+       for (index = 0; index < (sizeof(alaw_silence) / sizeof(alaw_silence[0])); index++)
+               alaw_silence[index] = AST_LIN2A(0);
+
        return ast_format_register(name, exts, AST_FORMAT_ALAW,
-                                                               pcm_open,
-                                                               pcm_rewrite,
-                                                               pcm_write,
-                                                               pcm_seek,
-                                                               pcm_trunc,
-                                                               pcm_tell,
-                                                               pcm_read,
-                                                               pcm_close,
-                                                               pcm_getcomment);
+                                  pcm_open,
+                                  pcm_rewrite,
+                                  pcm_write,
+                                  pcm_seek,
+                                  pcm_trunc,
+                                  pcm_tell,
+                                  pcm_read,
+                                  pcm_close,
+                                  pcm_getcomment);
 }
 
 int unload_module()