avcodec/ffv1: Simplify update_vlc_state()
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 26 Jan 2019 23:56:59 +0000 (00:56 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 31 Jan 2019 16:17:17 +0000 (17:17 +0100)
About 0.5% faster

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/ffv1.h

index 7c29d01..f0bb193 100644 (file)
@@ -174,19 +174,13 @@ static inline void update_vlc_state(VlcState *const state, const int v)
     count++;
 
     if (drift <= -count) {
-        if (state->bias > -128)
-            state->bias--;
+        state->bias = FFMAX(state->bias - 1, -128);
 
-        drift += count;
-        if (drift <= -count)
-            drift = -count + 1;
+        drift = FFMAX(drift + count, -count + 1);
     } else if (drift > 0) {
-        if (state->bias < 127)
-            state->bias++;
+        state->bias = FFMIN(state->bias + 1, 127);
 
-        drift -= count;
-        if (drift > 0)
-            drift = 0;
+        drift = FFMIN(drift - count, 0);
     }
 
     state->drift = drift;