diff options
| author | Martin Storsjö <martin@martin.st> | 2014-06-06 12:03:09 +0300 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-06-10 00:24:30 +0200 |
| commit | 401b3dafd989b4a016064e1906086be5ff3ea39a (patch) | |
| tree | 1798892c910f8c6c00d0e2dc12b7bad9e35c3162 | |
| parent | 71516ac175aaf10466db1998205aea8a31387370 (diff) | |
| download | ffmpeg-401b3dafd989b4a016064e1906086be5ff3ea39a.tar.gz | |
adpcm: Write the proper predictor in trellis mode in IMA QT
The actual predictor value, set by the trellis code, never
was written back into the variable that was written into
the block header. This was accidentally removed in b304244b.
This significantly improves the audio quality of the trellis
case, which was plain broken since b304244b.
Encoding IMA QT with trellis still actually gives a slightly
worse quality than without trellis, since the trellis encoder
doesn't use the exact same way of rounding as in
adpcm_ima_qt_compress_sample and adpcm_ima_qt_expand_nibble.
Fixes part of Ticket3701
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fa8f060b75bf9074792a0f9ff4ed002652ef62b8)
Conflicts:
tests/ref/acodec/adpcm-ima_qt-trellis
| -rw-r--r-- | libavcodec/adpcmenc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index fed0cc8a19..5bcaeb14be 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -561,6 +561,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, 64, 1); for (i = 0; i < 64; i++) put_bits(&pb, 4, buf[i ^ 1]); + status->prev_sample = status->predictor; } else { for (i = 0; i < 64; i += 2) { int t1, t2; |