Revision 5d2b15b8 libavcodec/cavsdec.c

View differences:

libavcodec/cavsdec.c
193 193
    uint8_t *left = NULL;
194 194
    uint8_t *d;
195 195

  
196
    init_mb(h);
196
    ff_cavs_init_mb(h);
197 197

  
198 198
    /* get intra prediction modes from stream */
199 199
    for(block=0;block<4;block++) {
......
216 216
        av_log(h->s.avctx, AV_LOG_ERROR, "illegal intra chroma pred mode\n");
217 217
        return -1;
218 218
    }
219
    modify_mb_i(h, &pred_mode_uv);
219
    ff_cavs_modify_mb_i(h, &pred_mode_uv);
220 220

  
221 221
    /* get coded block pattern */
222 222
    if(h->pic_type == FF_I_TYPE)
......
232 232
    /* luma intra prediction interleaved with residual decode/transform/add */
233 233
    for(block=0;block<4;block++) {
234 234
        d = h->cy + h->luma_scan[block];
235
        load_intra_pred_luma(h, top, &left, block);
235
        ff_cavs_load_intra_pred_luma(h, top, &left, block);
236 236
        h->intra_pred_l[h->pred_mode_Y[ff_cavs_scan3x3[block]]]
237 237
            (d, top, left, h->l_stride);
238 238
        if(h->cbp & (1<<block))
......
240 240
    }
241 241

  
242 242
    /* chroma intra prediction */
243
    load_intra_pred_chroma(h);
243
    ff_cavs_load_intra_pred_chroma(h);
244 244
    h->intra_pred_c[pred_mode_uv](h->cu, &h->top_border_u[h->mbx*10],
245 245
                                  h->left_border_u, h->c_stride);
246 246
    h->intra_pred_c[pred_mode_uv](h->cv, &h->top_border_v[h->mbx*10],
......
256 256
    GetBitContext *gb = &h->s.gb;
257 257
    int ref[4];
258 258

  
259
    init_mb(h);
259
    ff_cavs_init_mb(h);
260 260
    switch(mb_type) {
261 261
    case P_SKIP:
262 262
        ff_cavs_mv(h, MV_FWD_X0, MV_FWD_C2, MV_PRED_PSKIP,  BLK_16X16, 0);
......
301 301
    enum sub_mb_t sub_type[4];
302 302
    int flags;
303 303

  
304
    init_mb(h);
304
    ff_cavs_init_mb(h);
305 305

  
306 306
    /* reset all MVs */
307 307
    h->mv[MV_FWD_X0] = ff_cavs_dir_mv;
......
527 527
    if(h->pic_type == FF_I_TYPE) {
528 528
        do {
529 529
            decode_mb_i(h, 0);
530
        } while(next_mb(h));
530
        } while(ff_cavs_next_mb(h));
531 531
    } else if(h->pic_type == FF_P_TYPE) {
532 532
        do {
533 533
            if(h->skip_mode_flag) {
534 534
                skip_count = get_ue_golomb(&s->gb);
535 535
                while(skip_count--) {
536 536
                    decode_mb_p(h,P_SKIP);
537
                    if(!next_mb(h))
537
                    if(!ff_cavs_next_mb(h))
538 538
                        goto done;
539 539
                }
540 540
                mb_type = get_ue_golomb(&s->gb) + P_16X16;
......
544 544
                decode_mb_i(h, mb_type - P_8X8 - 1);
545 545
            } else
546 546
                decode_mb_p(h,mb_type);
547
        } while(next_mb(h));
547
        } while(ff_cavs_next_mb(h));
548 548
    } else { /* FF_B_TYPE */
549 549
        do {
550 550
            if(h->skip_mode_flag) {
551 551
                skip_count = get_ue_golomb(&s->gb);
552 552
                while(skip_count--) {
553 553
                    decode_mb_b(h,B_SKIP);
554
                    if(!next_mb(h))
554
                    if(!ff_cavs_next_mb(h))
555 555
                        goto done;
556 556
                }
557 557
                mb_type = get_ue_golomb(&s->gb) + B_DIRECT;
......
561 561
                decode_mb_i(h, mb_type - B_8X8 - 1);
562 562
            } else
563 563
                decode_mb_b(h,mb_type);
564
        } while(next_mb(h));
564
        } while(ff_cavs_next_mb(h));
565 565
    }
566 566
 done:
567 567
    if(h->pic_type != FF_B_TYPE) {

Also available in: Unified diff