[svn-commits] dvossel: branch 1.6.0 r205220 - in /branches/1.6.0: ./ include/asterisk/time.h

[SVN commits to the Digium repositories]

Author: dvossel
Date: Wed Jul  8 11:56:56 2009
New Revision: 205220

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

................
  r205216 | dvossel | 2009-07-08 11:54:24 -0500 (Wed, 08 Jul 2009) | 17 lines
  
  Merged revisions 205215 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r205215 | dvossel | 2009-07-08 11:53:40 -0500 (Wed, 08 Jul 2009) | 10 lines
    
    ast_samp2tv needs floating point for 16khz audio
    
    In ast_samp2tv(), (1000000 / _rate) = 62.5 when _rate is 16000.
    The .5 is currently stripped off because we don't calculate
    using floating points.  This causes madness with 16khz audio.
    
    (issue ABE-1899)
    
    Review: https://reviewboard.asterisk.org/r/305/
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/include/asterisk/time.h

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

Modified: branches/1.6.0/include/asterisk/time.h
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/include/asterisk/time.h?view=diff&rev=205220&r1=205219&r2=205220
==============================================================================
--- branches/1.6.0/include/asterisk/time.h (original)
+++ branches/1.6.0/include/asterisk/time.h Wed Jul  8 11:56:56 2009
@@ -172,7 +172,7 @@
 AST_INLINE_API(
 struct timeval ast_samp2tv(unsigned int _nsamp, unsigned int _rate),
 {
-	return ast_tv(_nsamp / _rate, (_nsamp % _rate) * (1000000 / _rate));
+	return ast_tv(_nsamp / _rate, (_nsamp % _rate) * (1000000 / (float) _rate));
 }
 )