# HG changeset patch # User reimar # Date 1214730646 0 # Node ID ea18c012330ae3119fbfe5dd3c21c9b8fe744298 # Parent 7c07e13eeae37b862a1f568557a6440d08d3108a Simplify predictor updates diff -r 7c07e13eeae3 -r ea18c012330a libmpcodecs/ad_imaadpcm.c --- a/libmpcodecs/ad_imaadpcm.c Sun Jun 29 08:47:56 2008 +0000 +++ b/libmpcodecs/ad_imaadpcm.c Sun Jun 29 09:10:46 2008 +0000 @@ -150,16 +150,10 @@ sign = delta & 8; delta = delta & 7; + delta = 2 * delta + 1; + if (sign) delta = -delta; - diff = step[channel_number] >> 3; - if (delta & 4) diff += step[channel_number]; - if (delta & 2) diff += step[channel_number] >> 1; - if (delta & 1) diff += step[channel_number] >> 2; - - if (sign) - predictor[channel_number] -= diff; - else - predictor[channel_number] += diff; + predictor[channel_number] += (delta * step[channel_number]) >> 3; CLAMP_S16(predictor[channel_number]); output[i] = predictor[channel_number];