[asterisk-commits] dvossel: branch 1.6.1 r186381 - in /branches/1.6.1: ./ main/audiohook.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Fri Apr  3 11:38:36 2009
New Revision: 186381

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=186381
Log:
Merged revisions 186379 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r186379 | dvossel | 2009-04-03 11:29:47 -0500 (Fri, 03 Apr 2009) | 4 lines
  
  audio_audiohook_write_list() did not correctly update sample size after ast_translate.
  
  audio_audiohook_write_list() did not take into account that the sample size may change after translation depending on if the original frame is is 8khz or 16khz.  the sample size is now updated after translating to reflect this possibility.  This caused the audio on the receiving end to sound terrible.  Thanks to jcolp and mmichelson for helping me work this out.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/audiohook.c

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

Modified: branches/1.6.1/main/audiohook.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/audiohook.c?view=diff&rev=186381&r1=186380&r2=186381
==============================================================================
--- branches/1.6.1/main/audiohook.c (original)
+++ branches/1.6.1/main/audiohook.c Fri Apr  3 11:38:36 2009
@@ -576,6 +576,7 @@
 		}
 		if (!(middle_frame = ast_translate(in_translate->trans_pvt, frame, 0)))
 			return frame;
+		samples = middle_frame->samples;
 	}
 
 	/* Queue up signed linear frame to each spy */