Revision dfd2a005 libavcodec/mpeg12.c

View differences:

libavcodec/mpeg12.c
213 213
    int i, j, k, cbp, val, mb_type, motion_type;
214 214
    const int mb_block_count = 4 + (1<< s->chroma_format);
215 215

  
216
    dprintf(s->avctx, "decode_mb: x=%d y=%d\n", s->mb_x, s->mb_y);
216
    av_dlog(s->avctx, "decode_mb: x=%d y=%d\n", s->mb_x, s->mb_y);
217 217

  
218 218
    assert(s->mb_skipped==0);
219 219

  
......
272 272
        mb_type = btype2mb_type[ mb_type ];
273 273
        break;
274 274
    }
275
    dprintf(s->avctx, "mb_type=%x\n", mb_type);
275
    av_dlog(s->avctx, "mb_type=%x\n", mb_type);
276 276
//    motion_type = 0; /* avoid warning */
277 277
    if (IS_INTRA(mb_type)) {
278 278
        s->dsp.clear_blocks(s->block[0]);
......
370 370

  
371 371
            /* motion vectors */
372 372
            s->mv_dir= (mb_type>>13)&3;
373
            dprintf(s->avctx, "motion_type=%d\n", motion_type);
373
            av_dlog(s->avctx, "motion_type=%d\n", motion_type);
374 374
            switch(motion_type) {
375 375
            case MT_FRAME: /* or MT_16X8 */
376 376
                if (s->picture_structure == PICT_FRAME) {
......
421 421
                                                         s->last_mv[i][j][0]);
422 422
                                s->last_mv[i][j][0] = val;
423 423
                                s->mv[i][j][0] = val;
424
                                dprintf(s->avctx, "fmx=%d\n", val);
424
                                av_dlog(s->avctx, "fmx=%d\n", val);
425 425
                                val = mpeg_decode_motion(s, s->mpeg_f_code[i][1],
426 426
                                                         s->last_mv[i][j][1] >> 1);
427 427
                                s->last_mv[i][j][1] = val << 1;
428 428
                                s->mv[i][j][1] = val;
429
                                dprintf(s->avctx, "fmy=%d\n", val);
429
                                av_dlog(s->avctx, "fmy=%d\n", val);
430 430
                            }
431 431
                        }
432 432
                    }
......
632 632
    dc += diff;
633 633
    s->last_dc[component] = dc;
634 634
    block[0] = dc*quant_matrix[0];
635
    dprintf(s->avctx, "dc=%d diff=%d\n", dc, diff);
635
    av_dlog(s->avctx, "dc=%d diff=%d\n", dc, diff);
636 636
    i = 0;
637 637
    {
638 638
        OPEN_READER(re, &s->gb);
......
1012 1012
    dc += diff;
1013 1013
    s->last_dc[component] = dc;
1014 1014
    block[0] = dc << (3 - s->intra_dc_precision);
1015
    dprintf(s->avctx, "dc=%d\n", block[0]);
1015
    av_dlog(s->avctx, "dc=%d\n", block[0]);
1016 1016
    mismatch = block[0] ^ 1;
1017 1017
    i = 0;
1018 1018
    if (s->intra_vlc_format)
......
1386 1386
    s1->frame_rate_ext.num = get_bits(&s->gb, 2)+1;
1387 1387
    s1->frame_rate_ext.den = get_bits(&s->gb, 5)+1;
1388 1388

  
1389
    dprintf(s->avctx, "sequence extension\n");
1389
    av_dlog(s->avctx, "sequence extension\n");
1390 1390
    s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG2VIDEO;
1391 1391
    s->avctx->sub_id = 2; /* indicates MPEG-2 found */
1392 1392

  
......
1477 1477

  
1478 1478
static void mpeg_decode_quant_matrix_extension(MpegEncContext *s)
1479 1479
{
1480
    dprintf(s->avctx, "matrix extension\n");
1480
    av_dlog(s->avctx, "matrix extension\n");
1481 1481

  
1482 1482
    if(get_bits1(&s->gb)) load_matrix(s, s->chroma_intra_matrix, s->intra_matrix, 1);
1483 1483
    if(get_bits1(&s->gb)) load_matrix(s, s->chroma_inter_matrix, s->inter_matrix, 0);
......
1551 1551
    }
1552 1552

  
1553 1553
    /* composite display not parsed */
1554
    dprintf(s->avctx, "intra_dc_precision=%d\n", s->intra_dc_precision);
1555
    dprintf(s->avctx, "picture_structure=%d\n", s->picture_structure);
1556
    dprintf(s->avctx, "top field first=%d\n", s->top_field_first);
1557
    dprintf(s->avctx, "repeat first field=%d\n", s->repeat_first_field);
1558
    dprintf(s->avctx, "conceal=%d\n", s->concealment_motion_vectors);
1559
    dprintf(s->avctx, "intra_vlc_format=%d\n", s->intra_vlc_format);
1560
    dprintf(s->avctx, "alternate_scan=%d\n", s->alternate_scan);
1561
    dprintf(s->avctx, "frame_pred_frame_dct=%d\n", s->frame_pred_frame_dct);
1562
    dprintf(s->avctx, "progressive_frame=%d\n", s->progressive_frame);
1554
    av_dlog(s->avctx, "intra_dc_precision=%d\n", s->intra_dc_precision);
1555
    av_dlog(s->avctx, "picture_structure=%d\n", s->picture_structure);
1556
    av_dlog(s->avctx, "top field first=%d\n", s->top_field_first);
1557
    av_dlog(s->avctx, "repeat first field=%d\n", s->repeat_first_field);
1558
    av_dlog(s->avctx, "conceal=%d\n", s->concealment_motion_vectors);
1559
    av_dlog(s->avctx, "intra_vlc_format=%d\n", s->intra_vlc_format);
1560
    av_dlog(s->avctx, "alternate_scan=%d\n", s->alternate_scan);
1561
    av_dlog(s->avctx, "frame_pred_frame_dct=%d\n", s->frame_pred_frame_dct);
1562
    av_dlog(s->avctx, "progressive_frame=%d\n", s->progressive_frame);
1563 1563
}
1564 1564

  
1565 1565
static void exchange_uv(MpegEncContext *s){
......
2200 2200
    Mpeg1Context *s = avctx->priv_data;
2201 2201
    AVFrame *picture = data;
2202 2202
    MpegEncContext *s2 = &s->mpeg_enc_ctx;
2203
    dprintf(avctx, "fill_buffer\n");
2203
    av_dlog(avctx, "fill_buffer\n");
2204 2204

  
2205 2205
    if (buf_size == 0 || (buf_size == 4 && AV_RB32(buf) == SEQ_END_CODE)) {
2206 2206
        /* special case for last picture */
......
2524 2524
    if( !(avctx->slice_flags & SLICE_FLAG_CODED_ORDER) )
2525 2525
        return -1;
2526 2526
    if( !(avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD) ){
2527
        dprintf(avctx, "mpeg12.c: XvMC decoder will work better if SLICE_FLAG_ALLOW_FIELD is set\n");
2527
        av_dlog(avctx, "mpeg12.c: XvMC decoder will work better if SLICE_FLAG_ALLOW_FIELD is set\n");
2528 2528
    }
2529 2529
    mpeg_decode_init(avctx);
2530 2530

  

Also available in: Unified diff