Commit 081a7f3e authored by Michael Niedermayer's avatar Michael Niedermayer

sonic: replace some float by integers to improve platform independance

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 12de2933
...@@ -550,7 +550,7 @@ static av_cold int sonic_encode_init(AVCodecContext *avctx) ...@@ -550,7 +550,7 @@ static av_cold int sonic_encode_init(AVCodecContext *avctx)
s->channels = avctx->channels; s->channels = avctx->channels;
s->samplerate = avctx->sample_rate; 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->frame_size = s->channels*s->block_align*s->downsampling;
s->tail_size = s->num_taps*s->channels; s->tail_size = s->num_taps*s->channels;
...@@ -813,7 +813,7 @@ static av_cold int sonic_decode_init(AVCodecContext *avctx) ...@@ -813,7 +813,7 @@ static av_cold int sonic_decode_init(AVCodecContext *avctx)
if (get_bits1(&gb)) // XXX FIXME if (get_bits1(&gb)) // XXX FIXME
av_log(avctx, AV_LOG_INFO, "Custom quant table\n"); 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; s->frame_size = s->channels*s->block_align*s->downsampling;
// avctx->frame_size = s->block_align; // avctx->frame_size = s->block_align;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment