[FFmpeg-devel] [PATCH 1/2] avcodec/ffv1enc: split updating bitmap out of remap write loop

[Michael Niedermayer]

Maybe easier to understand

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
 libavcodec/ffv1enc.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index bc59f96746c..0c879fe5ce5 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -1310,6 +1310,19 @@ static int encode_float32_remap_segment(FFV1SliceContext *sc,
         s.run1final = 0;
     }
 
+    if (final) {
+        int64_t last_val = s.last_val;
+        for (int i = s.i; i<s.pixel_num; i++) {
+            int val = sc->unit[s.p][i].val;
+
+            if (last_val != val) {
+                s.compact_index ++;
+                last_val = val;
+            }
+            sc->bitmap[s.p][sc->unit[s.p][i].ndx] = s.compact_index;
+        }
+    }
+
     for (; s.i < s.pixel_num+1; s.i++) {
         int current_mul = s.current_mul_index < 0 ? 1 : FFABS(s.mul[s.current_mul_index]);
         int64_t val;
@@ -1386,12 +1399,8 @@ static int encode_float32_remap_segment(FFV1SliceContext *sc,
                     s.mul[ s.current_mul_index ] *= -1;
                     put_symbol_inline(&s.rc, s.state[0][2], s.mul[ s.current_mul_index ], 0, NULL, NULL);
                 }
-                s.compact_index ++;
             }
         }
-        if (!s.run || s.run1final)
-            if (final && s.i < s.pixel_num)
-                sc->bitmap[s.p][sc->unit[s.p][s.i].ndx] = s.compact_index;
     }
 
     if (update) {
-- 
2.48.1