comparison ffv1.c @ 2339:b7bb00973f99 libavcodec

switch ffv1 to the put/get_symbol() from snow

2338:37516ec97cd6

              +f->quant_table[3][(LL-L) & 0xFF] + f->quant_table[4][(TT-T) & 0xFF];
    }else
        return f->quant_table[0][(L-LT) & 0xFF] + f->quant_table[1][(LT-T) & 0xFF] + f->quant_table[2][(T-RT) & 0xFF];
}

/**
 * put 
 */
static inline void put_symbol(RangeCoder *c, uint8_t *state, int v, int is_signed, int max_exp){
    int i;

    if(v){
        const int a= ABS(v);
        const int e= av_log2(a);

        put_rac(c, state+0, 0);
        
        for(i=0; i<e; i++){
            put_rac(c, state+1+i, 1);  //1..8
        }

        if(e<max_exp){
            put_rac(c, state+1+i, 0);      //1..8

            for(i=e-1; i>=0; i--){
                put_rac(c, state+16+e+i, (a>>i)&1); //17..29
            }
            if(is_signed)
                put_rac(c, state+9 + e, v < 0); //9..16
        }
    }else{
        put_rac(c, state+0, 1);
    }
}

static inline int get_symbol(RangeCoder *c, uint8_t *state, int is_signed, int max_exp){
    if(get_rac(c, state+0))
        return 0;
    else{
        int i, e;
 
        for(e=0; e<max_exp; e++){ 
            int a= 1<<e;

            if(get_rac(c, state + 1 + e)==0){ // 1..8
                for(i=e-1; i>=0; i--){
                    a += get_rac(c, state+16+e+i)<<i; //17..29
                }

                if(is_signed && get_rac(c, state+9 + e)) //9..16
                    return -a;
                else
                    return a;
            }
        }
        return -(1<<e);
    }
}

static inline void update_vlc_state(VlcState * const state, const int v){
    int drift= state->drift;

        }

        diff= fold(diff, bits);
        
        if(s->ac){
            put_symbol(c, p->state[context], diff, 1, bits-1);
        }else{
            if(context == 0) run_mode=1;
            
            if(run_mode){

    uint8_t state[CONTEXT_SIZE];
    memset(state, 128, sizeof(state));

    for(i=1; i<128 ; i++){
        if(quant_table[i] != quant_table[i-1]){
            put_symbol(c, state, i-last-1, 0, 7);
            last= i;
        }
    }
    put_symbol(c, state, i-last-1, 0, 7);
}

static void write_header(FFV1Context *f){
    uint8_t state[CONTEXT_SIZE];
    int i;
    RangeCoder * const c= &f->c;

    memset(state, 128, sizeof(state));
    
    put_symbol(c, state, f->version, 0, 7);
    put_symbol(c, state, f->avctx->coder_type, 0, 7);
    put_symbol(c, state, f->colorspace, 0, 7); //YUV cs type 
    put_rac(c, state, 1); //chroma planes
        put_symbol(c, state, f->chroma_h_shift, 0, 7);
        put_symbol(c, state, f->chroma_v_shift, 0, 7);
    put_rac(c, state, 0); //no transparency plane

    for(i=0; i<5; i++)
        write_quant_table(c, f->quant_table[i]);
}

        p->interlace_bit_state[1]= 128;
        
        for(j=0; j<p->context_count; j++){
            if(f->ac){
                memset(p->state[j], 128, sizeof(uint8_t)*CONTEXT_SIZE);
                p->state[j][7] = 256-8;
            }else{
                p->vlc_state[j].drift= 0;
                p->vlc_state[j].error_sum= 4; //FFMAX((RANGE + 32)/64, 2);
                p->vlc_state[j].bias= 0;
                p->vlc_state[j].count= 1;

            sign=1;
        }else
            sign=0;
        

        if(s->ac)
            diff= get_symbol(c, p->state[context], 1, bits-1);
        else{
            if(context == 0 && run_mode==0) run_mode=1;
            
            if(run_mode){
                if(run_count==0 && run_mode==1){
                    if(get_bits1(&s->gb)){

    uint8_t state[CONTEXT_SIZE];

    memset(state, 128, sizeof(state));

    for(v=0; i<128 ; v++){
        int len= get_symbol(c, state, 0, 7) + 1;

        if(len + i > 128) return -1;
        
        while(len--){
            quant_table[i] = scale*v;

    int i, context_count;
    RangeCoder * const c= &f->c;
    
    memset(state, 128, sizeof(state));

    f->version= get_symbol(c, state, 0, 7);
    f->ac= f->avctx->coder_type= get_symbol(c, state, 0, 7);
    f->colorspace= get_symbol(c, state, 0, 7); //YUV cs type
    get_rac(c, state); //no chroma = false
    f->chroma_h_shift= get_symbol(c, state, 0, 7);
    f->chroma_v_shift= get_symbol(c, state, 0, 7);
    get_rac(c, state); //transparency plane
    f->plane_count= 2;

    if(f->colorspace==0){
        switch(16*f->chroma_h_shift + f->chroma_v_shift){

2339:b7bb00973f99

              +f->quant_table[3][(LL-L) & 0xFF] + f->quant_table[4][(TT-T) & 0xFF];
    }else
        return f->quant_table[0][(L-LT) & 0xFF] + f->quant_table[1][(LT-T) & 0xFF] + f->quant_table[2][(T-RT) & 0xFF];
}

static inline void put_symbol(RangeCoder *c, uint8_t *state, int v, int is_signed){
    int i;

    if(v){
        const int a= ABS(v);
        const int e= av_log2(a);
        put_rac(c, state+0, 0);
        
        assert(e<=9);

        for(i=0; i<e; i++){
            put_rac(c, state+1+i, 1);  //1..10
        }
        put_rac(c, state+1+i, 0);

        for(i=e-1; i>=0; i--){
            put_rac(c, state+22+i, (a>>i)&1); //22..31
        }

        if(is_signed)
            put_rac(c, state+11 + e, v < 0); //11..21
    }else{
        put_rac(c, state+0, 1);
    }
}

static inline int get_symbol(RangeCoder *c, uint8_t *state, int is_signed){
    if(get_rac(c, state+0))
        return 0;
    else{
        int i, e, a;
        e= 0;
        while(get_rac(c, state+1 + e)){ //1..10
            e++;
        }
        assert(e<=9);

        a= 1;
        for(i=e-1; i>=0; i--){
            a += a + get_rac(c, state+22 + i); //22..31
        }

        if(is_signed && get_rac(c, state+11 + e)) //11..21
            return -a;
        else
            return a;
    }
}

static inline void update_vlc_state(VlcState * const state, const int v){
    int drift= state->drift;

        }

        diff= fold(diff, bits);
        
        if(s->ac){
            put_symbol(c, p->state[context], diff, 1);
        }else{
            if(context == 0) run_mode=1;
            
            if(run_mode){

    uint8_t state[CONTEXT_SIZE];
    memset(state, 128, sizeof(state));

    for(i=1; i<128 ; i++){
        if(quant_table[i] != quant_table[i-1]){
            put_symbol(c, state, i-last-1, 0);
            last= i;
        }
    }
    put_symbol(c, state, i-last-1, 0);
}

static void write_header(FFV1Context *f){
    uint8_t state[CONTEXT_SIZE];
    int i;
    RangeCoder * const c= &f->c;

    memset(state, 128, sizeof(state));
    
    put_symbol(c, state, f->version, 0);
    put_symbol(c, state, f->avctx->coder_type, 0);
    put_symbol(c, state, f->colorspace, 0); //YUV cs type 
    put_rac(c, state, 1); //chroma planes
        put_symbol(c, state, f->chroma_h_shift, 0);
        put_symbol(c, state, f->chroma_v_shift, 0);
    put_rac(c, state, 0); //no transparency plane

    for(i=0; i<5; i++)
        write_quant_table(c, f->quant_table[i]);
}

        p->interlace_bit_state[1]= 128;
        
        for(j=0; j<p->context_count; j++){
            if(f->ac){
                memset(p->state[j], 128, sizeof(uint8_t)*CONTEXT_SIZE);
            }else{
                p->vlc_state[j].drift= 0;
                p->vlc_state[j].error_sum= 4; //FFMAX((RANGE + 32)/64, 2);
                p->vlc_state[j].bias= 0;
                p->vlc_state[j].count= 1;

            sign=1;
        }else
            sign=0;
        

        if(s->ac){
            diff= get_symbol(c, p->state[context], 1);
        }else{
            if(context == 0 && run_mode==0) run_mode=1;
            
            if(run_mode){
                if(run_count==0 && run_mode==1){
                    if(get_bits1(&s->gb)){

    uint8_t state[CONTEXT_SIZE];

    memset(state, 128, sizeof(state));

    for(v=0; i<128 ; v++){
        int len= get_symbol(c, state, 0) + 1;

        if(len + i > 128) return -1;
        
        while(len--){
            quant_table[i] = scale*v;

    int i, context_count;
    RangeCoder * const c= &f->c;
    
    memset(state, 128, sizeof(state));

    f->version= get_symbol(c, state, 0);
    f->ac= f->avctx->coder_type= get_symbol(c, state, 0);
    f->colorspace= get_symbol(c, state, 0); //YUV cs type
    get_rac(c, state); //no chroma = false
    f->chroma_h_shift= get_symbol(c, state, 0);
    f->chroma_v_shift= get_symbol(c, state, 0);
    get_rac(c, state); //transparency plane
    f->plane_count= 2;

    if(f->colorspace==0){
        switch(16*f->chroma_h_shift + f->chroma_v_shift){