avcodec/prosumer: Factorize the 2 loops in fill_elements()

Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/prosumer: Factorize the 2 loops in fill_elements()
Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
d3a9cb6b · Michael Niedermayer · f24701b0 · d3a9cb6b
Commit d3a9cb6b authored Sep 22, 2018 by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 23 deletions

prosumer.c libavcodec/prosumer.c +18 -23

No files found.
--- a/libavcodec/prosumer.c
+++ b/libavcodec/prosumer.c
@@ -282,29 +282,24 @@ static void fill_elements(uint32_t idx, uint32_t shift, int size, uint32_t *e0,
 {
    uint32_t b, h = idx << (32 - shift);
-    for (int i = 0; i < size; i++) {
+    for (int j = 0; j < 2; j++) {
-        b = 4 * (table[2 * i + 1] & 0xF);
+        for (int i = 0; i < size; i++) {
-        if (shift >= b && (h & (0xFFF00000u << (12 - b))) == (table[2 * i + 1] & 0xFFFF0000u)) {
+            b = 4 * (table[2 * i + 1] & 0xF);
-            if (table[2 * i] >> 8 == 0x80u) {
+            if (shift >= b && (h & (0xFFF00000u << (12 - b))) == (table[2 * i + 1] & 0xFFFF0000u)) {
-                return;
+                if (table[2 * i] >> 8 == 0x80u) {
-            } else {
+                    return;
-                *e1 = table[2 * i];
+                } else {
-                *e0 = (*e0 & 0xFFFFFFu) | (((12 + b - shift) & 0xFFFFFFFCu | 0x40u) << 22);
+                    if (j == 0) {
-                shift -= b;
+                        *e1 = table[2 * i];
-                h <<= b;
+                        *e0 = (*e0 & 0xFFFFFFu) | (((12 + b - shift) & 0xFFFFFFFCu | 0x40u) << 22);
-                break;
+                        shift -= b;
-            }
+                        h <<= b;
-        }
+                    } else {
-    }
+                        *e1 |= table[2 * i] << 16;
-    for (int i = 0; i < size; i++) {
+                        *e0 = (*e0 & 0xFFFFFFu) | (((12 + b - shift) & 0xFFFFFFFCu | 0x80u) << 22);
-        b = 4 * (table[2 * i + 1] & 0xF);
+                    }
-        if (shift >= b && (h & (0xFFF00000u << (12 - b))) == (table[2 * i + 1] & 0xFFFF0000u)) {
+                    break;
-            if (table[2 * i] >> 8 == 0x80u) {
+                }
-                return;
-            } else {
-                *e1 |= table[2 * i] << 16;
-                *e0 = (*e0 & 0xFFFFFFu) | (((12 + b - shift) & 0xFFFFFFFCu | 0x80u) << 22);
-                break;
            }
        }
    }