Browse Source

ape: Unbreak adaptcoeffs computation

And simplify and explain the expression.

Fault introduced in f3fdef108e

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
tags/n3.1
Luca Barbato Derek Buitenhuis 9 years ago
parent
commit
dd4fb2339f
1 changed files with 10 additions and 2 deletions
  1. +10
    -2
      libavcodec/apedec.c

+ 10
- 2
libavcodec/apedec.c View File

@@ -1284,8 +1284,16 @@ static void do_apply_filter(APEContext *ctx, int version, APEFilter *f,
/* Update the adaption coefficients */
absres = FFABS(res);
if (absres)
*f->adaptcoeffs = ((res & INT32_MIN) ^ ((~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;



Loading…
Cancel
Save