]> git.sesse.net Git - ffmpeg/blobdiff - libavformat/mxf.c
update to libnut API, changes to frame_table_input
[ffmpeg] / libavformat / mxf.c
index 3d9eb3b19974a31f32ad3bc9920a44667a7eb830..7bf0b84c21eebb18f36320e8ad7fa52c6a4b9c90 100644 (file)
@@ -2,18 +2,20 @@
  * MXF demuxer.
  * Copyright (c) 2006 SmartJog S.A., Baptiste Coudurier <baptiste dot coudurier at smartjog dot com>.
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
  * Principle
  * Search for Track numbers which will identify essence element KLV packets.
  * Search for SourcePackage which define tracks which contains Track numbers.
- * Material Package tracks does not contain Tracks numbers.
+ * Material Package contains tracks with reference to SourcePackage tracks.
  * Search for Descriptors (Picture, Sound) which contains codec info and parameters.
  * Assign Descriptors to correct Tracks.
  *
- * Preliminary demuxer, only OP1A supported and some files might not work at all.
+ * Metadata reading functions read Local Tags, get InstanceUID(0x3C0A) then add MetaDataSet to MXFContext.
+ * Metadata parsing resolves Strong References to objects.
+ *
+ * Simple demuxer, only OP1A supported and some files might not work at all.
+ * Only tracks with associated descriptors will be decoded. "Highly Desirable" SMPTE 377M D.1
  */
 
 //#define DEBUG
 
 #include "avformat.h"
-#include "dsputil.h"
-#include "riff.h"
 
-typedef DECLARE_ALIGNED_16(uint8_t, UID[16]);
+typedef uint8_t UID[16];
 
-typedef struct {
-    AVStream *stream;
-    UID track_uid;
-    UID sequence_uid;
+enum MXFMetadataSetType {
+    MaterialPackage,
+    SourcePackage,
+    SourceClip,
+    TimecodeComponent,
+    Sequence,
+    MultipleDescriptor,
+    Descriptor,
+    Track,
+    EssenceContainerData,
+};
+
+typedef struct MXFStructuralComponent {
+    UID uid;
+    enum MXFMetadataSetType type;
+    UID source_package_uid;
+    UID data_definition_ul;
+    int64_t duration;
+    int64_t start_position;
+    int source_track_id;
+} MXFStructuralComponent;
+
+typedef struct MXFSequence {
+    UID uid;
+    enum MXFMetadataSetType type;
+    UID data_definition_ul;
+    UID *structural_components_refs;
+    int structural_components_count;
+    int64_t duration;
+} MXFSequence;
+
+typedef struct MXFTrack {
+    UID uid;
+    enum MXFMetadataSetType type;
+    MXFSequence *sequence; /* mandatory, and only one */
+    UID sequence_ref;
     int track_id;
-    int track_number;
+    uint8_t track_number[4];
+    AVRational edit_rate;
 } MXFTrack;
 
-typedef struct {
-    UID essence_container;
-    UID essence_compression;
-    enum CodecType codec_type;
+typedef struct MXFDescriptor {
+    UID uid;
+    enum MXFMetadataSetType type;
+    UID essence_container_ul;
+    UID essence_codec_ul;
     AVRational sample_rate;
     AVRational aspect_ratio;
     int width;
     int height;
     int channels;
     int bits_per_sample;
-    int block_align;
+    UID *sub_descriptors_refs;
+    int sub_descriptors_count;
     int linked_track_id;
-    int kind;
+    uint8_t *extradata;
+    int extradata_size;
 } MXFDescriptor;
 
+typedef struct MXFPackage {
+    UID uid;
+    enum MXFMetadataSetType type;
+    UID package_uid;
+    UID *tracks_refs;
+    int tracks_count;
+    MXFDescriptor *descriptor; /* only one */
+    UID descriptor_ref;
+} MXFPackage;
+
+typedef struct MXFEssenceContainerData {
+    UID uid;
+    enum MXFMetadataSetType type;
+    UID linked_package_uid;
+} MXFEssenceContainerData;
+
 typedef struct {
+    UID uid;
+    enum MXFMetadataSetType type;
+} MXFMetadataSet;
+
+typedef struct MXFContext {
+    UID *packages_refs;
+    int packages_count;
+    UID *essence_container_data_sets_refs;
+    int essence_container_data_sets_count;
+    UID *essence_containers_uls; /* Universal Labels SMPTE RP224 */
+    int essence_containers_uls_count;
+    UID operational_pattern_ul;
+    UID content_storage_uid;
+    MXFMetadataSet **metadata_sets;
+    int metadata_sets_count;
     AVFormatContext *fc;
-    MXFTrack *tracks;
-    MXFDescriptor *descriptors;
-    int descriptors_count;
-    int tracks_count;
 } MXFContext;
 
-typedef struct {
+typedef struct KLVPacket {
     UID key;
     offset_t offset;
     uint64_t length;
 } KLVPacket;
 
-static const UID mxf_metadata_source_package_key           = { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x53, 0x01, 0x01, 0x0d, 0x01, 0x01, 0x01, 0x01, 0x01, 0x37, 0x00 };
-static const UID mxf_metadata_sequence_key                 = { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x53, 0x01, 0x01, 0x0d, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0F, 0x00 };
-static const UID mxf_metadata_generic_sound_descriptor_key = { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x53, 0x01, 0x01, 0x0d, 0x01, 0x01, 0x01, 0x01, 0x01, 0x42, 0x00 };
-static const UID mxf_metadata_cdci_descriptor_key          = { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x53, 0x01, 0x01, 0x0d, 0x01, 0x01, 0x01, 0x01, 0x01, 0x28, 0x00 };
-static const UID mxf_metadata_mpegvideo_descriptor_key     = { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x53, 0x01, 0x01, 0x0d, 0x01, 0x01, 0x01, 0x01, 0x01, 0x51, 0x00 };
-static const UID mxf_metadata_wave_descriptor_key          = { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x53, 0x01, 0x01, 0x0d, 0x01, 0x01, 0x01, 0x01, 0x01, 0x48, 0x00 };
-static const UID mxf_metadata_track_key                    = { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x53, 0x01, 0x01, 0x0d, 0x01, 0x01, 0x01, 0x01, 0x01, 0x3b, 0x00 };
+enum MXFWrappingScheme {
+    Frame,
+    Clip,
+};
+
+typedef struct MXFCodecUL {
+    UID uid;
+    enum CodecID id;
+    enum MXFWrappingScheme wrapping;
+} MXFCodecUL;
+
+typedef struct MXFDataDefinitionUL {
+    UID uid;
+    enum CodecType type;
+} MXFDataDefinitionUL;
+
+typedef struct MXFMetadataReadTableEntry {
+    const UID key;
+    int (*read)(MXFContext *mxf, KLVPacket *klv);
+} MXFMetadataReadTableEntry;
 
 /* partial keys to match */
-static const uint8_t mxf_header_partition_pack_key[]       = { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x05, 0x01, 0x01, 0x0d, 0x01, 0x02, 0x01, 0x01, 0x02 };
-static const uint8_t mxf_essence_element_key[]             = { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x02, 0x01 };
+static const uint8_t mxf_header_partition_pack_key[]       = { 0x06,0x0e,0x2b,0x34,0x02,0x05,0x01,0x01,0x0d,0x01,0x02,0x01,0x01,0x02 };
+static const uint8_t mxf_essence_element_key[]             = { 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01 };
 
 #define IS_KLV_KEY(x, y) (!memcmp(x, y, sizeof(y)))
 
-#define PRINT_KEY(x) \
-do { \
-    int iterpk; \
-    for (iterpk = 0; iterpk < 16; iterpk++) { \
-        av_log(NULL, AV_LOG_DEBUG, "%02X ", x[iterpk]); \
-    } \
-    av_log(NULL, AV_LOG_DEBUG, "\n"); \
-} while (0); \
+#define PRINT_KEY(s, x) dprintf("%s %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n", s, \
+                             (x)[0], (x)[1], (x)[2], (x)[3], (x)[4], (x)[5], (x)[6], (x)[7], (x)[8], (x)[9], (x)[10], (x)[11], (x)[12], (x)[13], (x)[14], (x)[15])
 
 static int64_t klv_decode_ber_length(ByteIOContext *pb)
 {
@@ -129,22 +203,50 @@ static int klv_read_packet(KLVPacket *klv, ByteIOContext *pb)
     klv->offset = url_ftell(pb);
     get_buffer(pb, klv->key, 16);
     klv->length = klv_decode_ber_length(pb);
-    if (klv->length == -1)
-        return -1;
-    else
-        return 0;
+    return klv->length == -1 ? -1 : 0;
 }
 
 static int mxf_get_stream_index(AVFormatContext *s, KLVPacket *klv)
 {
-    int id = BE_32(klv->key + 12); /* SMPTE 379M 7.3 */
     int i;
 
     for (i = 0; i < s->nb_streams; i++) {
-        if (s->streams[i]->id == id)
+        MXFTrack *track = s->streams[i]->priv_data;
+         /* SMPTE 379M 7.3 */
+        if (!memcmp(klv->key + sizeof(mxf_essence_element_key), track->track_number, sizeof(track->track_number)))
             return i;
     }
-    return -1;
+    /* return 0 if only one stream, for OP Atom files with 0 as track number */
+    return s->nb_streams == 1 ? 0 : -1;
+}
+
+/* XXX: use AVBitStreamFilter */
+static int mxf_get_d10_aes3_packet(ByteIOContext *pb, AVStream *st, AVPacket *pkt, int64_t length)
+{
+    uint8_t buffer[61444];
+    uint8_t *buf_ptr, *end_ptr, *data_ptr;
+
+    if (length > 61444) /* worst case PAL 1920 samples 8 channels */
+        return -1;
+    get_buffer(pb, buffer, length);
+    av_new_packet(pkt, length);
+    data_ptr = pkt->data;
+    end_ptr = buffer + length;
+    buf_ptr = buffer + 4; /* skip SMPTE 331M header */
+    for (; buf_ptr < end_ptr; buf_ptr += 4) {
+        if (st->codec->bits_per_sample == 24) {
+            data_ptr[0] = (buf_ptr[2] >> 4) | ((buf_ptr[3] & 0x0f) << 4);
+            data_ptr[1] = (buf_ptr[1] >> 4) | ((buf_ptr[2] & 0x0f) << 4);
+            data_ptr[2] = (buf_ptr[0] >> 4) | ((buf_ptr[1] & 0x0f) << 4);
+            data_ptr += 3;
+        } else {
+            data_ptr[0] = (buf_ptr[2] >> 4) | ((buf_ptr[3] & 0x0f) << 4);
+            data_ptr[1] = (buf_ptr[1] >> 4) | ((buf_ptr[2] & 0x0f) << 4);
+            data_ptr += 2;
+        }
+    }
+    pkt->size = data_ptr - pkt->data;
+    return 0;
 }
 
 static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt)
@@ -152,13 +254,29 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt)
     KLVPacket klv;
 
     while (!url_feof(&s->pb)) {
-        if (klv_read_packet(&klv, &s->pb) < 0)
+        if (klv_read_packet(&klv, &s->pb) < 0) {
+            av_log(s, AV_LOG_ERROR, "error reading KLV packet\n");
             return -1;
+        }
+#ifdef DEBUG
+        PRINT_KEY("read packet", klv.key);
+#endif
         if (IS_KLV_KEY(klv.key, mxf_essence_element_key)) {
-            av_get_packet(&s->pb, pkt, klv.length);
-            pkt->stream_index = mxf_get_stream_index(s, &klv);
-            if (pkt->stream_index == -1)
+            int index = mxf_get_stream_index(s, &klv);
+            if (index < 0) {
+                av_log(s, AV_LOG_ERROR, "error getting stream index\n");
+                url_fskip(&s->pb, klv.length);
                 return -1;
+            }
+            /* check for 8 channels AES3 element */
+            if (klv.key[12] == 0x06 && klv.key[13] == 0x01 && klv.key[14] == 0x10) {
+                if (mxf_get_d10_aes3_packet(&s->pb, s->streams[index], pkt, klv.length) < 0) {
+                    av_log(s, AV_LOG_ERROR, "error reading D-10 aes3 frame\n");
+                    return -1;
+                }
+            } else
+                av_get_packet(&s->pb, pkt, klv.length);
+            pkt->stream_index = index;
             return 0;
         } else
             url_fskip(&s->pb, klv.length);
@@ -166,340 +284,791 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt)
     return AVERROR_IO;
 }
 
-static int mxf_read_metadata_track(MXFContext *mxf, KLVPacket *klv)
+static int mxf_add_metadata_set(MXFContext *mxf, void *metadata_set)
+{
+    mxf->metadata_sets = av_realloc(mxf->metadata_sets, (mxf->metadata_sets_count + 1) * sizeof(*mxf->metadata_sets));
+    mxf->metadata_sets[mxf->metadata_sets_count] = metadata_set;
+    mxf->metadata_sets_count++;
+    return 0;
+}
+
+static int mxf_read_metadata_preface(MXFContext *mxf, KLVPacket *klv)
 {
     ByteIOContext *pb = &mxf->fc->pb;
-    AVRational time_base = (AVRational){0, 0};
-    uint8_t sequence_uid[16];
-    uint8_t track_uid[16];
-    int track_number = 0;
-    int track_id = 0;
     int bytes_read = 0;
-    int i;
 
     while (bytes_read < klv->length) {
         int tag = get_be16(pb);
         int size = get_be16(pb); /* SMPTE 336M Table 8 KLV specified length, 0x53 */
 
         switch (tag) {
+        case 0x3B03:
+            get_buffer(pb, mxf->content_storage_uid, 16);
+            break;
+        case 0x3B09:
+            get_buffer(pb, mxf->operational_pattern_ul, 16);
+            break;
+        case 0x3B0A:
+            mxf->essence_containers_uls_count = get_be32(pb);
+            if (mxf->essence_containers_uls_count >= UINT_MAX / sizeof(UID))
+                return -1;
+            mxf->essence_containers_uls = av_malloc(mxf->essence_containers_uls_count * sizeof(UID));
+            url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
+            get_buffer(pb, (uint8_t *)mxf->essence_containers_uls, mxf->essence_containers_uls_count * sizeof(UID));
+            break;
+        default:
+            url_fskip(pb, size);
+        }
+        bytes_read += size + 4;
+    }
+    return 0;
+}
+
+static int mxf_read_metadata_content_storage(MXFContext *mxf, KLVPacket *klv)
+{
+    ByteIOContext *pb = &mxf->fc->pb;
+    int bytes_read = 0;
+
+    while (bytes_read < klv->length) {
+        int tag = get_be16(pb);
+        int size = get_be16(pb); /* SMPTE 336M Table 8 KLV specified length, 0x53 */
+
+        dprintf("tag 0x%04X, size %d\n", tag, size);
+        switch (tag) {
+        case 0x1901:
+            mxf->packages_count = get_be32(pb);
+            if (mxf->packages_count >= UINT_MAX / sizeof(UID))
+                return -1;
+            mxf->packages_refs = av_malloc(mxf->packages_count * sizeof(UID));
+            url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
+            get_buffer(pb, (uint8_t *)mxf->packages_refs, mxf->packages_count * sizeof(UID));
+            break;
+        case 0x1902:
+            mxf->essence_container_data_sets_count = get_be32(pb);
+            if (mxf->essence_container_data_sets_count >= UINT_MAX / sizeof(UID))
+                return -1;
+            mxf->essence_container_data_sets_refs = av_malloc(mxf->essence_container_data_sets_count * sizeof(UID));
+            url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
+            get_buffer(pb, (uint8_t *)mxf->essence_container_data_sets_refs, mxf->essence_container_data_sets_count * sizeof(UID));
+            break;
+        default:
+            url_fskip(pb, size);
+        }
+        bytes_read += size + 4;
+    }
+    return 0;
+}
+
+static int mxf_read_metadata_source_clip(MXFContext *mxf, KLVPacket *klv)
+{
+    ByteIOContext *pb = &mxf->fc->pb;
+    MXFStructuralComponent *source_clip = av_mallocz(sizeof(*source_clip));
+    int bytes_read = 0;
+
+    while (bytes_read < klv->length) {
+        int tag = get_be16(pb);
+        int size = get_be16(pb); /* SMPTE 336M Table 8 KLV specified length, 0x53 */
+
+        bytes_read += size + 4;
+        dprintf("tag 0x%04X, size %d\n", tag, size);
+        if (!size) { /* ignore empty tag, needed for some files with empty UMID tag */
+            av_log(mxf->fc, AV_LOG_ERROR, "local tag 0x%04X with 0 size\n", tag);
+            continue;
+        }
+        switch (tag) {
+        case 0x3C0A:
+            get_buffer(pb, source_clip->uid, 16);
+            break;
+        case 0x0202:
+            source_clip->duration = get_be64(pb);
+            break;
+        case 0x1201:
+            source_clip->start_position = get_be64(pb);
+            break;
+        case 0x1101:
+            /* UMID, only get last 16 bytes */
+            url_fskip(pb, 16);
+            get_buffer(pb, source_clip->source_package_uid, 16);
+            break;
+        case 0x1102:
+            source_clip->source_track_id = get_be32(pb);
+            break;
+        default:
+            url_fskip(pb, size);
+        }
+    }
+    source_clip->type = SourceClip;
+    return mxf_add_metadata_set(mxf, source_clip);
+}
+
+static int mxf_read_metadata_material_package(MXFContext *mxf, KLVPacket *klv)
+{
+    ByteIOContext *pb = &mxf->fc->pb;
+    MXFPackage *package = av_mallocz(sizeof(*package));
+    int bytes_read = 0;
+
+    while (bytes_read < klv->length) {
+        int tag = get_be16(pb);
+        int size = get_be16(pb); /* KLV specified by 0x53 */
+
+        switch (tag) {
+        case 0x3C0A:
+            get_buffer(pb, package->uid, 16);
+            break;
+        case 0x4403:
+            package->tracks_count = get_be32(pb);
+            if (package->tracks_count >= UINT_MAX / sizeof(UID))
+                return -1;
+            package->tracks_refs = av_malloc(package->tracks_count * sizeof(UID));
+            url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
+            get_buffer(pb, (uint8_t *)package->tracks_refs, package->tracks_count * sizeof(UID));
+            break;
+        default:
+            url_fskip(pb, size);
+        }
+        bytes_read += size + 4;
+    }
+    package->type = MaterialPackage;
+    return mxf_add_metadata_set(mxf, package);
+}
+
+static int mxf_read_metadata_track(MXFContext *mxf, KLVPacket *klv)
+{
+    ByteIOContext *pb = &mxf->fc->pb;
+    MXFTrack *track = av_mallocz(sizeof(*track));
+    int bytes_read = 0;
+
+    while (bytes_read < klv->length) {
+        int tag = get_be16(pb);
+        int size = get_be16(pb); /* KLV specified by 0x53 */
+
+        dprintf("tag 0x%04X, size %d\n", tag, size);
+        switch (tag) {
+        case 0x3C0A:
+            get_buffer(pb, track->uid, 16);
+            break;
         case 0x4801:
-            track_id = get_be32(pb);
+            track->track_id = get_be32(pb);
             break;
         case 0x4804:
-            track_number = get_be32(pb);
+            get_buffer(pb, track->track_number, 4);
             break;
         case 0x4B01:
-            time_base.den = get_be32(pb);
-            time_base.num = get_be32(pb);
+            track->edit_rate.den = get_be32(pb);
+            track->edit_rate.num = get_be32(pb);
             break;
         case 0x4803:
-            get_buffer(pb, sequence_uid, 16);
-            break;
-        case 0x3C0A:
-            get_buffer(pb, track_uid, 16);
+            get_buffer(pb, track->sequence_ref, 16);
             break;
         default:
             url_fskip(pb, size);
         }
         bytes_read += size + 4;
     }
-    for (i = 0; i < mxf->tracks_count; i++)
-        if (!memcmp(track_uid, mxf->tracks[i].track_uid, 16)) {
-            mxf->tracks[i].track_id = track_id;
-            mxf->tracks[i].track_number = track_number;
-            mxf->tracks[i].stream->time_base = time_base;
-            mxf->tracks[i].stream->id = track_number;
-            memcpy(mxf->tracks[i].sequence_uid, sequence_uid, 16);
-        }
-    return bytes_read;
+    track->type = Track;
+    return mxf_add_metadata_set(mxf, track);
 }
 
 static int mxf_read_metadata_sequence(MXFContext *mxf, KLVPacket *klv)
 {
     ByteIOContext *pb = &mxf->fc->pb;
-    uint8_t sequence_uid[16];
-    uint8_t data_definition[16];
-    uint64_t duration = AV_NOPTS_VALUE;
+    MXFSequence *sequence = av_mallocz(sizeof(*sequence));
     int bytes_read = 0;
-    int i;
 
     while (bytes_read < klv->length) {
         int tag = get_be16(pb);
         int size = get_be16(pb); /* KLV specified by 0x53 */
 
+        dprintf("tag 0x%04X, size %d\n", tag, size);
         switch (tag) {
         case 0x3C0A:
-            get_buffer(pb, sequence_uid, 16);
+            get_buffer(pb, sequence->uid, 16);
             break;
         case 0x0202:
-            duration = get_be64(pb);
+            sequence->duration = get_be64(pb);
             break;
         case 0x0201:
-            get_buffer(pb, data_definition, 16);
+            get_buffer(pb, sequence->data_definition_ul, 16);
+            break;
+        case 0x1001:
+            sequence->structural_components_count = get_be32(pb);
+            if (sequence->structural_components_count >= UINT_MAX / sizeof(UID))
+                return -1;
+            sequence->structural_components_refs = av_malloc(sequence->structural_components_count * sizeof(UID));
+            url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
+            get_buffer(pb, (uint8_t *)sequence->structural_components_refs, sequence->structural_components_count * sizeof(UID));
             break;
         default:
             url_fskip(pb, size);
         }
         bytes_read += size + 4;
     }
-
-    for (i = 0; i < mxf->tracks_count; i++)
-        if (!memcmp(sequence_uid, mxf->tracks[i].sequence_uid, 16)) {
-            mxf->tracks[i].stream->start_time = 0;
-            mxf->tracks[i].stream->duration = duration;
-            if (data_definition[11] == 0x02 && data_definition[12] == 0x01)
-                mxf->tracks[i].stream->codec->codec_type = CODEC_TYPE_VIDEO;
-            else if (data_definition[11] == 0x02 && data_definition[12] == 0x02)
-                mxf->tracks[i].stream->codec->codec_type = CODEC_TYPE_AUDIO;
-            else if (data_definition[11] == 0x01) /* SMPTE 12M Time Code track */
-                mxf->tracks[i].stream->codec->codec_type = CODEC_TYPE_DATA;
-        }
-    return bytes_read;
+    sequence->type = Sequence;
+    return mxf_add_metadata_set(mxf, sequence);
 }
 
 static int mxf_read_metadata_source_package(MXFContext *mxf, KLVPacket *klv)
 {
     ByteIOContext *pb = &mxf->fc->pb;
-    int tracks_count;
+    MXFPackage *package = av_mallocz(sizeof(*package));
     int bytes_read = 0;
-    int i;
 
     while (bytes_read < klv->length) {
         int tag = get_be16(pb);
         int size = get_be16(pb); /* KLV specified by 0x53 */
 
+        dprintf("tag 0x%04X, size %d\n", tag, size);
         switch (tag) {
+        case 0x3C0A:
+            get_buffer(pb, package->uid, 16);
+            break;
         case 0x4403:
-            tracks_count = get_be32(pb);
-            if(tracks_count >= UINT_MAX / sizeof(*mxf->tracks) ||
-               tracks_count >= UINT_MAX / sizeof(*mxf->descriptors))
+            package->tracks_count = get_be32(pb);
+            if (package->tracks_count >= UINT_MAX / sizeof(UID))
                 return -1;
-            mxf->tracks_count += tracks_count; /* op2a contains multiple source packages */
-            mxf->tracks = av_realloc(mxf->tracks, mxf->tracks_count * sizeof(*mxf->tracks));
-            mxf->descriptors = av_realloc(mxf->descriptors, mxf->tracks_count * sizeof(*mxf->descriptors));
+            package->tracks_refs = av_malloc(package->tracks_count * sizeof(UID));
             url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
-            for (i = mxf->tracks_count - tracks_count; i < mxf->tracks_count; i++) {
-                mxf->tracks[i].stream = av_new_stream(mxf->fc, 0);
-                get_buffer(pb, mxf->tracks[i].track_uid, 16);
-            }
+            get_buffer(pb, (uint8_t *)package->tracks_refs, package->tracks_count * sizeof(UID));
+            break;
+        case 0x4401:
+            /* UMID, only get last 16 bytes */
+            url_fskip(pb, 16);
+            get_buffer(pb, package->package_uid, 16);
+            break;
+        case 0x4701:
+            get_buffer(pb, package->descriptor_ref, 16);
             break;
         default:
             url_fskip(pb, size);
         }
         bytes_read += size + 4;
     }
-    return bytes_read;
+    package->type = SourcePackage;
+    return mxf_add_metadata_set(mxf, package);
 }
 
-static int mxf_read_metadata_descriptor(MXFContext *mxf, KLVPacket *klv)
+static int mxf_read_metadata_multiple_descriptor(MXFContext *mxf, KLVPacket *klv)
 {
     ByteIOContext *pb = &mxf->fc->pb;
-    MXFDescriptor *desc;
+    MXFDescriptor *descriptor = av_mallocz(sizeof(*descriptor));
     int bytes_read = 0;
 
-    if (mxf->descriptors_count == mxf->tracks_count)
-        return -1;
-    desc = &mxf->descriptors[mxf->descriptors_count++];
-    desc->kind = klv->key[14];
-    desc->linked_track_id = -1;
+    while (bytes_read < klv->length) {
+        int tag = get_be16(pb);
+        int size = get_be16(pb); /* KLV specified by 0x53 */
+
+        dprintf("tag 0x%04X, size %d\n", tag, size);
+        switch (tag) {
+        case 0x3C0A:
+            get_buffer(pb, descriptor->uid, 16);
+            break;
+        case 0x3F01:
+            descriptor->sub_descriptors_count = get_be32(pb);
+            if (descriptor->sub_descriptors_count >= UINT_MAX / sizeof(UID))
+                return -1;
+            descriptor->sub_descriptors_refs = av_malloc(descriptor->sub_descriptors_count * sizeof(UID));
+            url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
+            get_buffer(pb, (uint8_t *)descriptor->sub_descriptors_refs, descriptor->sub_descriptors_count * sizeof(UID));
+            break;
+        default:
+            url_fskip(pb, size);
+        }
+        bytes_read += size + 4;
+    }
+    descriptor->type = MultipleDescriptor;
+    return mxf_add_metadata_set(mxf, descriptor);
+}
+
+static void mxf_read_metadata_pixel_layout(ByteIOContext *pb, MXFDescriptor *descriptor)
+{
+    int code;
+
+    do {
+        code = get_byte(pb);
+        dprintf("pixel layout: code 0x%x\n", code);
+        switch (code) {
+        case 0x52: /* R */
+            descriptor->bits_per_sample += get_byte(pb);
+            break;
+        case 0x47: /* G */
+            descriptor->bits_per_sample += get_byte(pb);
+            break;
+        case 0x42: /* B */
+            descriptor->bits_per_sample += get_byte(pb);
+            break;
+        default:
+            get_byte(pb);
+        }
+    } while (code != 0); /* SMPTE 377M E.2.46 */
+}
+
+static int mxf_read_metadata_generic_descriptor(MXFContext *mxf, KLVPacket *klv)
+{
+    ByteIOContext *pb = &mxf->fc->pb;
+    MXFDescriptor *descriptor = av_mallocz(sizeof(*descriptor));
+    int bytes_read = 0;
 
     while (bytes_read < klv->length) {
         int tag = get_be16(pb);
         int size = get_be16(pb); /* KLV specified by 0x53 */
 
+        dprintf("tag 0x%04X, size %d\n", tag, size);
         switch (tag) {
+        case 0x3C0A:
+            get_buffer(pb, descriptor->uid, 16);
+            break;
         case 0x3004:
-            get_buffer(pb, desc->essence_container, 16);
+            get_buffer(pb, descriptor->essence_container_ul, 16);
             break;
         case 0x3006:
-            desc->linked_track_id = get_be32(pb);
+            descriptor->linked_track_id = get_be32(pb);
             break;
         case 0x3201: /* PictureEssenceCoding */
-            desc->codec_type = CODEC_TYPE_VIDEO;
-            get_buffer(pb, desc->essence_compression, 16);
+            get_buffer(pb, descriptor->essence_codec_ul, 16);
             break;
         case 0x3203:
-            desc->width = get_be32(pb);
+            descriptor->width = get_be32(pb);
             break;
         case 0x3202:
-            desc->height = get_be32(pb);
+            descriptor->height = get_be32(pb);
             break;
         case 0x320E:
-            desc->aspect_ratio.num = get_be32(pb);
-            desc->aspect_ratio.den = get_be32(pb);
-            break;
-        case 0x3D0A:
-            desc->block_align = get_be16(pb);
+            descriptor->aspect_ratio.num = get_be32(pb);
+            descriptor->aspect_ratio.den = get_be32(pb);
             break;
         case 0x3D03:
-            desc->sample_rate.num = get_be32(pb);
-            desc->sample_rate.den = get_be32(pb);
+            descriptor->sample_rate.num = get_be32(pb);
+            descriptor->sample_rate.den = get_be32(pb);
             break;
         case 0x3D06: /* SoundEssenceCompression */
-            desc->codec_type = CODEC_TYPE_AUDIO;
-            get_buffer(pb, desc->essence_compression, 16);
+            get_buffer(pb, descriptor->essence_codec_ul, 16);
             break;
         case 0x3D07:
-            desc->channels = get_be32(pb);
+            descriptor->channels = get_be32(pb);
             break;
         case 0x3D01:
-            desc->bits_per_sample = get_be32(pb);
+            descriptor->bits_per_sample = get_be32(pb);
+            break;
+        case 0x3401:
+            mxf_read_metadata_pixel_layout(pb, descriptor);
+            break;
+        case 0x8201: /* Private tag used by SONY C0023S01.mxf */
+            descriptor->extradata = av_malloc(size);
+            descriptor->extradata_size = size;
+            get_buffer(pb, descriptor->extradata, size);
             break;
         default:
             url_fskip(pb, size);
         }
         bytes_read += size + 4;
     }
-    return bytes_read;
+    descriptor->type = Descriptor;
+    return mxf_add_metadata_set(mxf, descriptor);
 }
 
 /* SMPTE RP224 http://www.smpte-ra.org/mdd/index.html */
-static const CodecTag mxf_sound_essence_labels[] = {
-    { CODEC_ID_PCM_S16LE, 0x01000000 },/* Uncompressed Sound Coding */
-    { CODEC_ID_PCM_S16LE, 0x017F0000 },/* Uncompressed Sound Coding */
-    { CODEC_ID_PCM_S16BE, 0x017E0000 },/* Uncompressed Sound Coding Big Endian*/
-    { CODEC_ID_PCM_ALAW,  0x02030101 },
-    { CODEC_ID_AC3,       0x02030201 },
-  //{ CODEC_ID_MP1,       0x02030104 },
-    { CODEC_ID_MP2,       0x02030105 },/* MP2 or MP3 */
-  //{ CODEC_ID_MP2,       0x02030106 },/* MPEG-2 Layer 1 */
-  //{ CODEC_ID_???,       0x0203010C },/* Dolby E */
-  //{ CODEC_ID_???,       0x02030301 },/* MPEG-2 AAC */
-    { 0, 0 },
+static const MXFDataDefinitionUL mxf_data_definition_uls[] = {
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x01,0x00,0x00,0x00 }, CODEC_TYPE_VIDEO },
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x02,0x00,0x00,0x00 }, CODEC_TYPE_AUDIO },
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x05,0x01,0x03,0x02,0x02,0x02,0x02,0x00,0x00 }, CODEC_TYPE_AUDIO },
+    { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },  CODEC_TYPE_DATA },
 };
 
-static const CodecTag mxf_picture_essence_labels[] = {
-    { CODEC_ID_RAWVIDEO,   0x0100 },
-    { CODEC_ID_MPEG2VIDEO, 0x0201 },
-    { CODEC_ID_DVVIDEO,    0x0202 },
-  //{ CODEC_ID_???,        0x0207 },/* D-11 HDCAM */
-    { 0, 0 },
+static const MXFCodecUL mxf_codec_uls[] = {
+    /* PictureEssenceCoding */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x02,0x02,0x00 }, CODEC_ID_MPEG2VIDEO, Frame }, /* 422P@ML I-Frame */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x04,0x02,0x00 }, CODEC_ID_MPEG2VIDEO, Frame }, /* 422P@HL I-Frame */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x04,0x03,0x00 }, CODEC_ID_MPEG2VIDEO, Frame }, /* 422P@HL Long GoP */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x01,0x11,0x00 }, CODEC_ID_MPEG2VIDEO, Frame }, /* MP@ML Long GoP */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x02,0x03,0x00 }, CODEC_ID_MPEG2VIDEO, Frame }, /* 422P@ML Long GoP */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x03,0x03,0x00 }, CODEC_ID_MPEG2VIDEO, Frame }, /* MP@HL Long GoP */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x20,0x02,0x03 },      CODEC_ID_MPEG4, Frame }, /* XDCAM proxy_pal030926.mxf */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x20,0x02,0x04 },      CODEC_ID_MPEG4, Frame }, /* XDCAM Proxy C0023S01.mxf */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x05 }, CODEC_ID_MPEG2VIDEO, Frame }, /* D-10 30Mbps PAL */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x01 }, CODEC_ID_MPEG2VIDEO, Frame }, /* D-10 50Mbps PAL */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x04,0x00 },    CODEC_ID_DVVIDEO, Frame }, /* DVCPRO50 PAL */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x02,0x00 },    CODEC_ID_DVVIDEO, Frame }, /* DVCPRO25 PAL */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x01,0x02,0x00 },    CODEC_ID_DVVIDEO, Frame }, /* DV25 IEC PAL */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00 },   CODEC_ID_JPEG2000, Frame }, /* JPEG2000 Codestream */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x01,0x7F,0x00,0x00,0x00 },   CODEC_ID_RAWVIDEO, Frame }, /* Uncompressed */
+    /* SoundEssenceCompression */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 },  CODEC_ID_PCM_S16LE, Frame }, /* Uncompressed */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x7F,0x00,0x00,0x00 },  CODEC_ID_PCM_S16LE, Frame },
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x02,0x02,0x01,0x7E,0x00,0x00,0x00 },  CODEC_ID_PCM_S16BE, Frame }, /* From Omneon MXF file */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x01,0x01,0x00 },   CODEC_ID_PCM_ALAW, Frame },
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x04,0x04,0x02,0x02,0x02,0x03,0x01,0x01,0x00 },   CODEC_ID_PCM_ALAW, Frame }, /* XDCAM Proxy C0023S01.mxf */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x01,0x00 },        CODEC_ID_AC3, Frame },
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x05,0x00 },        CODEC_ID_MP2, Frame }, /* MP2 or MP3 */
+  //{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x1C,0x00 },    CODEC_ID_DOLBY_E, Frame }, /* Dolby-E */
+    { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },       CODEC_ID_NONE, Frame },
 };
 
-static const CodecTag mxf_container_picture_labels[] = {
-    { CODEC_ID_MPEG2VIDEO, 0x0201 }, /* D-10 Mapping */
-    { CODEC_ID_DVVIDEO,    0x0202 }, /* DV Mapping */
-  //{ CODEC_ID_???,        0x0203 }, /* HDCAM D-11 Mapping */
-    { CODEC_ID_MPEG2VIDEO, 0x0204 }, /* MPEG ES Mapping */
+static const MXFCodecUL mxf_picture_essence_container_uls[] = {
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0x60,0x01 }, CODEC_ID_MPEG2VIDEO, Frame }, /* MPEG-ES Frame wrapped */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0xe0,0x02 }, CODEC_ID_MPEG2VIDEO,  Clip }, /* MPEG-ES Clip wrapped, 0xe0 MPV stream id */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x04,0x61,0x07 }, CODEC_ID_MPEG2VIDEO,  Clip }, /* MPEG-ES Custom wrapped, 0x61 ??? stream id */
+    { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },       CODEC_ID_NONE, Frame },
 };
 
-static const CodecTag mxf_container_sound_labels[] = {
-  //{ CODEC_ID_PCM_S16??,  0x0201 }, /* D-10 Mapping */
-    { CODEC_ID_MP2,        0x0204 }, /* MPEG ES Mapping */
-    { CODEC_ID_PCM_S16LE,  0x0206 }, /* AES BWF Mapping */
-    { CODEC_ID_PCM_ALAW,   0x020A },
-    { 0, 0 },
+static const MXFCodecUL mxf_sound_essence_container_uls[] = {
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x06,0x01,0x00 },  CODEC_ID_PCM_S16LE, Frame }, /* BWF Frame wrapped */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x06,0x03,0x00 },  CODEC_ID_PCM_S16LE, Frame }, /* AES Frame wrapped */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0x40,0x01 },        CODEC_ID_MP2, Frame }, /* MPEG-ES Frame wrapped, 0x40 ??? stream id */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0xc0,0x01 },        CODEC_ID_MP2, Frame }, /* MPEG-ES Frame wrapped, 0xc0 MPA stream id */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0xc0,0x02 },        CODEC_ID_MP2,  Clip }, /* MPEG-ES Clip wrapped, 0xc0 MPA stream id */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x05,0x01 },  CODEC_ID_PCM_S16BE, Frame }, /* D-10 Mapping 30Mbps PAL Extended Template */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x01,0x01 },  CODEC_ID_PCM_S16BE, Frame }, /* D-10 Mapping 50Mbps PAL Extended Template */
+    { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },       CODEC_ID_NONE, Frame },
 };
 
-static void mxf_resolve_track_descriptor(MXFContext *mxf)
+static const MXFCodecUL *mxf_get_codec_ul(const MXFCodecUL *uls, UID *uid)
+{
+    while (uls->id != CODEC_ID_NONE) {
+        if(!memcmp(uls->uid, *uid, 16))
+            break;
+        uls++;
+    }
+    return uls;
+}
+
+static enum CodecType mxf_get_codec_type(const MXFDataDefinitionUL *uls, UID *uid)
+{
+    while (uls->type != CODEC_TYPE_DATA) {
+        if(!memcmp(uls->uid, *uid, 16))
+            break;
+        uls++;
+    }
+    return uls->type;
+}
+
+static void *mxf_resolve_strong_ref(MXFContext *mxf, UID *strong_ref)
 {
-    uint32_t container_label;
-    uint32_t essence_label;
-    int i, j;
-
-    for (i = 0; i < mxf->descriptors_count; i++) {
-        for (j = 0; j < mxf->tracks_count; j++) {
-            AVStream *st = mxf->tracks[j].stream;
-            MXFDescriptor *desc = &mxf->descriptors[i];
-
-            if ((desc->linked_track_id == -1 && st->codec->codec_type == desc->codec_type)
-                || desc->linked_track_id == mxf->tracks[j].track_id) {
-                if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
-                    st->codec->channels = desc->channels;
-                    st->codec->bits_per_sample = desc->bits_per_sample;
-                    st->codec->block_align = desc->block_align;
-                    st->codec->sample_rate = desc->sample_rate.num / desc->sample_rate.den;
-
-                    container_label = BE_16(desc->essence_container + 12);
-                    essence_label = BE_32(desc->essence_compression + 11);
-                    st->codec->codec_id = codec_get_id(mxf_sound_essence_labels, essence_label);
-                    if (st->codec->codec_id == CODEC_ID_PCM_S16LE) {
-                        if (desc->bits_per_sample == 24)
-                            st->codec->codec_id = CODEC_ID_PCM_S24LE;
-                        else if (desc->bits_per_sample == 32)
-                            st->codec->codec_id = CODEC_ID_PCM_S32LE;
+    int i;
+
+    if (!strong_ref)
+        return NULL;
+    for (i = 0; i < mxf->metadata_sets_count; i++) {
+        if (!memcmp(*strong_ref, mxf->metadata_sets[i]->uid, 16)) {
+            return mxf->metadata_sets[i];
+        }
+    }
+    return NULL;
+}
+
+static int mxf_parse_structural_metadata(MXFContext *mxf)
+{
+    MXFPackage *material_package = NULL;
+    MXFPackage *source_package = NULL;
+    MXFPackage *temp_package = NULL;
+    int i, j, k;
+
+    dprintf("metadata sets count %d\n", mxf->metadata_sets_count);
+    /* TODO: handle multiple material packages (OP3x) */
+    for (i = 0; i < mxf->packages_count; i++) {
+        if (!(temp_package = mxf_resolve_strong_ref(mxf, &mxf->packages_refs[i]))) {
+            av_log(mxf->fc, AV_LOG_ERROR, "could not resolve package strong ref\n");
+            return -1;
+        }
+        if (temp_package->type == MaterialPackage) {
+            material_package = temp_package;
+            break;
+        }
+    }
+    if (!material_package) {
+        av_log(mxf->fc, AV_LOG_ERROR, "no material package found\n");
+        return -1;
+    }
+
+    for (i = 0; i < material_package->tracks_count; i++) {
+        MXFTrack *material_track = NULL;
+        MXFTrack *source_track = NULL;
+        MXFTrack *temp_track = NULL;
+        MXFDescriptor *descriptor = NULL;
+        MXFStructuralComponent *component = NULL;
+        const MXFCodecUL *codec_ul = NULL;
+        const MXFCodecUL *container_ul = NULL;
+        AVStream *st;
+
+        if (!(material_track = mxf_resolve_strong_ref(mxf, &material_package->tracks_refs[i]))) {
+            av_log(mxf->fc, AV_LOG_ERROR, "could not resolve material track strong ref\n");
+            continue;
+        }
+
+        if (!(material_track->sequence = mxf_resolve_strong_ref(mxf, &material_track->sequence_ref))) {
+            av_log(mxf->fc, AV_LOG_ERROR, "could not resolve material track sequence strong ref\n");
+            return -1;
+        }
+
+        /* TODO: handle multiple source clips */
+        for (j = 0; j < material_track->sequence->structural_components_count; j++) {
+            /* TODO: handle timecode component */
+            component = mxf_resolve_strong_ref(mxf, &material_track->sequence->structural_components_refs[j]);
+            if (!component || component->type != SourceClip)
+                continue;
+
+            for (k = 0; k < mxf->packages_count; k++) {
+                if (!(temp_package = mxf_resolve_strong_ref(mxf, &mxf->packages_refs[k]))) {
+                    av_log(mxf->fc, AV_LOG_ERROR, "could not resolve source track strong ref\n");
+                    return -1;
+                }
+                if (!memcmp(temp_package->package_uid, component->source_package_uid, 16)) {
+                    source_package = temp_package;
+                    break;
+                }
+            }
+            if (!source_package) {
+                av_log(mxf->fc, AV_LOG_ERROR, "material track %d: no corresponding source package found\n", material_track->track_id);
+                break;
+            }
+            for (k = 0; k < source_package->tracks_count; k++) {
+                if (!(temp_track = mxf_resolve_strong_ref(mxf, &source_package->tracks_refs[k]))) {
+                    av_log(mxf->fc, AV_LOG_ERROR, "could not resolve source track strong ref\n");
+                    return -1;
+                }
+                if (temp_track->track_id == component->source_track_id) {
+                    source_track = temp_track;
+                    break;
+                }
+            }
+            if (!source_track) {
+                av_log(mxf->fc, AV_LOG_ERROR, "material track %d: no corresponding source track found\n", material_track->track_id);
+                break;
+            }
+        }
+        if (!source_track)
+            continue;
+
+        st = av_new_stream(mxf->fc, source_track->track_id);
+        st->priv_data = source_track;
+        st->duration = component->duration;
+        if (st->duration == -1)
+            st->duration = AV_NOPTS_VALUE;
+        st->start_time = component->start_position;
+        av_set_pts_info(st, 64, material_track->edit_rate.num, material_track->edit_rate.den);
+
+        if (!(source_track->sequence = mxf_resolve_strong_ref(mxf, &source_track->sequence_ref))) {
+            av_log(mxf->fc, AV_LOG_ERROR, "could not resolve source track sequence strong ref\n");
+            return -1;
+        }
+
+#ifdef DEBUG
+        PRINT_KEY("data definition   ul", source_track->sequence->data_definition_ul);
+#endif
+        st->codec->codec_type = mxf_get_codec_type(mxf_data_definition_uls, &source_track->sequence->data_definition_ul);
+
+        source_package->descriptor = mxf_resolve_strong_ref(mxf, &source_package->descriptor_ref);
+        if (source_package->descriptor) {
+            if (source_package->descriptor->type == MultipleDescriptor) {
+                for (j = 0; j < source_package->descriptor->sub_descriptors_count; j++) {
+                    MXFDescriptor *sub_descriptor = mxf_resolve_strong_ref(mxf, &source_package->descriptor->sub_descriptors_refs[j]);
+
+                    if (!sub_descriptor) {
+                        av_log(mxf->fc, AV_LOG_ERROR, "could not resolve sub descriptor strong ref\n");
+                        continue;
                     }
-                    if (st->codec->codec_id == CODEC_ID_PCM_S16BE) {
-                        if (desc->bits_per_sample == 24)
-                            st->codec->codec_id = CODEC_ID_PCM_S24BE;
-                        else if (desc->bits_per_sample == 32)
-                            st->codec->codec_id = CODEC_ID_PCM_S32BE;
+                    if (sub_descriptor->linked_track_id == source_track->track_id) {
+                        descriptor = sub_descriptor;
+                        break;
                     }
-                    if (!st->codec->codec_id)
-                        st->codec->codec_id = codec_get_id(mxf_container_sound_labels, container_label);
-
-                } else if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
-                    st->codec->width = desc->width;
-                    st->codec->height = desc->height;
-
-                    container_label = BE_16(desc->essence_container + 12);
-                    essence_label = BE_16(desc->essence_compression + 11);
-                    st->codec->codec_id = codec_get_id(mxf_picture_essence_labels, essence_label);
-                    if (!st->codec->codec_id)
-                        st->codec->codec_id = codec_get_id(mxf_container_picture_labels, container_label);
                 }
+            } else
+                descriptor = source_package->descriptor;
+        }
+        if (!descriptor) {
+            av_log(mxf->fc, AV_LOG_INFO, "source track %d: stream %d, no descriptor found\n", source_track->track_id, st->index);
+            continue;
+        }
+#ifdef DEBUG
+        PRINT_KEY("essence codec     ul", descriptor->essence_codec_ul);
+        PRINT_KEY("essence container ul", descriptor->essence_container_ul);
+#endif
+        /* TODO: drop PictureEssenceCoding and SoundEssenceCompression, only check EssenceContainer */
+        codec_ul = mxf_get_codec_ul(mxf_codec_uls, &descriptor->essence_codec_ul);
+        st->codec->codec_id = codec_ul->id;
+        if (descriptor->extradata) {
+            st->codec->extradata = descriptor->extradata;
+            st->codec->extradata_size = descriptor->extradata_size;
+        }
+        if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
+            container_ul = mxf_get_codec_ul(mxf_picture_essence_container_uls, &descriptor->essence_container_ul);
+            if (st->codec->codec_id == CODEC_ID_NONE)
+                st->codec->codec_id = container_ul->id;
+            st->codec->width = descriptor->width;
+            st->codec->height = descriptor->height;
+            st->codec->bits_per_sample = descriptor->bits_per_sample; /* Uncompressed */
+            st->need_parsing = 2; /* only parse headers */
+        } else if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
+            container_ul = mxf_get_codec_ul(mxf_sound_essence_container_uls, &descriptor->essence_container_ul);
+            if (st->codec->codec_id == CODEC_ID_NONE)
+                st->codec->codec_id = container_ul->id;
+            st->codec->channels = descriptor->channels;
+            st->codec->bits_per_sample = descriptor->bits_per_sample;
+            st->codec->sample_rate = descriptor->sample_rate.num / descriptor->sample_rate.den;
+            /* TODO: implement CODEC_ID_RAWAUDIO */
+            if (st->codec->codec_id == CODEC_ID_PCM_S16LE) {
+                if (descriptor->bits_per_sample == 24)
+                    st->codec->codec_id = CODEC_ID_PCM_S24LE;
+                else if (descriptor->bits_per_sample == 32)
+                    st->codec->codec_id = CODEC_ID_PCM_S32LE;
+            } else if (st->codec->codec_id == CODEC_ID_PCM_S16BE) {
+                if (descriptor->bits_per_sample == 24)
+                    st->codec->codec_id = CODEC_ID_PCM_S24BE;
+                else if (descriptor->bits_per_sample == 32)
+                    st->codec->codec_id = CODEC_ID_PCM_S32BE;
+                if (descriptor->essence_container_ul[13] == 0x01) /* D-10 Mapping */
+                    st->codec->channels = 8; /* force channels to 8 */
+            } else if (st->codec->codec_id == CODEC_ID_MP2) {
+                st->need_parsing = 1;
             }
         }
+        if (container_ul && container_ul->wrapping == Clip) {
+            dprintf("stream %d: clip wrapped essence\n", st->index);
+            st->need_parsing = 1;
+        }
+    }
+    return 0;
+}
+
+static const MXFMetadataReadTableEntry mxf_metadata_read_table[] = {
+    { { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x2F,0x00 }, mxf_read_metadata_preface },
+    { { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x18,0x00 }, mxf_read_metadata_content_storage },
+    { { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x37,0x00 }, mxf_read_metadata_source_package },
+    { { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x36,0x00 }, mxf_read_metadata_material_package },
+    { { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x0F,0x00 }, mxf_read_metadata_sequence },
+    { { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x11,0x00 }, mxf_read_metadata_source_clip },
+    { { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x44,0x00 }, mxf_read_metadata_multiple_descriptor },
+    { { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x42,0x00 }, mxf_read_metadata_generic_descriptor }, /* Generic Sound */
+    { { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x28,0x00 }, mxf_read_metadata_generic_descriptor }, /* CDCI */
+    { { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x29,0x00 }, mxf_read_metadata_generic_descriptor }, /* RGBA */
+    { { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x51,0x00 }, mxf_read_metadata_generic_descriptor }, /* MPEG 2 Video */
+    { { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x48,0x00 }, mxf_read_metadata_generic_descriptor }, /* Wave */
+    { { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x47,0x00 }, mxf_read_metadata_generic_descriptor }, /* AES3 */
+    { { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x3A,0x00 }, mxf_read_metadata_track }, /* Static Track */
+    { { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x3B,0x00 }, mxf_read_metadata_track }, /* Generic Track */
+    { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, NULL },
+};
+
+static int mxf_read_sync(ByteIOContext *pb, const uint8_t *key, unsigned size)
+{
+    int i, b;
+    for (i = 0; i < size && !url_feof(pb); i++) {
+        b = get_byte(pb);
+        if (b == key[0])
+            i = 0;
+        else if (b != key[i])
+            i = -1;
     }
+    return i == size;
 }
 
 static int mxf_read_header(AVFormatContext *s, AVFormatParameters *ap)
 {
     MXFContext *mxf = s->priv_data;
     KLVPacket klv;
-    int ret = 0;
 
+    if (!mxf_read_sync(&s->pb, mxf_header_partition_pack_key, 14)) {
+        av_log(s, AV_LOG_ERROR, "could not find header partition pack key\n");
+        return -1;
+    }
+    url_fseek(&s->pb, -14, SEEK_CUR);
     mxf->fc = s;
     while (!url_feof(&s->pb)) {
-        if (klv_read_packet(&klv, &s->pb) < 0)
+        const MXFMetadataReadTableEntry *function;
+
+        if (klv_read_packet(&klv, &s->pb) < 0) {
+            av_log(s, AV_LOG_ERROR, "error reading KLV packet\n");
             return -1;
-        if (IS_KLV_KEY(klv.key, mxf_metadata_track_key))
-            ret = mxf_read_metadata_track(mxf, &klv);
-        else if (IS_KLV_KEY(klv.key, mxf_metadata_source_package_key))
-            ret = mxf_read_metadata_source_package(mxf, &klv);
-        else if (IS_KLV_KEY(klv.key, mxf_metadata_sequence_key))
-            ret = mxf_read_metadata_sequence(mxf, &klv);
-        else if (IS_KLV_KEY(klv.key, mxf_metadata_wave_descriptor_key))
-            ret = mxf_read_metadata_descriptor(mxf, &klv);
-        else if (IS_KLV_KEY(klv.key, mxf_metadata_mpegvideo_descriptor_key))
-            ret = mxf_read_metadata_descriptor(mxf, &klv);
-        else if (IS_KLV_KEY(klv.key, mxf_metadata_cdci_descriptor_key))
-            ret = mxf_read_metadata_descriptor(mxf, &klv);
-        else if (IS_KLV_KEY(klv.key, mxf_metadata_generic_sound_descriptor_key))
-            ret = mxf_read_metadata_descriptor(mxf, &klv);
-        else if (IS_KLV_KEY(klv.key, mxf_essence_element_key)) {
+        }
+#ifdef DEBUG
+        PRINT_KEY("read header", klv.key);
+#endif
+        if (IS_KLV_KEY(klv.key, mxf_essence_element_key)) {
             /* FIXME avoid seek */
             url_fseek(&s->pb, klv.offset, SEEK_SET);
             break;
-        } else
+        }
+
+        for (function = mxf_metadata_read_table; function->read; function++) {
+            if (IS_KLV_KEY(klv.key, function->key)) {
+                if (function->read(mxf, &klv) < 0) {
+                    av_log(s, AV_LOG_ERROR, "error reading header metadata\n");
+                    return -1;
+                }
+                break;
+            }
+        }
+        if (!function->read)
             url_fskip(&s->pb, klv.length);
-        if (ret < 0)
-            return ret;
     }
-    mxf_resolve_track_descriptor(mxf);
-    return 0;
+    return mxf_parse_structural_metadata(mxf);
 }
 
 static int mxf_read_close(AVFormatContext *s)
 {
     MXFContext *mxf = s->priv_data;
+    int i;
 
-    av_freep(&mxf->tracks);
-    av_freep(&mxf->descriptors);
+    av_freep(&mxf->packages_refs);
+    av_freep(&mxf->essence_container_data_sets_refs);
+    av_freep(&mxf->essence_containers_uls);
+    for (i = 0; i < mxf->metadata_sets_count; i++) {
+        switch (mxf->metadata_sets[i]->type) {
+        case MultipleDescriptor:
+            av_freep(&((MXFDescriptor *)mxf->metadata_sets[i])->sub_descriptors_refs);
+            break;
+        case Sequence:
+            av_freep(&((MXFSequence *)mxf->metadata_sets[i])->structural_components_refs);
+            break;
+        case SourcePackage:
+        case MaterialPackage:
+            av_freep(&((MXFPackage *)mxf->metadata_sets[i])->tracks_refs);
+            break;
+        default:
+            break;
+        }
+        av_freep(&mxf->metadata_sets[i]);
+    }
+    av_freep(&mxf->metadata_sets);
     return 0;
 }
 
 static int mxf_probe(AVProbeData *p) {
-    /* KLV packet describing MXF header partition pack */
+    uint8_t *bufp = p->buf;
+    uint8_t *end = p->buf + p->buf_size;
+
     if (p->buf_size < sizeof(mxf_header_partition_pack_key))
         return 0;
 
-    if (IS_KLV_KEY(p->buf, mxf_header_partition_pack_key))
-        return AVPROBE_SCORE_MAX;
-    else
-        return 0;
+    /* Must skip Run-In Sequence and search for MXF header partition pack key SMPTE 377M 5.5 */
+    end -= sizeof(mxf_header_partition_pack_key);
+    for (; bufp < end; bufp++) {
+        if (IS_KLV_KEY(bufp, mxf_header_partition_pack_key))
+            return AVPROBE_SCORE_MAX;
+    }
+    return 0;
 }
 
+/* rudimentary binary seek */
+/* XXX: use MXF Index */
+static int mxf_read_seek(AVFormatContext *s, int stream_index, int64_t sample_time, int flags)
+{
+    AVStream *st = s->streams[stream_index];
+    int64_t seconds;
+
+    if (!s->bit_rate)
+        return -1;
+    if (sample_time < 0)
+        sample_time = 0;
+    seconds = av_rescale(sample_time, st->time_base.num, st->time_base.den);
+    url_fseek(&s->pb, (s->bit_rate * seconds) >> 3, SEEK_SET);
+    if (!mxf_read_sync(&s->pb, mxf_essence_element_key, 12))
+        return -1;
+
+    /* found KLV key */
+    url_fseek(&s->pb, -12, SEEK_CUR);
+    av_update_cur_dts(s, st, sample_time);
+    return 0;
+}
 
 AVInputFormat mxf_demuxer = {
     "mxf",
@@ -509,5 +1078,5 @@ AVInputFormat mxf_demuxer = {
     mxf_read_header,
     mxf_read_packet,
     mxf_read_close,
-    NULL,
+    mxf_read_seek,
 };