comparison rv34.c @ 8369:45c3780b1a96 libavcodec

Merge deblocking pattern with CBP for RV30/40 loop filtering

8368:a7c85cdc11b5

    s->qscale = r->si.quant;
    cbp = cbp2 = rv34_decode_mb_header(r, intra_types);
    r->cbp_luma  [s->mb_x + s->mb_y * s->mb_stride] = cbp;
    r->cbp_chroma[s->mb_x + s->mb_y * s->mb_stride] = cbp >> 16;
    if(s->pict_type == FF_I_TYPE)
        r->deblock_coefs[mb_pos] = 0;
    else
        r->deblock_coefs[mb_pos] = rv34_set_deblock_coef(r);
    s->current_picture_ptr->qscale_table[s->mb_x + s->mb_y * s->mb_stride] = s->qscale;

    if(cbp == -1)
        return -1;

8369:45c3780b1a96

    s->qscale = r->si.quant;
    cbp = cbp2 = rv34_decode_mb_header(r, intra_types);
    r->cbp_luma  [s->mb_x + s->mb_y * s->mb_stride] = cbp;
    r->cbp_chroma[s->mb_x + s->mb_y * s->mb_stride] = cbp >> 16;
    if(s->pict_type == FF_I_TYPE)
        r->deblock_coefs[mb_pos] = 0xFFFF;
    else
        r->deblock_coefs[mb_pos] = rv34_set_deblock_coef(r) | r->cbp_luma[mb_pos];
    s->current_picture_ptr->qscale_table[s->mb_x + s->mb_y * s->mb_stride] = s->qscale;

    if(cbp == -1)
        return -1;