[asterisk-commits] pabelanger: branch 1.6.2 r277188 - in /branches/1.6.2: ./ apps/app_amd.c

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Fri Jul 16 12:18:01 2010
New Revision: 277188

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

................
  r277183 | pabelanger | 2010-07-16 13:13:46 -0400 (Fri, 16 Jul 2010) | 15 lines
  
  Merged revisions 277182 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r277182 | pabelanger | 2010-07-16 13:10:36 -0400 (Fri, 16 Jul 2010) | 8 lines
    
    Total analysis time error with SIP and silence suppression
    
    When using app_amd with SIP providers that have silence
    suppression on, the iTotalTime count increases exponentially.
    
    (closes issue #17656)
    Reported by: juls
  ........
................

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/apps/app_amd.c

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

Modified: branches/1.6.2/apps/app_amd.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_amd.c?view=diff&rev=277188&r1=277187&r2=277188
==============================================================================
--- branches/1.6.2/apps/app_amd.c (original)
+++ branches/1.6.2/apps/app_amd.c Fri Jul 16 12:18:01 2010
@@ -270,10 +270,11 @@
 
 		if (f->frametype == AST_FRAME_VOICE || f->frametype == AST_FRAME_NULL || f->frametype == AST_FRAME_CNG) {
 			/* If the total time exceeds the analysis time then give up as we are not too sure */
-			if (f->frametype == AST_FRAME_VOICE)
+			if (f->frametype == AST_FRAME_VOICE) {
 				framelength = (ast_codec_get_samples(f) / DEFAULT_SAMPLES_PER_MS);
-			else
-				framelength += 2 * maxWaitTimeForFrame;
+			} else {
+				framelength = 2 * maxWaitTimeForFrame;
+			}
 
 			iTotalTime += framelength;
 			if (iTotalTime >= totalAnalysisTime) {