diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2016-04-21 16:09:38 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2016-04-24 10:18:25 +0200 |
| commit | 4012fe1ee819edc7689e182189e66c5401fb4b41 (patch) | |
| tree | 22753f75c726bb127040f6b628cf038aef1a86ac /libavcodec/apedec.c | |
| parent | 2e5bde956519ae19cedfa482e199518e495bcaf5 (diff) | |
| download | ffmpeg-4012fe1ee819edc7689e182189e66c5401fb4b41.tar.gz | |
ape: Unbreak adaptcoeffs computation
And simplify and explain the expression.
Fault introduced in f3fdef108eb06b1e71b29152bf6822519e787efe
Diffstat (limited to 'libavcodec/apedec.c')
| -rw-r--r-- | libavcodec/apedec.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 85d26aef27..d7cf8a2708 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -1305,8 +1305,16 @@ static void do_apply_filter(APEContext *ctx, int version, APEFilter *f, /* Update the adaption coefficients */ absres = FFABS(res); if (absres) - *f->adaptcoeffs = ((res & ((~0UL) << 31)) ^ ((~0UL) << 30)) >> - (25 + (absres <= f->avg*3) + (absres <= f->avg*4/3)); + *f->adaptcoeffs = APESIGN(res) * + (8 << ((absres > f->avg * 3) + (absres > f->avg * 4 / 3))); + /* equivalent to the following code + if (absres <= f->avg * 4 / 3) + *f->adaptcoeffs = APESIGN(res) * 8; + else if (absres <= f->avg * 3) + *f->adaptcoeffs = APESIGN(res) * 16; + else + *f->adaptcoeffs = APESIGN(res) * 32; + */ else *f->adaptcoeffs = 0; |