[asterisk-commits] mjordan: branch 13 r429033 - in /branches/13: ./ res/res_monitor.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Sat Dec  6 12:16:18 2014
New Revision: 429033

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=429033
Log:
res/res_monitor: Reset in/out sample counts on Monitor start

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

Modified:
    branches/13/   (props changed)
    branches/13/res/res_monitor.c

Propchange: branches/13/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: branches/13/res/res_monitor.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/res/res_monitor.c?view=diff&rev=429033&r1=429032&r2=429033
==============================================================================
--- branches/13/res/res_monitor.c (original)
+++ branches/13/res/res_monitor.c Sat Dec  6 12:16:18 2014
@@ -402,6 +402,8 @@
 		} 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 */