generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BRANCHLESS_CABAD --> BRANCHLESS_CABAC_DECODER

Browse Source 
Originally committed as revision 6623 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2006-10-10 08:16:41 +00:00
parent 8925915fcc
commit 0bc2e7f081
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/cabac.c
View File

@ -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; c->mps_state[2*i+1]= 2*mps_state[i]+1;
if( i ){ 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-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; c->mps_state[-2*i-2]= 2*lps_state[i]+1;
}else{ }else{

6
libavcodec/cabac.h
View File

@ -31,7 +31,7 @@
#define CABAC_BITS 16 #define CABAC_BITS 16
#define CABAC_MASK ((1<<CABAC_BITS)-1) #define CABAC_MASK ((1<<CABAC_BITS)-1)
#define BRANCHLESS_CABAD 1 #define BRANCHLESS_CABAC_DECODER 1
typedef struct CABACContext{ typedef struct CABACContext{
int low; 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 BYTESTART "12+2*65*4+4*64"
#define BYTE "16+2*65*4+4*64" #define BYTE "16+2*65*4+4*64"
#define BYTEEND "20+2*65*4+4*64" #define BYTEEND "20+2*65*4+4*64"
#ifndef BRANCHLESS_CABAD #ifndef BRANCHLESS_CABAC_DECODER
asm volatile( asm volatile(
"movzbl (%1), %%eax \n\t" "movzbl (%1), %%eax \n\t"
"movl "RANGE "(%2), %%ebx \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; int bit, lps_mask attribute_unused;
c->range -= RangeLPS; c->range -= RangeLPS;
#ifndef BRANCHLESS_CABAD #ifndef BRANCHLESS_CABAC_DECODER
if(c->low < c->range){ if(c->low < c->range){
bit= s&1; bit= s&1;
*state= c->mps_state[s]; *state= c->mps_state[s];