diff options
author | Christophe Gisquet <christophe.gisquet@gmail.com> | 2014-08-17 18:56:45 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-18 02:51:34 +0200 |
commit | 96d217832598da7001bc204706476dd1e37f377e (patch) | |
tree | f4a87dd49e474f21677607b459ae50b54a864957 /libavcodec | |
parent | c0d18cc085b13cdfb05ea90a20b46235fb4fa0a9 (diff) | |
download | ffmpeg-96d217832598da7001bc204706476dd1e37f377e.tar.gz |
alacenc: fix extra bits extraction
The raw coded bits are extracted prior to decorrelation, as is correctly
performed by the decoder, and not after.
Fixes ticket #2768.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/alacenc.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/libavcodec/alacenc.c b/libavcodec/alacenc.c index 63452539db..b9ad899e16 100644 --- a/libavcodec/alacenc.c +++ b/libavcodec/alacenc.c @@ -394,6 +394,19 @@ static void write_element(AlacEncodeContext *s, init_sample_buffers(s, channels, samples); write_element_header(s, element, instance); + // extract extra bits if needed + if (s->extra_bits) { + uint32_t mask = (1 << s->extra_bits) - 1; + for (j = 0; j < channels; j++) { + int32_t *extra = s->predictor_buf[j]; + int32_t *smp = s->sample_buf[j]; + for (i = 0; i < s->frame_size; i++) { + extra[i] = smp[i] & mask; + smp[i] >>= s->extra_bits; + } + } + } + if (channels == 2) alac_stereo_decorrelation(s); else @@ -419,8 +432,7 @@ static void write_element(AlacEncodeContext *s, uint32_t mask = (1 << s->extra_bits) - 1; for (i = 0; i < s->frame_size; i++) { for (j = 0; j < channels; j++) { - put_bits(pb, s->extra_bits, s->sample_buf[j][i] & mask); - s->sample_buf[j][i] >>= s->extra_bits; + put_bits(pb, s->extra_bits, s->predictor_buf[j][i] & mask); } } } |