Merged revisions 205600 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r205600 | dvossel | 2009-07-09 11:19:09 -0500 (Thu, 09 Jul 2009) | 9 lines

  Merged revisions 205599 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r205599 | dvossel | 2009-07-09 11:18:09 -0500 (Thu, 09 Jul 2009) | 2 lines

    Changing ast_samp2tv to not use floating point.
  ........
................

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

diff --git a/include/asterisk/time.h b/include/asterisk/time.h
index fa8006e2a2135e05ad9a52de02b072573b08afb5..895d6df50357815b0d158f135a8eef8ed6b73a0a 100644 (file)
--- 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 / (float) _rate));
+       return ast_tv(_nsamp / _rate, ((_nsamp % _rate) * (4000000 / _rate)) / 4); /* this calculation is accurate up to 32000Hz. */
 }
 )