comparison ffv1.c @ 1337:c4e6ed5319e7 libavcodec

cleanup / cosmetics

1336:c16ac5b7ac79

static void encode_plane(FFV1Context *s, uint8_t *src, int w, int h, int stride, int plane_index){
    PlaneContext * const p= &s->plane[plane_index];
    CABACContext * const c= &s->c;
    int x,y;
    uint8_t pred_diff_buffer[4][w+6]; //FIXME rema,e
    uint8_t *pred_diff[4]= {pred_diff_buffer[0]+3, pred_diff_buffer[1]+3, pred_diff_buffer[2]+3, pred_diff_buffer[3]+3};
    int run_index=0;
    
    memset(pred_diff_buffer, 0, sizeof(pred_diff_buffer));
    
    for(y=0; y<h; y++){
        uint8_t *temp= pred_diff[0]; //FIXME try a normal buffer
        int run_count=0;
        int run_mode=0;

        pred_diff[0]= pred_diff[1];
        pred_diff[1]= pred_diff[2];
        pred_diff[2]= pred_diff[3];
        pred_diff[3]= temp;
        
        pred_diff[3][-1]= pred_diff[2][0  ];
        pred_diff[2][ w]= pred_diff[2][w-1];

        for(x=0; x<w; x++){
            uint8_t *temp_src= src + x + stride*y;
            int diff, context;
            
            context= get_context(s, pred_diff[3]+x, pred_diff[2]+x, pred_diff[1]+x);
            diff= temp_src[0] - predict(pred_diff[3]+x, pred_diff[2]+x);

            if(context < 0){
                context = -context;
                diff= -diff;
            }

                if(run_mode == 0)
                    put_vlc_symbol(&s->pb, &p->vlc_state[context], diff);
            }

            pred_diff[3][x]= temp_src[0];
        }
        if(run_mode){
            while(run_count >= 1<<log2_run[run_index]){
                run_count -= 1<<log2_run[run_index];
                run_index++;

static void decode_plane(FFV1Context *s, uint8_t *src, int w, int h, int stride, int plane_index){
    PlaneContext * const p= &s->plane[plane_index];
    CABACContext * const c= &s->c;
    int x,y;
    uint8_t pred_diff_buffer[4][w+6];
    uint8_t *pred_diff[4]= {pred_diff_buffer[0]+3, pred_diff_buffer[1]+3, pred_diff_buffer[2]+3, pred_diff_buffer[3]+3};
    int run_index=0;
    
    memset(pred_diff_buffer, 0, sizeof(pred_diff_buffer));
    
    for(y=0; y<h; y++){
        uint8_t *temp= pred_diff[0]; //FIXME try a normal buffer
        int run_count=0;
        int run_mode=0;

        pred_diff[0]= pred_diff[1];
        pred_diff[1]= pred_diff[2];
        pred_diff[2]= pred_diff[3];
        pred_diff[3]= temp;

        pred_diff[3][-1]= pred_diff[2][0  ];
        pred_diff[2][ w]= pred_diff[2][w-1];

        for(x=0; x<w; x++){
            uint8_t *temp_src= src + x + stride*y;
            int diff, context, sign;
             
            context= get_context(s, pred_diff[3] + x, pred_diff[2] + x, pred_diff[1] + x);
            if(context < 0){
                context= -context;
                sign=1;
            }else
                sign=0;

//                printf("count:%d index:%d, mode:%d, x:%d y:%d pos:%d\n", run_count, run_index, run_mode, x, y, get_bits_count(&s->gb));
            }

            if(sign) diff= (int8_t)(-diff); //FIXME remove cast

            pred_diff[3][x]=
            temp_src[0] = predict(pred_diff[3] + x, pred_diff[2] + x) + diff;
            
            assert(diff>= -128 && diff <= 127);
        }
    }
}

1337:c4e6ed5319e7

static void encode_plane(FFV1Context *s, uint8_t *src, int w, int h, int stride, int plane_index){
    PlaneContext * const p= &s->plane[plane_index];
    CABACContext * const c= &s->c;
    int x,y;
    uint8_t sample_buffer[2][w+6];
    uint8_t *sample[2]= {sample_buffer[0]+3, sample_buffer[1]+3};
    int run_index=0;
    
    memset(sample_buffer, 0, sizeof(sample_buffer));
    
    for(y=0; y<h; y++){
        uint8_t *temp= sample[0]; //FIXME try a normal buffer
        int run_count=0;
        int run_mode=0;

        sample[0]= sample[1];
        sample[1]= temp;
        
        sample[1][-1]= sample[0][0  ];
        sample[0][ w]= sample[0][w-1];

        for(x=0; x<w; x++){
            uint8_t *temp_src= src + x + stride*y;
            int diff, context;
            
            context= get_context(s, sample[1]+x, sample[0]+x, sample[1]+x);
            diff= temp_src[0] - predict(sample[1]+x, sample[0]+x);

            if(context < 0){
                context = -context;
                diff= -diff;
            }

                if(run_mode == 0)
                    put_vlc_symbol(&s->pb, &p->vlc_state[context], diff);
            }

            sample[1][x]= temp_src[0];
        }
        if(run_mode){
            while(run_count >= 1<<log2_run[run_index]){
                run_count -= 1<<log2_run[run_index];
                run_index++;

static void decode_plane(FFV1Context *s, uint8_t *src, int w, int h, int stride, int plane_index){
    PlaneContext * const p= &s->plane[plane_index];
    CABACContext * const c= &s->c;
    int x,y;
    uint8_t sample_buffer[2][w+6];
    uint8_t *sample[2]= {sample_buffer[0]+3, sample_buffer[1]+3};
    int run_index=0;
    
    memset(sample_buffer, 0, sizeof(sample_buffer));
    
    for(y=0; y<h; y++){
        uint8_t *temp= sample[0]; //FIXME try a normal buffer
        int run_count=0;
        int run_mode=0;

        sample[0]= sample[1];
        sample[1]= temp;

        sample[1][-1]= sample[0][0  ];
        sample[0][ w]= sample[0][w-1];

        for(x=0; x<w; x++){
            uint8_t *temp_src= src + x + stride*y;
            int diff, context, sign;
             
            context= get_context(s, sample[1] + x, sample[0] + x, sample[1] + x);
            if(context < 0){
                context= -context;
                sign=1;
            }else
                sign=0;

//                printf("count:%d index:%d, mode:%d, x:%d y:%d pos:%d\n", run_count, run_index, run_mode, x, y, get_bits_count(&s->gb));
            }

            if(sign) diff= (int8_t)(-diff); //FIXME remove cast

            sample[1][x]=
            temp_src[0] = predict(sample[1] + x, sample[0] + x) + diff;
            
            assert(diff>= -128 && diff <= 127);
        }
    }
}