diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-10-09 21:14:16 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-10-09 21:14:16 +0000 |
| commit | 7822e1c1ffaa054728075d5189345c8c3618daa1 (patch) | |
| tree | 039fe41c6e80cedf24280295e77a078d98327285 /libavcodec/cabac.h | |
| parent | ef0090a9989062416aa734abffe4658e09b254a8 (diff) | |
reverse remainder of the failed attempt to optimize *state=c->mps_state[s]
Originally committed as revision 6609 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/cabac.h')
| -rw-r--r-- | libavcodec/cabac.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h index 800d0d17bd..2fb439c1ec 100644 --- a/libavcodec/cabac.h +++ b/libavcodec/cabac.h @@ -40,9 +40,9 @@ typedef struct CABACContext{ #ifdef STRICT_LIMITS int symCount; #endif - uint8_t lps_range[2*66][4]; ///< rangeTabLPS - uint8_t lps_state[2*65]; ///< transIdxLPS - uint8_t mps_state[2*65]; ///< transIdxMPS + uint8_t lps_range[2*65][4]; ///< rangeTabLPS + uint8_t lps_state[2*64]; ///< transIdxLPS + uint8_t mps_state[2*64]; ///< transIdxMPS const uint8_t *bytestream_start; const uint8_t *bytestream; const uint8_t *bytestream_end; @@ -370,11 +370,11 @@ static int get_cabac(CABACContext *c, uint8_t * const state){ #define LOW "0" #define RANGE "4" #define LPS_RANGE "12" -#define LPS_STATE "12+2*66*4" -#define MPS_STATE "12+2*66*4+2*65" -#define BYTESTART "12+2*66*4+4*65" -#define BYTE "16+2*66*4+4*65" -#define BYTEEND "20+2*66*4+4*65" +#define LPS_STATE "12+2*65*4" +#define MPS_STATE "12+2*65*4+2*64" +#define BYTESTART "12+2*65*4+4*64" +#define BYTE "16+2*65*4+4*64" +#define BYTEEND "20+2*65*4+4*64" #ifndef BRANCHLESS_CABAD asm volatile( "movzbl (%1), %%eax \n\t" |