Revision dfd2a005 libavformat/mxfdec.c

View differences:

libavformat/mxfdec.c
309 309
        if (klv_read_packet(&klv, s->pb) < 0)
310 310
            return -1;
311 311
        PRINT_KEY(s, "read packet", klv.key);
312
        dprintf(s, "size %lld offset %#llx\n", klv.length, klv.offset);
312
        av_dlog(s, "size %lld offset %#llx\n", klv.length, klv.offset);
313 313
        if (IS_KLV_KEY(klv.key, mxf_encrypted_triplet_key)) {
314 314
            int res = mxf_decrypt_triplet(s, pkt, &klv);
315 315
            if (res < 0) {
......
518 518
static int mxf_read_index_table_segment(void *arg, ByteIOContext *pb, int tag, int size, UID uid)
519 519
{
520 520
    switch(tag) {
521
    case 0x3F05: dprintf(NULL, "EditUnitByteCount %d\n", get_be32(pb)); break;
522
    case 0x3F06: dprintf(NULL, "IndexSID %d\n", get_be32(pb)); break;
523
    case 0x3F07: dprintf(NULL, "BodySID %d\n", get_be32(pb)); break;
524
    case 0x3F0B: dprintf(NULL, "IndexEditRate %d/%d\n", get_be32(pb), get_be32(pb)); break;
525
    case 0x3F0C: dprintf(NULL, "IndexStartPosition %lld\n", get_be64(pb)); break;
526
    case 0x3F0D: dprintf(NULL, "IndexDuration %lld\n", get_be64(pb)); break;
521
    case 0x3F05: av_dlog(NULL, "EditUnitByteCount %d\n", get_be32(pb)); break;
522
    case 0x3F06: av_dlog(NULL, "IndexSID %d\n", get_be32(pb)); break;
523
    case 0x3F07: av_dlog(NULL, "BodySID %d\n", get_be32(pb)); break;
524
    case 0x3F0B: av_dlog(NULL, "IndexEditRate %d/%d\n", get_be32(pb), get_be32(pb)); break;
525
    case 0x3F0C: av_dlog(NULL, "IndexStartPosition %lld\n", get_be64(pb)); break;
526
    case 0x3F0D: av_dlog(NULL, "IndexDuration %lld\n", get_be64(pb)); break;
527 527
    }
528 528
    return 0;
529 529
}
......
536 536
    do {
537 537
        code = get_byte(pb);
538 538
        value = get_byte(pb);
539
        dprintf(NULL, "pixel layout: code %#x\n", code);
539
        av_dlog(NULL, "pixel layout: code %#x\n", code);
540 540

  
541 541
        if (ofs < 16) {
542 542
            layout[ofs++] = code;
......
666 666
    MXFPackage *temp_package = NULL;
667 667
    int i, j, k;
668 668

  
669
    dprintf(mxf->fc, "metadata sets count %d\n", mxf->metadata_sets_count);
669
    av_dlog(mxf->fc, "metadata sets count %d\n", mxf->metadata_sets_count);
670 670
    /* TODO: handle multiple material packages (OP3x) */
671 671
    for (i = 0; i < mxf->packages_count; i++) {
672 672
        material_package = mxf_resolve_strong_ref(mxf, &mxf->packages_refs[i], MaterialPackage);
......
876 876
        uint64_t next = url_ftell(pb) + size;
877 877
        UID uid = {0};
878 878

  
879
        dprintf(mxf->fc, "local tag %#04x size %d\n", tag, size);
879
        av_dlog(mxf->fc, "local tag %#04x size %d\n", tag, size);
880 880
        if (!size) { /* ignore empty tag, needed for some files with empty UMID tag */
881 881
            av_log(mxf->fc, AV_LOG_ERROR, "local tag %#04x with 0 size\n", tag);
882 882
            continue;
......
887 887
                int local_tag = AV_RB16(mxf->local_tags+i*18);
888 888
                if (local_tag == tag) {
889 889
                    memcpy(uid, mxf->local_tags+i*18+2, 16);
890
                    dprintf(mxf->fc, "local tag %#04x\n", local_tag);
890
                    av_dlog(mxf->fc, "local tag %#04x\n", local_tag);
891 891
                    PRINT_KEY(mxf->fc, "uid", uid);
892 892
                }
893 893
            }
......
920 920
        if (klv_read_packet(&klv, s->pb) < 0)
921 921
            return -1;
922 922
        PRINT_KEY(s, "read header", klv.key);
923
        dprintf(s, "size %lld offset %#llx\n", klv.length, klv.offset);
923
        av_dlog(s, "size %lld offset %#llx\n", klv.length, klv.offset);
924 924
        if (IS_KLV_KEY(klv.key, mxf_encrypted_triplet_key) ||
925 925
            IS_KLV_KEY(klv.key, mxf_essence_element_key)) {
926 926
            /* FIXME avoid seek */

Also available in: Unified diff