[FFmpeg-cvslog] r13817 - trunk/libavcodec/g726.c

[michael]

Author: michael
Date: Thu Jun 19 13:00:17 2008
New Revision: 13817

Log:
Factorize c->ap += (-c->ap) >> 4 out


Modified:
   trunk/libavcodec/g726.c

Modified: trunk/libavcodec/g726.c
==============================================================================
--- trunk/libavcodec/g726.c	(original)
+++ trunk/libavcodec/g726.c	Thu Jun 19 13:00:17 2008
@@ -239,10 +239,11 @@ static int16_t g726_decode(G726Context* 
     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);