From 50c52d22502d649db0fdecde6de64532e20c5dda Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 19 Jun 2008 11:00:17 +0000 Subject: Factorize c->ap += (-c->ap) >> 4 out Originally committed as revision 13817 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/g726.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libavcodec/g726.c') diff --git a/libavcodec/g726.c b/libavcodec/g726.c index b8abd297a1..9d4c87d66b 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -239,10 +239,11 @@ static int16_t g726_decode(G726Context* c, int I) c->dml += ((c->tbls.F[I]<<11) - c->dml) >> 7; if (tr) c->ap = 256; - else if (c->y > 1535 && !c->td && abs((c->dms << 2) - c->dml) < (c->dml >> 3)) + else { c->ap += (-c->ap) >> 4; - else - c->ap += (0x200 - c->ap) >> 4; + if (c->y <= 1535 || c->td || abs((c->dms << 2) - c->dml) >= (c->dml >> 3)) + c->ap += 0x20; + } /* Update Yu and Yl */ c->yu = av_clip(c->y + c->tbls.W[I] + ((-c->y)>>5), 544, 5120); -- cgit v1.2.3