res/res_monitor: Reset in/out sample counts on Monitor start
authorMatthew Jordan <mjordan@digium.com>
Sat, 6 Dec 2014 18:16:49 +0000 (18:16 +0000)
committerMatthew Jordan <mjordan@digium.com>
Sat, 6 Dec 2014 18:16:49 +0000 (18:16 +0000)
When repeatedly starting/stopping a Monitor on a channel, the accumulated
in/out sample counts are never reset to 0. This can cause inadvertent jumps
in the recordings, as the code in the channel core will determine incorrectly
that a jump in the recorded file position should occur. Setting the sample
counts to 0 simply reflects the initial state a Monitor should be in when it
is started, as this is the initial count that would be on the channels at that
time.

ASTERISK-24573 #close
Reported by: Nuno Borges
patches:
  24573.patch uploaded by Nuno Borges (License 6116)
........

Merged revisions 429031 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 429032 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 429033 from http://svn.asterisk.org/svn/asterisk/branches/13

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

res/res_monitor.c

index 7f1fa41..872f565 100644 (file)
@@ -402,6 +402,8 @@ int AST_OPTIONAL_API_NAME(ast_monitor_start)(struct ast_channel *chan, const cha
                } else
                        monitor->write_stream = NULL;
 
+               ast_channel_insmpl_set(chan, 0);
+               ast_channel_outsmpl_set(chan, 0);
                ast_channel_monitor_set(chan, monitor);
                ast_monitor_set_state(chan, AST_MONITOR_RUNNING);
                /* so we know this call has been monitored in case we need to bill for it or something */