[asterisk-commits] dhubbard: branch 1.6.0 r257738 - in /branches/1.6.0: ./ apps/app_mixmonitor.c

[SVN commits to the Asterisk project]

Author: dhubbard
Date: Fri Apr 16 16:28:10 2010
New Revision: 257738

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=257738
Log:
Merged revisions 257713 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r257713 | dhubbard | 2010-04-16 16:22:30 -0500 (Fri, 16 Apr 2010) | 28 lines
  
  Merged revisions 257686 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r257686 | dhubbard | 2010-04-16 16:15:43 -0500 (Fri, 16 Apr 2010) | 21 lines
    
    Make the mixmonitor thread process audio frames faster
    
    Mantis issue 17078 reports MixMonitor recordings have shorter durations than 
    the call duration.  This was because the mixmonitor thread was not processing 
    frames from the audiohook fast enough.  The mixmonitor thread would slowly fall 
    behind the most recent audio frame and when the channel hangs up, the mixmonitor 
    thread would exit without processing the same number of frames as the channel; 
    leaving the mixmonitor recording shorter than actual call duration.
    
    This revision fixes this issue by moving the ast_audiohook_trigger_wait() and 
    the subsequent audiohook.status check into the block where the 
    ast_audiohook_read_frame() function returns NULL.
    
    (closes issue #17078)
    Reported by: geoff2010
    Patches:
          dw-M17078.patch uploaded by dhubbard (license 733)
    Tested by: dhubbard, geoff2010
    
    Review: https://reviewboard.asterisk.org/r/611/
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_mixmonitor.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_mixmonitor.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/apps/app_mixmonitor.c?view=diff&rev=257738&r1=257737&r2=257738
==============================================================================
--- branches/1.6.0/apps/app_mixmonitor.c (original)
+++ branches/1.6.0/apps/app_mixmonitor.c Fri Apr 16 16:28:10 2010
@@ -245,13 +245,14 @@
 	while (mixmonitor->audiohook.status == AST_AUDIOHOOK_STATUS_RUNNING && !mixmonitor->mixmonitor_ds->fs_quit) {
 		struct ast_frame *fr = NULL;
 
-		ast_audiohook_trigger_wait(&mixmonitor->audiohook);
-
-		if (mixmonitor->audiohook.status != AST_AUDIOHOOK_STATUS_RUNNING)
-			break;
-
-		if (!(fr = ast_audiohook_read_frame(&mixmonitor->audiohook, SAMPLES_PER_FRAME, AST_AUDIOHOOK_DIRECTION_BOTH, AST_FORMAT_SLINEAR)))
+		if (!(fr = ast_audiohook_read_frame(&mixmonitor->audiohook, SAMPLES_PER_FRAME, AST_AUDIOHOOK_DIRECTION_BOTH, AST_FORMAT_SLINEAR))) {
+			ast_audiohook_trigger_wait(&mixmonitor->audiohook);
+
+			if (mixmonitor->audiohook.status != AST_AUDIOHOOK_STATUS_RUNNING) {
+				break;
+			}
 			continue;
+		}
 
 		/* audiohook lock is not required for the next block.
 		 * Unlock it, but remember to lock it before looping or exiting */