comparison vc1.c @ 3371:a922021d6455 libavcodec

Slightly reworked MC code, it gives better picture.

3370:ad7215e207f8

    srcY = s->last_picture.data[0];
    srcU = s->last_picture.data[1];
    srcV = s->last_picture.data[2];

    if(v->fastuvmc) { // XXX: 8.3.5.4.5 specifies something different
        uvmx = (uvmx + 1) >> 1;
        uvmy = (uvmy + 1) >> 1;
    }

    src_x = s->mb_x * 16 + (mx >> 2);
    src_y = s->mb_y * 16 + (my >> 2);
    uvsrc_x = s->mb_x * 8 + (uvmx >> 2);

    }

    if(!s->quarter_sample) { // hpel mc
        mx >>= 1;
        my >>= 1;
        uvmx >>= 1;
        uvmy >>= 1;
        dxy = ((my & 1) << 1) | (mx & 1);
        uvdxy = 0;

        dsp->put_no_rnd_pixels_tab[0][dxy](s->dest[0], srcY, s->linesize, 16);
    } else {
        dxy = ((my & 3) << 2) | (mx & 3);
        uvdxy = ((uvmy & 1) << 1) | (uvmx & 1);

        dsp->put_no_rnd_qpel_pixels_tab[0][dxy](s->dest[0], srcY, s->linesize);
    }
    dsp->put_mspel_pixels_tab[uvdxy](s->dest[1], srcU, s->uvlinesize);
    dsp->put_mspel_pixels_tab[uvdxy](s->dest[2], srcV, s->uvlinesize);
}

/**
 * Decode Simple/Main Profiles sequence header
 * @see Figure 7-8, p16-17

3371:a922021d6455

    srcY = s->last_picture.data[0];
    srcU = s->last_picture.data[1];
    srcV = s->last_picture.data[2];

    if(v->fastuvmc) { // XXX: 8.3.5.4.5 specifies something different
        uvmx = (uvmx + 1) & ~1;
        uvmy = (uvmy + 1) & ~1;
    }

    src_x = s->mb_x * 16 + (mx >> 2);
    src_y = s->mb_y * 16 + (my >> 2);
    uvsrc_x = s->mb_x * 8 + (uvmx >> 2);

    }

    if(!s->quarter_sample) { // hpel mc
        mx >>= 1;
        my >>= 1;
        dxy = ((my & 1) << 1) | (mx & 1);
        uvdxy = 0;

        dsp->put_no_rnd_pixels_tab[0][dxy](s->dest[0], srcY, s->linesize, 16);
    } else {
        dxy = ((my & 3) << 2) | (mx & 3);
        uvdxy = ((uvmy & 1) << 1) | (uvmx & 1);

        dsp->put_no_rnd_qpel_pixels_tab[0][dxy](s->dest[0], srcY, s->linesize);
    }
    dsp->put_no_rnd_pixels_tab[1][uvdxy](s->dest[1], srcU, s->uvlinesize, 8);
    dsp->put_no_rnd_pixels_tab[1][uvdxy](s->dest[2], srcV, s->uvlinesize, 8);
//    dsp->put_mspel_pixels_tab[uvdxy](s->dest[1], srcU, s->uvlinesize);
//    dsp->put_mspel_pixels_tab[uvdxy](s->dest[2], srcV, s->uvlinesize);
}

/**
 * Decode Simple/Main Profiles sequence header
 * @see Figure 7-8, p16-17