diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-08 16:56:56 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-08 16:56:56 +0000 |
| commit | 3eb9fbb719f89a99ab8f52831a581147f0781b95 (patch) | |
| tree | f81fa049ccbcb155aca202bcd0ad04cd627caec7 /include | |
| parent | db156547101bd1b2a4b1318413f0f39e0c48d62b (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/time.h | 2 |
1 files changed, 1 insertions, 1 deletions
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)); } ) |