From 9f941c8a00541ffe418f95267438ccb5458db173 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 29 Jun 2008 09:10:46 +0000 Subject: Simplify predictor updates git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27152 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ad_imaadpcm.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/ad_imaadpcm.c b/libmpcodecs/ad_imaadpcm.c index f1e03b59a7..7a8e89dc41 100644 --- a/libmpcodecs/ad_imaadpcm.c +++ b/libmpcodecs/ad_imaadpcm.c @@ -150,16 +150,10 @@ static void decode_nibbles(unsigned short *output, 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]; -- cgit v1.2.3