int i_range;
/* bit stream */
- int i_queue;
+ int i_queue; //stored with an offset of -8 for faster asm
int i_bytes_outstanding;
uint8_t *p_start;
uint8_t *p_end;
/* aligned for memcpy_aligned starting here */
- DECLARE_ALIGNED_16( int f8_bits_encoded ); // only if using x264_cabac_size_decision()
-
+ ALIGNED_16( int f8_bits_encoded ); // only if using x264_cabac_size_decision()
+
/* context */
uint8_t state[460];
} x264_cabac_t;
extern const uint8_t x264_cabac_transition[128][2];
-extern const uint16_t x264_cabac_entropy[128][2];
+extern const uint16_t x264_cabac_entropy[128];
/* 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: */
+void x264_cabac_encode_init_core( x264_cabac_t *cb );
void x264_cabac_encode_init ( x264_cabac_t *cb, uint8_t *p_data, uint8_t *p_end );
void x264_cabac_encode_decision_c( x264_cabac_t *cb, int i_ctx, int b );
void x264_cabac_encode_decision_asm( x264_cabac_t *cb, int i_ctx, int b );
-void x264_cabac_encode_bypass( x264_cabac_t *cb, int b );
+void x264_cabac_encode_bypass_c( x264_cabac_t *cb, int b );
+void x264_cabac_encode_bypass_asm( x264_cabac_t *cb, int b );
+void x264_cabac_encode_terminal_c( x264_cabac_t *cb );
+void x264_cabac_encode_terminal_asm( x264_cabac_t *cb );
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 );
#ifdef HAVE_MMX
#define x264_cabac_encode_decision x264_cabac_encode_decision_asm
+#define x264_cabac_encode_bypass x264_cabac_encode_bypass_asm
+#define x264_cabac_encode_terminal x264_cabac_encode_terminal_asm
#else
#define x264_cabac_encode_decision x264_cabac_encode_decision_c
+#define x264_cabac_encode_bypass x264_cabac_encode_bypass_c
+#define x264_cabac_encode_terminal x264_cabac_encode_terminal_c
#endif
+#define x264_cabac_encode_decision_noup x264_cabac_encode_decision
-static inline int x264_cabac_pos( x264_cabac_t *cb )
+static ALWAYS_INLINE int x264_cabac_pos( x264_cabac_t *cb )
{
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 )
+static ALWAYS_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];
+ cb->f8_bits_encoded += x264_cabac_entropy[i_state^b];
}
-static inline int x264_cabac_size_decision2( uint8_t *state, long b )
+static ALWAYS_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];
+ return x264_cabac_entropy[i_state^b];
+}
+
+static ALWAYS_INLINE void x264_cabac_size_decision_noup( x264_cabac_t *cb, long i_ctx, long b )
+{
+ int i_state = cb->state[i_ctx];
+ cb->f8_bits_encoded += x264_cabac_entropy[i_state^b];
}
-static inline int x264_cabac_size_decision_noup( uint8_t *state, long b )
+static ALWAYS_INLINE int x264_cabac_size_decision_noup2( uint8_t *state, long b )
{
- return x264_cabac_entropy[*state][b];
+ return x264_cabac_entropy[*state^b];
}
#endif