Revision 442b145a libavcodec/vp56.c

View differences:

libavcodec/vp56.c
400 400
    AVFrame *frame_current, *frame_ref;
401 401
    vp56_mb_t mb_type;
402 402
    vp56_frame_t ref_frame;
403
    int b, ab, b_max, plan, off;
403
    int b, ab, b_max, plane, off;
404 404

  
405 405
    if (s->framep[VP56_FRAME_CURRENT]->key_frame)
406 406
        mb_type = VP56_MB_INTRA;
......
423 423
    switch (mb_type) {
424 424
        case VP56_MB_INTRA:
425 425
            for (b=0; b<b_max; b++) {
426
                plan = vp56_b2p[b+ab];
427
                s->dsp.idct_put(frame_current->data[plan] + s->block_offset[b],
428
                                s->stride[plan], s->block_coeff[b]);
426
                plane = vp56_b2p[b+ab];
427
                s->dsp.idct_put(frame_current->data[plane] + s->block_offset[b],
428
                                s->stride[plane], s->block_coeff[b]);
429 429
            }
430 430
            break;
431 431

  
432 432
        case VP56_MB_INTER_NOVEC_PF:
433 433
        case VP56_MB_INTER_NOVEC_GF:
434 434
            for (b=0; b<b_max; b++) {
435
                plan = vp56_b2p[b+ab];
435
                plane = vp56_b2p[b+ab];
436 436
                off = s->block_offset[b];
437
                s->dsp.put_pixels_tab[1][0](frame_current->data[plan] + off,
438
                                            frame_ref->data[plan] + off,
439
                                            s->stride[plan], 8);
440
                s->dsp.idct_add(frame_current->data[plan] + off,
441
                                s->stride[plan], s->block_coeff[b]);
437
                s->dsp.put_pixels_tab[1][0](frame_current->data[plane] + off,
438
                                            frame_ref->data[plane] + off,
439
                                            s->stride[plane], 8);
440
                s->dsp.idct_add(frame_current->data[plane] + off,
441
                                s->stride[plane], s->block_coeff[b]);
442 442
            }
443 443
            break;
444 444

  
......
452 452
            for (b=0; b<b_max; b++) {
453 453
                int x_off = b==1 || b==3 ? 8 : 0;
454 454
                int y_off = b==2 || b==3 ? 8 : 0;
455
                plan = vp56_b2p[b+ab];
456
                vp56_mc(s, b, plan, frame_ref->data[plan], s->stride[plan],
455
                plane = vp56_b2p[b+ab];
456
                vp56_mc(s, b, plane, frame_ref->data[plane], s->stride[plane],
457 457
                        16*col+x_off, 16*row+y_off);
458
                s->dsp.idct_add(frame_current->data[plan] + s->block_offset[b],
459
                                s->stride[plan], s->block_coeff[b]);
458
                s->dsp.idct_add(frame_current->data[plane] + s->block_offset[b],
459
                                s->stride[plane], s->block_coeff[b]);
460 460
            }
461 461
            break;
462 462
    }

Also available in: Unified diff