comparison ffv1.c @ 1361:8479b875a989 libavcodec

golomb rice code cleanup / simplify (~0.5% compression gain and slightly faster) jpegls style golomb rice coder

1360:047b1dff5976

    k=0;
    while(i < state->error_sum){ //FIXME optimize
        k++;
        i += i;
    }
#if 0 // JPEG LS
    if(k==0 && 2*state->drift <= - state->count) code= v ^ (-1);
    else                                         code= v;
#else
     code= v ^ ((2*state->drift + state->count)>>31);
#endif
    
    code = -2*code-1;
    code^= (code>>31);
//printf("v:%d/%d bias:%d error:%d drift:%d count:%d k:%d\n", v, code, state->bias, state->error_sum, state->drift, state->count, k);
    set_ur_golomb(pb, code, k, 8, 8);

    update_vlc_state(state, v);
}

static inline int get_vlc_symbol(GetBitContext *gb, VlcState * const state){

    k=0;
    while(i < state->error_sum){ //FIXME optimize
        k++;
        i += i;
    }
    
    v= get_ur_golomb(gb, k, 8, 8);
//printf("v:%d bias:%d error:%d drift:%d count:%d k:%d", v, state->bias, state->error_sum, state->drift, state->count, k);
    
    v++;
    if(v&1) v=  (v>>1);
    else    v= -(v>>1);

#if 0 // JPEG LS

1361:8479b875a989

    k=0;
    while(i < state->error_sum){ //FIXME optimize
        k++;
        i += i;
    }

    assert(k<=8);

#if 0 // JPEG LS
    if(k==0 && 2*state->drift <= - state->count) code= v ^ (-1);
    else                                         code= v;
#else
     code= v ^ ((2*state->drift + state->count)>>31);
#endif
    
    code = -2*code-1;
    code^= (code>>31);
//printf("v:%d/%d bias:%d error:%d drift:%d count:%d k:%d\n", v, code, state->bias, state->error_sum, state->drift, state->count, k);
    set_ur_golomb(pb, code, k, 12, 8);

    update_vlc_state(state, v);
}

static inline int get_vlc_symbol(GetBitContext *gb, VlcState * const state){

    k=0;
    while(i < state->error_sum){ //FIXME optimize
        k++;
        i += i;
    }

    assert(k<=8);

    v= get_ur_golomb(gb, k, 12, 8);
//printf("v:%d bias:%d error:%d drift:%d count:%d k:%d", v, state->bias, state->error_sum, state->drift, state->count, k);

    v++;
    if(v&1) v=  (v>>1);
    else    v= -(v>>1);

#if 0 // JPEG LS