comparison cabac.c @ 3976:27e90123b346 libavcodec

reverse remainder of the failed attempt to optimize *state=c->mps_state[s]

3975:6cc9eb5ee5e3

                          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
            c->lps_range[2*i+2][j+4]=
            c->lps_range[2*i+3][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;

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

3976:27e90123b346

                          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
            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+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-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
        }
    }
}