Revision d23e3e5f libavcodec/vc1dec.c

View differences:

libavcodec/vc1dec.c
288 288
        uint8_t *uvbuf= s->edge_emu_buffer + 19 * s->linesize;
289 289

  
290 290
        srcY -= s->mspel * (1 + s->linesize);
291
        ff_emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 17+s->mspel*2, 17+s->mspel*2,
291
        s->dsp.emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 17+s->mspel*2, 17+s->mspel*2,
292 292
                            src_x - s->mspel, src_y - s->mspel, s->h_edge_pos, s->v_edge_pos);
293 293
        srcY = s->edge_emu_buffer;
294
        ff_emulated_edge_mc(uvbuf     , srcU, s->uvlinesize, 8+1, 8+1,
294
        s->dsp.emulated_edge_mc(uvbuf     , srcU, s->uvlinesize, 8+1, 8+1,
295 295
                            uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
296
        ff_emulated_edge_mc(uvbuf + 16, srcV, s->uvlinesize, 8+1, 8+1,
296
        s->dsp.emulated_edge_mc(uvbuf + 16, srcV, s->uvlinesize, 8+1, 8+1,
297 297
                            uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
298 298
        srcU = uvbuf;
299 299
        srcV = uvbuf + 16;
......
403 403
       || (unsigned)(src_x - s->mspel) > s->h_edge_pos - (mx&3) - 8 - s->mspel*2
404 404
       || (unsigned)(src_y - s->mspel) > s->v_edge_pos - (my&3) - 8 - s->mspel*2){
405 405
        srcY -= s->mspel * (1 + s->linesize);
406
        ff_emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 9+s->mspel*2, 9+s->mspel*2,
406
        s->dsp.emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 9+s->mspel*2, 9+s->mspel*2,
407 407
                            src_x - s->mspel, src_y - s->mspel, s->h_edge_pos, s->v_edge_pos);
408 408
        srcY = s->edge_emu_buffer;
409 409
        /* if we deal with range reduction we need to scale source blocks */
......
537 537
    if(v->rangeredfrm || (v->mv_mode == MV_PMODE_INTENSITY_COMP)
538 538
       || (unsigned)uvsrc_x > (s->h_edge_pos >> 1) - 9
539 539
       || (unsigned)uvsrc_y > (s->v_edge_pos >> 1) - 9){
540
        ff_emulated_edge_mc(s->edge_emu_buffer     , srcU, s->uvlinesize, 8+1, 8+1,
540
        s->dsp.emulated_edge_mc(s->edge_emu_buffer     , srcU, s->uvlinesize, 8+1, 8+1,
541 541
                            uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
542
        ff_emulated_edge_mc(s->edge_emu_buffer + 16, srcV, s->uvlinesize, 8+1, 8+1,
542
        s->dsp.emulated_edge_mc(s->edge_emu_buffer + 16, srcV, s->uvlinesize, 8+1, 8+1,
543 543
                            uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
544 544
        srcU = s->edge_emu_buffer;
545 545
        srcV = s->edge_emu_buffer + 16;
......
872 872
        uint8_t *uvbuf= s->edge_emu_buffer + 19 * s->linesize;
873 873

  
874 874
        srcY -= s->mspel * (1 + s->linesize);
875
        ff_emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 17+s->mspel*2, 17+s->mspel*2,
875
        s->dsp.emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 17+s->mspel*2, 17+s->mspel*2,
876 876
                            src_x - s->mspel, src_y - s->mspel, s->h_edge_pos, s->v_edge_pos);
877 877
        srcY = s->edge_emu_buffer;
878
        ff_emulated_edge_mc(uvbuf     , srcU, s->uvlinesize, 8+1, 8+1,
878
        s->dsp.emulated_edge_mc(uvbuf     , srcU, s->uvlinesize, 8+1, 8+1,
879 879
                            uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
880
        ff_emulated_edge_mc(uvbuf + 16, srcV, s->uvlinesize, 8+1, 8+1,
880
        s->dsp.emulated_edge_mc(uvbuf + 16, srcV, s->uvlinesize, 8+1, 8+1,
881 881
                            uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
882 882
        srcU = uvbuf;
883 883
        srcV = uvbuf + 16;

Also available in: Unified diff