comparison cabac.c @ 3993:8b7c59b7af01 libavcodec

make state transition tables global as they are constant and the code is slightly faster that way

3992:a09b5b667229

{  8,  9, 11, 13}, {  7,  9, 11, 12}, {  7,  9, 10, 12}, {  7,  8, 10, 11},
{  6,  8,  9, 11}, {  6,  7,  9, 10}, {  6,  7,  8,  9}, {  2,  2,  2,  2},
};

uint8_t ff_h264_lps_range[2*65][4];

const uint8_t ff_h264_mps_state[64]= {
  1, 2, 3, 4, 5, 6, 7, 8,
  9,10,11,12,13,14,15,16,
 17,18,19,20,21,22,23,24,
 25,26,27,28,29,30,31,32,
 33,34,35,36,37,38,39,40,
 41,42,43,44,45,46,47,48,
 49,50,51,52,53,54,55,56,
 57,58,59,60,61,62,62,63,
};

const uint8_t ff_h264_lps_state[64]= {
  0, 0, 1, 2, 2, 4, 4, 5,
  6, 7, 8, 9, 9,11,11,12,
 13,13,15,15,16,16,18,18,
 19,19,21,21,22,22,23,24,
 24,25,26,26,27,27,28,29,

#endif
    c->low+= ((*c->bytestream++)<<2) + 2;
    c->range= 0x1FE<<(CABAC_BITS + 1);
}

void ff_init_cabac_states(CABACContext *c,
                          uint8_t const *mps_state, uint8_t const *lps_state, int state_count){
    int i, j;

    for(i=0; i<state_count; i++){
        for(j=0; j<4; j++){ //FIXME check if this is worth the 1 shift we save
            ff_h264_lps_range[2*i+0][j+4]=
            ff_h264_lps_range[2*i+1][j+4]= lps_range[i][j];
        }

        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_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{
            c->mps_state[-2*i-1]= 1;
            c->mps_state[-2*i-2]= 0;
#else
            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+0]= 1;
            c->lps_state[2*i+1]= 0;
#endif
        }
    }
}

3993:8b7c59b7af01

{  8,  9, 11, 13}, {  7,  9, 11, 12}, {  7,  9, 10, 12}, {  7,  8, 10, 11},
{  6,  8,  9, 11}, {  6,  7,  9, 10}, {  6,  7,  8,  9}, {  2,  2,  2,  2},
};

uint8_t ff_h264_lps_range[2*65][4];
uint8_t ff_h264_lps_state[2*64];
uint8_t ff_h264_mps_state[2*64];

static const uint8_t mps_state[64]= {
  1, 2, 3, 4, 5, 6, 7, 8,
  9,10,11,12,13,14,15,16,
 17,18,19,20,21,22,23,24,
 25,26,27,28,29,30,31,32,
 33,34,35,36,37,38,39,40,
 41,42,43,44,45,46,47,48,
 49,50,51,52,53,54,55,56,
 57,58,59,60,61,62,62,63,
};

static const uint8_t lps_state[64]= {
  0, 0, 1, 2, 2, 4, 4, 5,
  6, 7, 8, 9, 9,11,11,12,
 13,13,15,15,16,16,18,18,
 19,19,21,21,22,22,23,24,
 24,25,26,26,27,27,28,29,

#endif
    c->low+= ((*c->bytestream++)<<2) + 2;
    c->range= 0x1FE<<(CABAC_BITS + 1);
}

void ff_init_cabac_states(CABACContext *c){
    int i, j;

    for(i=0; i<64; i++){
        for(j=0; j<4; j++){ //FIXME check if this is worth the 1 shift we save
            ff_h264_lps_range[2*i+0][j+4]=
            ff_h264_lps_range[2*i+1][j+4]= lps_range[i][j];
        }

        ff_h264_mps_state[2*i+0]= 2*mps_state[i]+0;
        ff_h264_mps_state[2*i+1]= 2*mps_state[i]+1;

        if( i ){
#ifdef BRANCHLESS_CABAC_DECODER
            ff_h264_mps_state[-2*i-1]= 2*lps_state[i]+0; //FIXME yes this is not valid C but iam lazy, cleanup welcome
            ff_h264_mps_state[-2*i-2]= 2*lps_state[i]+1;
        }else{
            ff_h264_mps_state[-2*i-1]= 1;
            ff_h264_mps_state[-2*i-2]= 0;
#else
            ff_h264_lps_state[2*i+0]= 2*lps_state[i]+0;
            ff_h264_lps_state[2*i+1]= 2*lps_state[i]+1;
        }else{
            ff_h264_lps_state[2*i+0]= 1;
            ff_h264_lps_state[2*i+1]= 0;
#endif
        }
    }
}