[asterisk-commits] russell: branch 1.2 r51843 - /branches/1.2/channel.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue Jan 23 18:57:28 2007
New Revision: 51843

URL: http://svn.digium.com/view/asterisk?view=rev&rev=51843
Log:
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)

Modified:
    branches/1.2/channel.c

Modified: branches/1.2/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channel.c?view=diff&rev=51843&r1=51842&r2=51843
==============================================================================
--- branches/1.2/channel.c (original)
+++ branches/1.2/channel.c Tue Jan 23 18:57:28 2007
@@ -1958,9 +1958,10 @@
 #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
@@ -2313,9 +2314,10 @@
 #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