Revision 1b0732ea libavformat/mxfdec.c

View differences:

libavformat/mxfdec.c
299 299
    while (!url_feof(s->pb)) {
300 300
        if (klv_read_packet(&klv, s->pb) < 0)
301 301
            return -1;
302
#ifdef DEBUG
303 302
        PRINT_KEY(s, "read packet", klv.key);
304
#endif
305 303
        if (IS_KLV_KEY(klv.key, mxf_encrypted_triplet_key)) {
306 304
            int res = mxf_decrypt_triplet(s, pkt, &klv);
307 305
            if (res < 0) {
......
726 724
            return -1;
727 725
        }
728 726

  
729
#ifdef DEBUG
730 727
        PRINT_KEY(mxf->fc, "data definition   ul", source_track->sequence->data_definition_ul);
731
#endif
732 728
        st->codec->codec_type = mxf_get_codec_type(ff_mxf_data_definition_uls, &source_track->sequence->data_definition_ul);
733 729

  
734 730
        source_package->descriptor = mxf_resolve_strong_ref(mxf, &source_package->descriptor_ref, AnyType);
......
753 749
            av_log(mxf->fc, AV_LOG_INFO, "source track %d: stream %d, no descriptor found\n", source_track->track_id, st->index);
754 750
            continue;
755 751
        }
756
#ifdef DEBUG
757 752
        PRINT_KEY(mxf->fc, "essence codec     ul", descriptor->essence_codec_ul);
758 753
        PRINT_KEY(mxf->fc, "essence container ul", descriptor->essence_container_ul);
759
#endif
760 754
        essence_container_ul = &descriptor->essence_container_ul;
761 755
        /* HACK: replacing the original key with mxf_encrypted_essence_container
762 756
         * is not allowed according to s429-6, try to find correct information anyway */
......
860 854
                if (local_tag == tag) {
861 855
                    memcpy(uid, mxf->local_tags+i*18+2, 16);
862 856
                    dprintf(mxf->fc, "local tag 0x%04X\n", local_tag);
863
#ifdef DEBUG
864 857
                    PRINT_KEY(mxf->fc, "uid", uid);
865
#endif
866 858
                }
867 859
            }
868 860
        }
......
893 885

  
894 886
        if (klv_read_packet(&klv, s->pb) < 0)
895 887
            return -1;
896
#ifdef DEBUG
897 888
        PRINT_KEY(s, "read header", klv.key);
898
#endif
899 889
        if (IS_KLV_KEY(klv.key, mxf_encrypted_triplet_key) ||
900 890
            IS_KLV_KEY(klv.key, mxf_essence_element_key)) {
901 891
            /* FIXME avoid seek */

Also available in: Unified diff