Commit a7f0c5e5 authored by conrad's avatar conrad

dca and aac decoders use float_to_int16_interleave, so check for

the C version of that rather than float_to_int16.
Fixes output on ARM/VFP

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@20192 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 87748a78
...@@ -527,7 +527,7 @@ static av_cold int aac_decode_init(AVCodecContext *avccontext) ...@@ -527,7 +527,7 @@ static av_cold int aac_decode_init(AVCodecContext *avccontext)
// 32768 - Required to scale values to the correct range for the bias method // 32768 - Required to scale values to the correct range for the bias method
// for float to int16 conversion. // for float to int16 conversion.
if (ac->dsp.float_to_int16 == ff_float_to_int16_c) { if (ac->dsp.float_to_int16_interleave == ff_float_to_int16_interleave_c) {
ac->add_bias = 385.0f; ac->add_bias = 385.0f;
ac->sf_scale = 1. / (-1024. * 32768.); ac->sf_scale = 1. / (-1024. * 32768.);
ac->sf_offset = 0; ac->sf_offset = 0;
......
...@@ -1324,7 +1324,7 @@ static av_cold int dca_decode_init(AVCodecContext * avctx) ...@@ -1324,7 +1324,7 @@ static av_cold int dca_decode_init(AVCodecContext * avctx)
s->samples_chanptr[i] = s->samples + i * 256; s->samples_chanptr[i] = s->samples + i * 256;
avctx->sample_fmt = SAMPLE_FMT_S16; avctx->sample_fmt = SAMPLE_FMT_S16;
if(s->dsp.float_to_int16 == ff_float_to_int16_c) { if(s->dsp.float_to_int16_interleave == ff_float_to_int16_interleave_c) {
s->add_bias = 385.0f; s->add_bias = 385.0f;
s->scale_bias = 1.0 / 32768.0; s->scale_bias = 1.0 / 32768.0;
} else { } else {
......
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