mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-08 10:58:15 +00:00
make monitoring more tolerant of peers that deliver frames in bursts
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7799 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1912,11 +1912,11 @@ struct ast_frame *ast_read(struct ast_channel *chan)
|
||||
|
||||
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
|
||||
@@ -2258,11 +2258,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
|
||||
|
||||
Reference in New Issue
Block a user