comparison ffv1.c @ 1345:daf951f32697 libavcodec

merge U and V statistics, 33% reduction in memory requirement, compression rate better for some files worse for others, worst compression rate loss 0.05%

1344:447b88b784ee

    common_init(avctx);
 
    s->version=0;
    s->ac= avctx->coder_type;
    
    s->plane_count=3;
    for(i=0; i<256; i++){
        s->quant_table[0][i]=           quant11[i];
        s->quant_table[1][i]=        11*quant11[i];
        if(avctx->context_model==0){
            s->quant_table[2][i]=     11*11*quant11[i];

        const int chroma_height= -((-height)>>f->chroma_v_shift);

        encode_plane(f, p->data[0], width, height, p->linesize[0], 0);

        encode_plane(f, p->data[1], chroma_width, chroma_height, p->linesize[1], 1);
        encode_plane(f, p->data[2], chroma_width, chroma_height, p->linesize[2], 2);
    }
    emms_c();
    
    f->picture_number++;

    get_symbol(c, state, 0, 7); //YUV cs type
    get_cabac(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_cabac(c, state); //transparency plane
    f->plane_count= 3;

    switch(16*f->chroma_h_shift + f->chroma_v_shift){
    case 0x00: f->avctx->pix_fmt= PIX_FMT_YUV444P; break;
    case 0x10: f->avctx->pix_fmt= PIX_FMT_YUV422P; break;
    case 0x11: f->avctx->pix_fmt= PIX_FMT_YUV420P; break;

        const int chroma_width = -((-width )>>f->chroma_h_shift);
        const int chroma_height= -((-height)>>f->chroma_v_shift);
        decode_plane(f, p->data[0], width, height, p->linesize[0], 0);
        
        decode_plane(f, p->data[1], chroma_width, chroma_height, p->linesize[1], 1);
        decode_plane(f, p->data[2], chroma_width, chroma_height, p->linesize[2], 2);
    }
        
    emms_c();

    f->picture_number++;

1345:daf951f32697

    common_init(avctx);
 
    s->version=0;
    s->ac= avctx->coder_type;
    
    s->plane_count=2;
    for(i=0; i<256; i++){
        s->quant_table[0][i]=           quant11[i];
        s->quant_table[1][i]=        11*quant11[i];
        if(avctx->context_model==0){
            s->quant_table[2][i]=     11*11*quant11[i];

        const int chroma_height= -((-height)>>f->chroma_v_shift);

        encode_plane(f, p->data[0], width, height, p->linesize[0], 0);

        encode_plane(f, p->data[1], chroma_width, chroma_height, p->linesize[1], 1);
        encode_plane(f, p->data[2], chroma_width, chroma_height, p->linesize[2], 1);
    }
    emms_c();
    
    f->picture_number++;

    get_symbol(c, state, 0, 7); //YUV cs type
    get_cabac(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_cabac(c, state); //transparency plane
    f->plane_count= 2;

    switch(16*f->chroma_h_shift + f->chroma_v_shift){
    case 0x00: f->avctx->pix_fmt= PIX_FMT_YUV444P; break;
    case 0x10: f->avctx->pix_fmt= PIX_FMT_YUV422P; break;
    case 0x11: f->avctx->pix_fmt= PIX_FMT_YUV420P; break;

        const int chroma_width = -((-width )>>f->chroma_h_shift);
        const int chroma_height= -((-height)>>f->chroma_v_shift);
        decode_plane(f, p->data[0], width, height, p->linesize[0], 0);
        
        decode_plane(f, p->data[1], chroma_width, chroma_height, p->linesize[1], 1);
        decode_plane(f, p->data[2], chroma_width, chroma_height, p->linesize[2], 1);
    }
        
    emms_c();

    f->picture_number++;