RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Michael Niedermayer 2006-10-09 21:14:16 +00:00
parent ef0090a998
commit 7822e1c1ff
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/cabac.c
View File

@ -125,26 +125,26 @@ void ff_init_cabac_states(CABACContext *c, uint8_t const (*lps_range)[4],
for(i=0; i<state_count; i++){
for(j=0; j<4; j++){ //FIXME check if this is worth the 1 shift we save
c->lps_range[2*i+2][j+4]=
c->lps_range[2*i+3][j+4]= lps_range[i][j];
c->lps_range[2*i+0][j+4]=
c->lps_range[2*i+1][j+4]= lps_range[i][j];
}
c->mps_state[2*i+2]= 2*mps_state[i]+2;
c->mps_state[2*i+3]= 2*mps_state[i]+3;
c->mps_state[2*i+0]= 2*mps_state[i]+0;
c->mps_state[2*i+1]= 2*mps_state[i]+1;
if( i ){
#ifdef BRANCHLESS_CABAD
c->mps_state[-2*i-3]= 2*lps_state[i]+2; //FIXME yes this is not valid C but iam lazy, cleanup welcome
c->mps_state[-2*i-4]= 2*lps_state[i]+3;
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{
c->mps_state[-2*i-3]= 3;
c->mps_state[-2*i-4]= 2;
c->mps_state[-2*i-1]= 1;
c->mps_state[-2*i-2]= 0;
#else
c->lps_state[2*i+2]= 2*lps_state[i]+2;
c->lps_state[2*i+3]= 2*lps_state[i]+3;
c->lps_state[2*i+0]= 2*lps_state[i]+0;
c->lps_state[2*i+1]= 2*lps_state[i]+1;
}else{
c->lps_state[2*i+2]= 3;
c->lps_state[2*i+3]= 2;
c->lps_state[2*i+0]= 1;
c->lps_state[2*i+1]= 0;
#endif
}
}

16
libavcodec/cabac.h
View File

@ -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"

4
libavcodec/h264.c
View File

@ -7401,9 +7401,9 @@ static int decode_slice(H264Context *h){
pre = clip( ((cabac_context_init_PB[h->cabac_init_idc][i][0] * s->qscale) >>4 ) + cabac_context_init_PB[h->cabac_init_idc][i][1], 1, 126 );
if( pre <= 63 )
h->cabac_state[i] = 2 * ( 63 - pre ) + 2;
h->cabac_state[i] = 2 * ( 63 - pre ) + 0;
else
h->cabac_state[i] = 2 * ( pre - 64 ) + 3;
h->cabac_state[i] = 2 * ( pre - 64 ) + 1;
}
for(;;){