faster cabac_encode_bypass

git-svn-id: svn://svn.videolan.org/x264/trunk@501 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/common/cabac.c b/common/cabac.c
index 50e09ab447c19c5573778b62e1c7ed37bedc5f57..f7e2941bea7a9488ffa2b80a6e4ce633106b2931 100644 (file)
--- a/common/cabac.c
+++ b/common/cabac.c
@@ -974,16 +974,12 @@ void x264_cabac_encode_decision( x264_cabac_t *cb, int i_ctx, int b )
 void x264_cabac_encode_bypass( x264_cabac_t *cb, int b )
 {
     cb->i_low <<= 1;
-    cb->i_low += b * cb->i_range;
+    cb->i_low += (((int32_t)b<<31)>>31) & cb->i_range;
 
-    if( cb->i_low >= 0x400 )
+    if( cb->i_low >= 0x400 || cb->i_low < 0x200 )
     {
-        x264_cabac_putbit( cb, 1 );
-        cb->i_low -= 0x400;
-    }
-    else if( cb->i_low < 0x200 )
-    {
-        x264_cabac_putbit( cb, 0 );
+        x264_cabac_putbit( cb, cb->i_low >> 10 );
+        cb->i_low &= 0x3ff;
     }
     else
     {

diff --git a/encoder/cabac.c b/encoder/cabac.c
index 0f19548fc58b4055eed6a4161a77c38430212cfd..38c03eec836bd171e08a81aed24077c3accfc1a1 100644 (file)
--- a/encoder/cabac.c
+++ b/encoder/cabac.c
@@ -255,17 +255,13 @@ static void x264_cabac_mb_intra_chroma_pred_mode( x264_t *h, x264_cabac_t *cb )
         ctx++;
     }
 
-    if( i_mode == 0 )
+    x264_cabac_encode_decision( cb, 64 + ctx, i_mode > 0 );
+    if( i_mode > 0 )
     {
-        x264_cabac_encode_decision( cb, 64 + ctx, 0 );
-    }
-    else
-    {
-        x264_cabac_encode_decision( cb, 64 + ctx, 1 );
-        x264_cabac_encode_decision( cb, 64 + 3, ( i_mode == 1 ? 0 : 1 ) );
+        x264_cabac_encode_decision( cb, 64 + 3, i_mode > 1 );
         if( i_mode > 1 )
         {
-            x264_cabac_encode_decision( cb, 64 + 3, ( i_mode == 2 ? 0 : 1 ) );
+            x264_cabac_encode_decision( cb, 64 + 3, i_mode > 2 );
         }
     }
 }
@@ -347,7 +343,7 @@ static void x264_cabac_mb_cbp_chroma( x264_t *h, x264_cabac_t *cb )
         ctx = 4;
         if( cbp_a == 2 ) ctx++;
         if( cbp_b == 2 ) ctx += 2;
-        x264_cabac_encode_decision( cb, 77 + ctx, h->mb.i_cbp_chroma > 1 ? 1 : 0 );
+        x264_cabac_encode_decision( cb, 77 + ctx, h->mb.i_cbp_chroma > 1 );
     }
 }
 
@@ -396,10 +392,8 @@ void x264_cabac_mb_skip( x264_t *h, int b_skip )
         ctx++;
     }
 
-    if( h->sh.i_type == SLICE_TYPE_P )
-        x264_cabac_encode_decision( &h->cabac, 11 + ctx, b_skip ? 1 : 0 );
-    else /* SLICE_TYPE_B */
-        x264_cabac_encode_decision( &h->cabac, 24 + ctx, b_skip ? 1 : 0 );
+    ctx += (h->sh.i_type == SLICE_TYPE_P) ? 11 : 24;
+    x264_cabac_encode_decision( &h->cabac, ctx, b_skip );
 }
 
 static inline void x264_cabac_mb_sub_p_partition( x264_cabac_t *cb, int i_sub )
@@ -532,10 +526,8 @@ static inline void x264_cabac_mb_mvd_cpn( x264_t *h, x264_cabac_t *cb, int i_lis
         x264_cabac_encode_ue_bypass( cb, 3, i_abs - 9 );
 
     /* sign */
-    if( mvd > 0 )
-        x264_cabac_encode_bypass( cb, 0 );
-    else if( mvd < 0 )
-        x264_cabac_encode_bypass( cb, 1 );
+    if( mvd )
+        x264_cabac_encode_bypass( cb, mvd < 0 );
 }
 
 static inline void x264_cabac_mb_mvd( x264_t *h, x264_cabac_t *cb, int i_list, int idx, int width, int height )