From: David Vossel <dvossel@digium.com>
Date: Wed, 8 Jul 2009 16:56:13 +0000 (+0000)
Subject: Merged revisions 205216 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71a282bce858fbc539b6517565ff93bd7411c3e0;p=thirdparty%2Fasterisk.git

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/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@205218 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/time.h b/include/asterisk/time.h
index 4b7ca00ff9..fa8006e2a2 100644
--- a/include/asterisk/time.h
+++ b/include/asterisk/time.h
@@ -171,7 +171,7 @@ struct timeval ast_tv(ast_time_t sec, ast_suseconds_t usec),
 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));
 }
 )