Ticket #113: ffmpeg-simpler-cabacresid.diff

h264.c

@@ -5980 +5980 @@
-    int nza, nzb;
-    int ctx = 0;
-
-
+
+
-        nza = h->left_cbp&0x100;
-        nzb = h-> top_cbp&0x100;
-
+
+
-        nza = h->non_zero_count_cache[scan8[idx] - 1];
-        nzb = h->non_zero_count_cache[scan8[idx] - 8];
-
+
+
-        nza = (h->left_cbp>>(6+idx))&0x01;
-        nzb = (h-> top_cbp>>(6+idx))&0x01;
-
+
+
-        assert(cat == 4);
-        nza = h->non_zero_count_cache[scan8[16+idx] - 1];
-        nzb = h->non_zero_count_cache[scan8[16+idx] - 8];
@@ -6013 +6017 @@
-
-static int decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff) {
-    const int mb_xy  = h->s.mb_x + h->s.mb_y*h->s.mb_stride;
-in
+uint16_
-      { 105+0, 105+15, 105+29, 105+44, 105+47, 402 },
-      { 277+0, 277+15, 277+29, 277+44, 277+47, 436 }
-    };
-in
+uint16_
-      { 166+0, 166+15, 166+29, 166+44, 166+47, 417 },
-      { 338+0, 338+15, 338+29, 338+44, 338+47, 451 }
-    };
-in
+uint16_
-        227+0, 227+10, 227+20, 227+30, 227+39, 426
-    };
-    static const uint8_t significant_coeff_flag_offset_8x8[2][63] = {
@@ -6121 +6125 @@
-    }
-    assert(coeff_count > 0);
-
-
+
+
-        h->cbp_table[mb_xy] |= 0x100;
-
+
+
-        h->non_zero_count_cache[scan8[n]] = coeff_count;
-
+
+
-        h->cbp_table[mb_xy] |= 0x40 << n;
-
+
+
-        h->non_zero_count_cache[scan8[16+n]] = coeff_count;
-
+
+
-        assert( cat == 5 );
-        fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, coeff_count, 1);
-    }
-
-for( coeff_count--; coeff_count >= 0;
+while (
-        uint8_t *ctx = (abslevelgt1 != 0 ? 0 : FFMIN( 4, abslevel1 )) + abs_level_m1_ctx_base;
-        int j= scantable[index[coeff_count]];
-
-        if( get_cabac( CC, ctx ) == 0 ) {
+            int sign = get_cabac_bypass_sign( CC, qmul ? -qmul[j] : -1 );
+            
-            if( !qmul ) {
-get_cabac_bypass_sign( CC, -1)
+sign
-            }else{
-get_cabac_bypass_sign( CC, -qmul[j]) + 32) >> 6;
+sign + 32) >> 6
-            }
-
-            abslevel1++;

cabac.h

@@ -632 +632 @@
-
-
-static av_always_inline int get_cabac_bypass_sign(CABACContext *c, int val){
-defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__))
+0
-    asm volatile(
-        "movl "RANGE    "(%1), %%ebx            \n\t"
-        "movl "LOW      "(%1), %%eax            \n\t"