From 3eb9fbb719f89a99ab8f52831a581147f0781b95 Mon Sep 17 00:00:00 2001 From: dvossel Date: Wed, 8 Jul 2009 16:56:56 +0000 Subject: 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: http://svn.digium.com/svn/asterisk/branches/1.6.0@205220 f38db490-d61c-443f-a65b-d21fe96a405b --- include/asterisk/time.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/asterisk/time.h b/include/asterisk/time.h index 8abce667d..3720793de 100644 --- a/include/asterisk/time.h +++ b/include/asterisk/time.h @@ -172,7 +172,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)); } ) -- cgit v1.2.3