[FFmpeg-cvslog] sonic: replace some float by integers to improve platform independance

Michael Niedermayer git at videolan.org
Sat Jun 22 22:31:07 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun 22 21:58:13 2013 +0200| [081a7f3ed06508d38f195dab260880f44476b7a8] | committer: Michael Niedermayer

sonic: replace some float by integers to improve platform independance

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=081a7f3ed06508d38f195dab260880f44476b7a8
---

 libavcodec/sonic.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c
index 58bba88..7736a12 100644
--- a/libavcodec/sonic.c
+++ b/libavcodec/sonic.c
@@ -550,7 +550,7 @@ static av_cold int sonic_encode_init(AVCodecContext *avctx)
     s->channels = avctx->channels;
     s->samplerate = avctx->sample_rate;
 
-    s->block_align = (int)(2048.0*s->samplerate/44100)/s->downsampling;
+    s->block_align = 2048LL*s->samplerate/(44100*s->downsampling);
     s->frame_size = s->channels*s->block_align*s->downsampling;
 
     s->tail_size = s->num_taps*s->channels;
@@ -813,7 +813,7 @@ static av_cold int sonic_decode_init(AVCodecContext *avctx)
     if (get_bits1(&gb)) // XXX FIXME
         av_log(avctx, AV_LOG_INFO, "Custom quant table\n");
 
-    s->block_align = (int)(2048.0*s->samplerate/44100)/s->downsampling;
+    s->block_align = 2048LL*s->samplerate/(44100*s->downsampling);
     s->frame_size = s->channels*s->block_align*s->downsampling;
 //    avctx->frame_size = s->block_align;
 



More information about the ffmpeg-cvslog mailing list