From dab41a355d582dacaecc65ede724e18719e01f16 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 24 Jan 2007 01:00:57 +0000 Subject: [PATCH] Merged revisions 51848 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r51848 | russell | 2007-01-23 18:59:58 -0600 (Tue, 23 Jan 2007) | 14 lines Merged revisions 51843 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r51843 | russell | 2007-01-23 18:57:28 -0600 (Tue, 23 Jan 2007) | 6 lines Fix an issue related to synchronization of recordings when using Monitor(). The bug is a miscalculation of the amount to seek the stream for writing to disk when the number of samples coming in and out of a channel do not match up. (issue #8298, #8887, report and patch by guillecabeza, patch files created and testing done by whoiswes) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51850 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/channel.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/main/channel.c b/main/channel.c index df02ee5688..aeef62b2e6 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2207,9 +2207,10 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) #ifndef MONITOR_CONSTANT_DELAY 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) + jump = chan->outsmpl - chan->insmpl; + if (ast_seekstream(chan->monitor->read_stream, jump, 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 + 4 * f->samples; + chan->insmpl += jump + f->samples; } else chan->insmpl+= f->samples; #else @@ -2627,9 +2628,10 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr) #ifndef MONITOR_CONSTANT_DELAY 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) + jump = chan->insmpl - chan->outsmpl; + if (ast_seekstream(chan->monitor->write_stream, jump, 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 + 4 * f->samples; + chan->outsmpl += jump + f->samples; } else chan->outsmpl += f->samples; #else