diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-10-10 08:16:41 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-10-10 08:16:41 +0000 |
| commit | 0bc2e7f08108c558a937c6b86c39d37b57707370 (patch) | |
| tree | 6b3252c23a83659f6062511c200fe9137d257b3f | |
| parent | 8925915fccefe7389f374e87af8e132c4ecf6d16 (diff) | |
| download | ffmpeg-0bc2e7f08108c558a937c6b86c39d37b57707370.tar.gz | |
BRANCHLESS_CABAD --> BRANCHLESS_CABAC_DECODER
Originally committed as revision 6623 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/cabac.c | 2 | ||||
| -rw-r--r-- | libavcodec/cabac.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c index 01efcdb65c..f2744a39bb 100644 --- a/libavcodec/cabac.c +++ b/libavcodec/cabac.c @@ -133,7 +133,7 @@ void ff_init_cabac_states(CABACContext *c, uint8_t const (*lps_range)[4], c->mps_state[2*i+1]= 2*mps_state[i]+1; if( i ){ -#ifdef BRANCHLESS_CABAD +#ifdef BRANCHLESS_CABAC_DECODER c->mps_state[-2*i-1]= 2*lps_state[i]+0; //FIXME yes this is not valid C but iam lazy, cleanup welcome c->mps_state[-2*i-2]= 2*lps_state[i]+1; }else{ diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h index d1022a98f8..a677d0f87e 100644 --- a/libavcodec/cabac.h +++ b/libavcodec/cabac.h @@ -31,7 +31,7 @@ #define CABAC_BITS 16 #define CABAC_MASK ((1<<CABAC_BITS)-1) -#define BRANCHLESS_CABAD 1 +#define BRANCHLESS_CABAC_DECODER 1 typedef struct CABACContext{ int low; @@ -375,7 +375,7 @@ static int get_cabac(CABACContext *c, uint8_t * const state){ #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 +#ifndef BRANCHLESS_CABAC_DECODER asm volatile( "movzbl (%1), %%eax \n\t" "movl "RANGE "(%2), %%ebx \n\t" @@ -523,7 +523,7 @@ static int get_cabac(CABACContext *c, uint8_t * const state){ int bit, lps_mask attribute_unused; c->range -= RangeLPS; -#ifndef BRANCHLESS_CABAD +#ifndef BRANCHLESS_CABAC_DECODER if(c->low < c->range){ bit= s&1; *state= c->mps_state[s]; |