diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-24 00:57:28 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-24 00:57:28 +0000 |
| commit | a2faf5f00474a4b872dfd0aad395d619f20b0ddb (patch) | |
| tree | f5d7a1f1b1a171831c7932d02dfbaa41f314dc2d | |
| parent | 3fa016ea0d107989814beb996b557c53e6d5772f (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.2@51843 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channel.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -1958,9 +1958,10 @@ struct ast_frame *ast_read(struct ast_channel *chan) #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 @@ 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 |