comparison vc1dec.c @ 12142:7e93f85e48bf libavcodec

vc1: Fix ordering of loop filter for I/B frames All horizontal edges must be filtered before all vertical edges

12141:c3682c0606e3

/** @} */ //Bitplane group

static void vc1_loop_filter_iblk(MpegEncContext *s, int pq)
{
    int i, j;
    if(!s->first_slice_line)
        s->dsp.vc1_v_loop_filter16(s->dest[0], s->linesize, pq);
    s->dsp.vc1_v_loop_filter16(s->dest[0] + 8*s->linesize, s->linesize, pq);
    for(i = !s->mb_x*8; i < 16; i += 8)
        s->dsp.vc1_h_loop_filter16(s->dest[0] + i, s->linesize, pq);
    for(j = 0; j < 2; j++){
        if(!s->first_slice_line)
            s->dsp.vc1_v_loop_filter8(s->dest[j+1], s->uvlinesize, pq);
        if(s->mb_x)
            s->dsp.vc1_h_loop_filter8(s->dest[j+1], s->uvlinesize, pq);
    }
}

/** Put block onto picture
 */

12142:7e93f85e48bf

/** @} */ //Bitplane group

static void vc1_loop_filter_iblk(MpegEncContext *s, int pq)
{
    int j;
    if (!s->first_slice_line) {
        s->dsp.vc1_v_loop_filter16(s->dest[0], s->linesize, pq);
        if (s->mb_x)
            s->dsp.vc1_h_loop_filter16(s->dest[0] - 16*s->linesize, s->linesize, pq);
        s->dsp.vc1_h_loop_filter16(s->dest[0] - 16*s->linesize+8, s->linesize, pq);
        for(j = 0; j < 2; j++){
            s->dsp.vc1_v_loop_filter8(s->dest[j+1], s->uvlinesize, pq);
            if (s->mb_x)
                s->dsp.vc1_h_loop_filter8(s->dest[j+1]-8*s->uvlinesize, s->uvlinesize, pq);
        }
    }
    s->dsp.vc1_v_loop_filter16(s->dest[0] + 8*s->linesize, s->linesize, pq);

    if (s->mb_y == s->mb_height-1) {
        if (s->mb_x) {
            s->dsp.vc1_h_loop_filter16(s->dest[0], s->linesize, pq);
            s->dsp.vc1_h_loop_filter8(s->dest[1], s->uvlinesize, pq);
            s->dsp.vc1_h_loop_filter8(s->dest[2], s->uvlinesize, pq);
        }
        s->dsp.vc1_h_loop_filter16(s->dest[0] + 8, s->linesize, pq);
    }
}

/** Put block onto picture
 */