faster cabac_encode_ue_bypass

[x264] / common / cabac.h

diff --git a/common/cabac.h b/common/cabac.h
index 3bc0f94d3fd56401b1d949ffd0cc15cdf6bb360e..709c516e742b09d1ad62473fc94fecabe996f974 100644 (file)
--- a/common/cabac.h
+++ b/common/cabac.h
@@ -26,59 +26,63 @@
 
 typedef struct
 {
-    /* model */
-    struct
-    {
-        int i_model;
-        int i_cost;
-    } slice[3];
-
     /* context */
-    /* states 436-459 are for interlacing, so are omitted for now */
-    struct
-    {
-        int i_state;
-        int i_mps;
-        int i_count;
-    } ctxstate[436];
+    DECLARE_ALIGNED_16( uint8_t state[460] );
+
+    int f8_bits_encoded; // only if using x264_cabac_size_decision()
 
     /* state */
     int i_low;
     int i_range;
 
     /* bit stream */
-    int b_first_bit;
-    int i_bits_outstanding;
-    int f8_bits_encoded; // only if using x264_cabac_size_decision()
-    bs_t *s;
+    int i_queue;
+    int i_bytes_outstanding;
+
+    uint8_t *p_start;
+    uint8_t *p;
+    uint8_t *p_end;
 
 } x264_cabac_t;
 
-/* encoder/decoder: init the contexts given i_slice_type, the quantif and the model */
-void x264_cabac_context_init( x264_cabac_t *cb, int i_slice_type, int i_qp, int i_model );
+extern const uint8_t x264_cabac_transition[128][2];
+extern const uint16_t x264_cabac_entropy[128][2];
 
-/* decoder only: */
-void x264_cabac_decode_init    ( x264_cabac_t *cb, bs_t *s );
-int  x264_cabac_decode_decision( x264_cabac_t *cb, int i_ctx_idx );
-int  x264_cabac_decode_bypass  ( x264_cabac_t *cb );
-int  x264_cabac_decode_terminal( x264_cabac_t *cb );
+/* init the contexts given i_slice_type, the quantif and the model */
+void x264_cabac_context_init( x264_cabac_t *cb, int i_slice_type, int i_qp, int i_model );
 
-/* encoder only: adaptive model init */
-void x264_cabac_model_init( x264_cabac_t *cb );
-int  x264_cabac_model_get ( x264_cabac_t *cb, int i_slice_type );
-void x264_cabac_model_update( x264_cabac_t *cb, int i_slice_type, int i_qp );
 /* encoder only: */
-void x264_cabac_encode_init ( x264_cabac_t *cb, bs_t *s );
-void x264_cabac_encode_decision( x264_cabac_t *cb, int i_ctx_idx, int b );
+void x264_cabac_encode_init ( x264_cabac_t *cb, uint8_t *p_data, uint8_t *p_end );
+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 );
-void x264_cabac_encode_terminal( x264_cabac_t *cb, int b );
-void x264_cabac_encode_flush( x264_cabac_t *cb );
-/* don't write the bitstream, just calculate cost: */
-void x264_cabac_size_decision( x264_cabac_t *cb, int i_ctx, int b );
+void x264_cabac_encode_ue_bypass( x264_cabac_t *cb, int exp_bits, int val );
+void x264_cabac_encode_terminal( x264_cabac_t *cb );
+void x264_cabac_encode_flush( x264_t *h, x264_cabac_t *cb );
 
 static inline int x264_cabac_pos( x264_cabac_t *cb )
 {
-    return bs_pos( cb->s ) + cb->i_bits_outstanding;
+    return (cb->p - cb->p_start + cb->i_bytes_outstanding) * 8 + cb->i_queue;
+}
+
+/* internal only. these don't write the bitstream, just calculate bit cost: */
+
+static inline void x264_cabac_size_decision( x264_cabac_t *cb, long i_ctx, long b )
+{
+    int i_state = cb->state[i_ctx];
+    cb->state[i_ctx] = x264_cabac_transition[i_state][b];
+    cb->f8_bits_encoded += x264_cabac_entropy[i_state][b];
+}
+
+static inline int x264_cabac_size_decision2( uint8_t *state, long b )
+{
+    int i_state = *state;
+    *state = x264_cabac_transition[i_state][b];
+    return x264_cabac_entropy[i_state][b];
+}
+
+static inline int x264_cabac_size_decision_noup( uint8_t *state, long b )
+{
+    return x264_cabac_entropy[*state][b];
 }
 
 #endif