* 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
*/
* Search for Descriptors (Picture, Sound) which contains codec info and parameters.
* Assign Descriptors to correct Tracks.
*
- * Metadata reading functions read Local Tags, get InstanceUID(0x3C0A) and then resolve Strong Reference from another object.
- * Returns -1 if Strong Reference could not be resolved.
+ * 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
- * Only descriptors with EssenceSoundCompression or PictureEssenceCoding will be taken into account. "D/req" SMPTE 377M
*/
//#define DEBUG
typedef uint8_t UID[16];
-enum MXFPackageType {
+enum MXFMetadataSetType {
MaterialPackage,
SourcePackage,
-};
-
-enum MXFStructuralComponentType {
- Timecode,
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;
- enum MXFStructuralComponentType type;
} MXFStructuralComponent;
typedef struct MXFSequence {
UID uid;
+ enum MXFMetadataSetType type;
UID data_definition_ul;
- MXFStructuralComponent **structural_components;
UID *structural_components_refs;
int structural_components_count;
int64_t duration;
typedef struct MXFTrack {
UID uid;
+ enum MXFMetadataSetType type;
MXFSequence *sequence; /* mandatory, and only one */
UID sequence_ref;
int track_id;
typedef struct MXFDescriptor {
UID uid;
+ enum MXFMetadataSetType type;
UID essence_container_ul;
UID essence_codec_ul;
AVRational sample_rate;
int height;
int channels;
int bits_per_sample;
- struct MXFDescriptor **sub_descriptors;
UID *sub_descriptors_refs;
int sub_descriptors_count;
int linked_track_id;
+ uint8_t *extradata;
+ int extradata_size;
} MXFDescriptor;
typedef struct MXFPackage {
UID uid;
+ enum MXFMetadataSetType type;
UID package_uid;
- MXFTrack **tracks;
UID *tracks_refs;
int tracks_count;
MXFDescriptor *descriptor; /* only one */
UID descriptor_ref;
- enum MXFPackageType type;
} 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 {
- MXFPackage **packages;
UID *packages_refs;
int packages_count;
- MXFEssenceContainerData **essence_container_data_sets;
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;
} MXFContext;
uint64_t length;
} KLVPacket;
+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);
#define IS_KLV_KEY(x, y) (!memcmp(x, y, sizeof(y)))
-#define PRINT_KEY(x) dprintf("%02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n", \
+#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)
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)
return -1;
}
#ifdef DEBUG
- PRINT_KEY(klv.key);
+ 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);
- return pkt->stream_index == -1 ? -1 : 0;
+ 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);
}
return AVERROR_IO;
}
+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;
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, mxf->essence_containers_uls, mxf->essence_containers_uls_count * sizeof(UID));
+ get_buffer(pb, (uint8_t *)mxf->essence_containers_uls, mxf->essence_containers_uls_count * sizeof(UID));
break;
default:
url_fskip(pb, size);
switch (tag) {
case 0x1901:
mxf->packages_count = get_be32(pb);
- if (mxf->packages_count >= UINT_MAX / sizeof(UID) ||
- mxf->packages_count >= UINT_MAX / sizeof(*mxf->packages))
+ if (mxf->packages_count >= UINT_MAX / sizeof(UID))
return -1;
mxf->packages_refs = av_malloc(mxf->packages_count * sizeof(UID));
- mxf->packages = av_mallocz(mxf->packages_count * sizeof(*mxf->packages));
url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
- get_buffer(pb, mxf->packages_refs, mxf->packages_count * sizeof(UID));
+ 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) ||
- mxf->essence_container_data_sets_count >= UINT_MAX / sizeof(*mxf->essence_container_data_sets))
+ 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));
- mxf->essence_container_data_sets = av_mallocz(mxf->essence_container_data_sets_count * sizeof(*mxf->essence_container_data_sets));
url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
- get_buffer(pb, mxf->essence_container_data_sets_refs, mxf->essence_container_data_sets_count * sizeof(UID));
+ 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);
ByteIOContext *pb = &mxf->fc->pb;
MXFStructuralComponent *source_clip = av_mallocz(sizeof(*source_clip));
int bytes_read = 0;
- int i, j, k;
- source_clip->type = SourceClip;
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);
default:
url_fskip(pb, size);
}
- bytes_read += size + 4;
- }
- for (i = 0; i < mxf->packages_count; i++) {
- if (mxf->packages[i]) {
- for (j = 0; j < mxf->packages[i]->tracks_count; j++) {
- if (mxf->packages[i]->tracks[j] && mxf->packages[i]->tracks[j]->sequence) {
- for (k = 0; k < mxf->packages[i]->tracks[j]->sequence->structural_components_count; k++) {
- if (!memcmp(mxf->packages[i]->tracks[j]->sequence->structural_components_refs[k], source_clip->uid, 16)) {
- mxf->packages[i]->tracks[j]->sequence->structural_components[k] = source_clip;
- return 0;
- }
- }
- }
- }
- }
}
- return -1;
+ 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;
- int i;
- package->type = MaterialPackage;
while (bytes_read < klv->length) {
int tag = get_be16(pb);
int size = get_be16(pb); /* KLV specified by 0x53 */
break;
case 0x4403:
package->tracks_count = get_be32(pb);
- if (package->tracks_count >= UINT_MAX / sizeof(UID) ||
- package->tracks_count >= UINT_MAX / sizeof(*package->tracks))
+ if (package->tracks_count >= UINT_MAX / sizeof(UID))
return -1;
package->tracks_refs = av_malloc(package->tracks_count * sizeof(UID));
- package->tracks = av_mallocz(package->tracks_count * sizeof(*package->tracks));
url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
- get_buffer(pb, package->tracks_refs, package->tracks_count * sizeof(UID));
+ get_buffer(pb, (uint8_t *)package->tracks_refs, package->tracks_count * sizeof(UID));
break;
default:
url_fskip(pb, size);
}
bytes_read += size + 4;
}
- for (i = 0; i < mxf->packages_count; i++) {
- if (!memcmp(mxf->packages_refs[i], package->uid, 16)) {
- mxf->packages[i] = package;
- return 0;
- }
- }
- return -1;
+ 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;
- int i, j;
while (bytes_read < klv->length) {
int tag = get_be16(pb);
}
bytes_read += size + 4;
}
- for (i = 0; i < mxf->packages_count; i++) {
- if (mxf->packages[i]) {
- for (j = 0; j < mxf->packages[i]->tracks_count; j++) {
- if (!memcmp(mxf->packages[i]->tracks_refs[j], track->uid, 16)) {
- mxf->packages[i]->tracks[j] = track;
- return 0;
- }
- }
- }
- }
- return -1;
+ 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;
MXFSequence *sequence = av_mallocz(sizeof(*sequence));
int bytes_read = 0;
- int i, j;
while (bytes_read < klv->length) {
int tag = get_be16(pb);
break;
case 0x1001:
sequence->structural_components_count = get_be32(pb);
- if (sequence->structural_components_count >= UINT_MAX / sizeof(UID) ||
- sequence->structural_components_count >= UINT_MAX / sizeof(*sequence->structural_components))
+ if (sequence->structural_components_count >= UINT_MAX / sizeof(UID))
return -1;
sequence->structural_components_refs = av_malloc(sequence->structural_components_count * sizeof(UID));
- sequence->structural_components = av_mallocz(sequence->structural_components_count * sizeof(*sequence->structural_components));
url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
- get_buffer(pb, sequence->structural_components_refs, sequence->structural_components_count * sizeof(UID));
+ 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->packages_count; i++) {
- if (mxf->packages[i]) {
- for (j = 0; j < mxf->packages[i]->tracks_count; j++) {
- if (mxf->packages[i]->tracks[j]) {
- if (!memcmp(mxf->packages[i]->tracks[j]->sequence_ref, sequence->uid, 16)) {
- mxf->packages[i]->tracks[j]->sequence = sequence;
- return 0;
- }
- }
- }
- }
- }
- return -1;
+ 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;
MXFPackage *package = av_mallocz(sizeof(*package));
int bytes_read = 0;
- int i;
- package->type = SourcePackage;
while (bytes_read < klv->length) {
int tag = get_be16(pb);
int size = get_be16(pb); /* KLV specified by 0x53 */
break;
case 0x4403:
package->tracks_count = get_be32(pb);
- if (package->tracks_count >= UINT_MAX / sizeof(UID) ||
- package->tracks_count >= UINT_MAX / sizeof(*package->tracks))
+ if (package->tracks_count >= UINT_MAX / sizeof(UID))
return -1;
package->tracks_refs = av_malloc(package->tracks_count * sizeof(UID));
- package->tracks = av_mallocz(package->tracks_count * sizeof(*package->tracks));
url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
- get_buffer(pb, package->tracks_refs, package->tracks_count * sizeof(UID));
+ get_buffer(pb, (uint8_t *)package->tracks_refs, package->tracks_count * sizeof(UID));
break;
case 0x4401:
/* UMID, only get last 16 bytes */
}
bytes_read += size + 4;
}
- for (i = 0; i < mxf->packages_count; i++) {
- if (!memcmp(mxf->packages_refs[i], package->uid, 16)) {
- mxf->packages[i] = package;
- return 0;
- }
- }
- return -1;
+ package->type = SourcePackage;
+ return mxf_add_metadata_set(mxf, package);
}
static int mxf_read_metadata_multiple_descriptor(MXFContext *mxf, KLVPacket *klv)
ByteIOContext *pb = &mxf->fc->pb;
MXFDescriptor *descriptor = av_mallocz(sizeof(*descriptor));
int bytes_read = 0;
- int i;
while (bytes_read < klv->length) {
int tag = get_be16(pb);
break;
case 0x3F01:
descriptor->sub_descriptors_count = get_be32(pb);
- if (descriptor->sub_descriptors_count >= UINT_MAX / sizeof(UID) ||
- descriptor->sub_descriptors_count >= UINT_MAX / sizeof(*descriptor->sub_descriptors))
+ if (descriptor->sub_descriptors_count >= UINT_MAX / sizeof(UID))
return -1;
descriptor->sub_descriptors_refs = av_malloc(descriptor->sub_descriptors_count * sizeof(UID));
- descriptor->sub_descriptors = av_mallocz(descriptor->sub_descriptors_count * sizeof(*descriptor->sub_descriptors));
url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
- get_buffer(pb, descriptor->sub_descriptors_refs, descriptor->sub_descriptors_count * sizeof(UID));
+ 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;
}
- for (i = 0; i < mxf->packages_count; i++) {
- if (mxf->packages[i]) {
- if (!memcmp(mxf->packages[i]->descriptor_ref, descriptor->uid, 16)) {
- mxf->packages[i]->descriptor = descriptor;
- return 0;
- }
- }
- }
- return -1;
+ descriptor->type = MultipleDescriptor;
+ return mxf_add_metadata_set(mxf, descriptor);
}
static void mxf_read_metadata_pixel_layout(ByteIOContext *pb, MXFDescriptor *descriptor)
ByteIOContext *pb = &mxf->fc->pb;
MXFDescriptor *descriptor = av_mallocz(sizeof(*descriptor));
int bytes_read = 0;
- int i, j;
while (bytes_read < klv->length) {
int tag = get_be16(pb);
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;
}
- for (i = 0; i < mxf->packages_count; i++) {
- if (mxf->packages[i]) {
- if (!memcmp(mxf->packages[i]->descriptor_ref, descriptor->uid, 16)) {
- mxf->packages[i]->descriptor = descriptor;
- return 0;
- } else if (mxf->packages[i]->descriptor) { /* MultipleDescriptor */
- for (j = 0; j < mxf->packages[i]->descriptor->sub_descriptors_count; j++) {
- if (!memcmp(mxf->packages[i]->descriptor->sub_descriptors_refs[j], descriptor->uid, 16)) {
- mxf->packages[i]->descriptor->sub_descriptors[j] = descriptor;
- return 0;
- }
- }
- }
- }
- }
- return -1;
+ descriptor->type = Descriptor;
+ return mxf_add_metadata_set(mxf, descriptor);
}
/* SMPTE RP224 http://www.smpte-ra.org/mdd/index.html */
-static const UID picture_essence_track_ul = { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x01,0x00,0x00,0x00 };
-static const UID sound_essence_track_ul = { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x02,0x00,0x00,0x00 };
+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 MXFCodecUL mxf_codec_uls[] = {
/* PictureEssenceCoding */
- { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x02,0x02,0x00 }, CODEC_ID_MPEG2VIDEO }, /* 422P@ML I-Frame */
- { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x04,0x03,0x00 }, CODEC_ID_MPEG2VIDEO }, /* 422P@HL Long GoP */
- { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x01,0x11,0x00 }, CODEC_ID_MPEG2VIDEO }, /* MP@ML Long GoP */
- { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x02,0x03,0x00 }, CODEC_ID_MPEG2VIDEO }, /* 422P@ML Long GoP */
- { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x03,0x03,0x00 }, CODEC_ID_MPEG2VIDEO }, /* MP@HL Long GoP */
- { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x20,0x02,0x03 }, CODEC_ID_MPEG4 }, /* XDCAM proxy_pal030926.mxf */
- { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x20,0x02,0x04 }, CODEC_ID_MPEG4 }, /* XDCAM Proxy C0023S01.mxf */
- { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x05 }, CODEC_ID_MPEG2VIDEO }, /* D-10 30Mbps PAL */
- { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x01 }, CODEC_ID_MPEG2VIDEO }, /* D-10 50Mbps PAL */
- { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x04,0x00 }, CODEC_ID_DVVIDEO }, /* DVCPRO50 PAL */
- { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x02,0x00 }, CODEC_ID_DVVIDEO }, /* DVCPRO25 PAL */
- { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x01,0x02,0x00 }, CODEC_ID_DVVIDEO }, /* DV25 IEC PAL */
- //{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00 }, CODEC_ID_JPEG2K }, /* JPEG2000 Codestream */
- { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x01,0x7F,0x00,0x00,0x00 }, CODEC_ID_RAWVIDEO }, /* Uncompressed */
+ { { 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,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 }, /* Uncompressed */
- { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x7F,0x00,0x00,0x00 }, CODEC_ID_PCM_S16LE },
- { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x02,0x02,0x01,0x7E,0x00,0x00,0x00 }, CODEC_ID_PCM_S16BE }, /* From Omneon MXF file */
- { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x01,0x01,0x00 }, CODEC_ID_PCM_ALAW },
- { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x04,0x04,0x02,0x02,0x02,0x03,0x01,0x01,0x00 }, CODEC_ID_PCM_ALAW }, /* XDCAM Proxy C0023S01.mxf */
- { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x01,0x00 }, CODEC_ID_AC3 },
- { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x05,0x00 }, CODEC_ID_MP2 }, /* MP2 or MP3 */
- //{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x1C,0x00 }, CODEC_ID_DOLBY_E }, /* Dolby-E */
+ { { 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 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 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 enum CodecID mxf_get_codec_id(const MXFCodecUL *uls, UID *uid)
+static const MXFCodecUL *mxf_get_codec_ul(const MXFCodecUL *uls, UID *uid)
{
while (uls->id != CODEC_ID_NONE) {
if(!memcmp(uls->uid, *uid, 16))
- return uls->id;
+ break;
uls++;
}
- return CODEC_ID_NONE;
+ 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)
+{
+ 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 (mxf->packages[i]->type == MaterialPackage) {
- material_package = mxf->packages[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;
}
}
}
for (i = 0; i < material_package->tracks_count; i++) {
- MXFTrack *material_track = material_package->tracks[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++) {
- component = material_track->sequence->structural_components[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 (!memcmp(mxf->packages[k]->package_uid, component->source_package_uid, 16)) {
- source_package = mxf->packages[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;
}
}
break;
}
for (k = 0; k < source_package->tracks_count; k++) {
- if (source_package->tracks[k]->track_id == component->source_track_id) {
- source_track = source_package->tracks[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;
}
}
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(source_track->sequence->data_definition_ul);
+ PRINT_KEY("data definition ul", source_track->sequence->data_definition_ul);
#endif
- if (!memcmp(source_track->sequence->data_definition_ul, picture_essence_track_ul, 16))
- st->codec->codec_type = CODEC_TYPE_VIDEO;
- else if (!memcmp(source_track->sequence->data_definition_ul, sound_essence_track_ul, 16))
- st->codec->codec_type = CODEC_TYPE_AUDIO;
- else
- st->codec->codec_type = CODEC_TYPE_DATA;
+ 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->sub_descriptors_count > 0) { /* SourcePackage has MultipleDescriptor */
+ if (source_package->descriptor->type == MultipleDescriptor) {
for (j = 0; j < source_package->descriptor->sub_descriptors_count; j++) {
- if (source_package->descriptor->sub_descriptors[j]) {
- if (source_package->descriptor->sub_descriptors[j]->linked_track_id == source_track->track_id) {
- descriptor = source_package->descriptor->sub_descriptors[j];
- break;
- }
+ 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 (sub_descriptor->linked_track_id == source_track->track_id) {
+ descriptor = sub_descriptor;
+ break;
}
}
- } else {
+ } 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(descriptor->essence_codec_ul);
+ PRINT_KEY("essence codec ul", descriptor->essence_codec_ul);
+ PRINT_KEY("essence container ul", descriptor->essence_container_ul);
#endif
- st->codec->codec_id = mxf_get_codec_id(mxf_codec_uls, &descriptor->essence_codec_ul);
+ /* 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 */
} 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;
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;
}
{ { 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;
+ 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)) {
const MXFMetadataReadTableEntry *function;
return -1;
}
#ifdef DEBUG
- PRINT_KEY(klv.key);
+ PRINT_KEY("read header", klv.key);
#endif
if (IS_KLV_KEY(klv.key, mxf_essence_element_key)) {
/* FIXME avoid seek */
static int mxf_read_close(AVFormatContext *s)
{
MXFContext *mxf = s->priv_data;
- int i, j, k;
+ int i;
- for (i = 0; i < mxf->packages_count; i++) {
- for (j = 0; j < mxf->packages[i]->tracks_count; j++) {
- for (k = 0; k < mxf->packages[i]->tracks[j]->sequence->structural_components_count; k++)
- av_freep(&mxf->packages[i]->tracks[j]->sequence->structural_components[k]);
- av_freep(&mxf->packages[i]->tracks[j]->sequence->structural_components_refs);
- av_freep(&mxf->packages[i]->tracks[j]->sequence->structural_components);
- av_freep(&mxf->packages[i]->tracks[j]->sequence);
- av_freep(&mxf->packages[i]->tracks[j]);
- }
- av_freep(&mxf->packages[i]->tracks_refs);
- av_freep(&mxf->packages[i]->tracks);
- if (mxf->packages[i]->descriptor) {
- for (k = 0; k < mxf->packages[i]->descriptor->sub_descriptors_count; k++)
- av_freep(&mxf->packages[i]->descriptor->sub_descriptors[k]);
- av_freep(&mxf->packages[i]->descriptor->sub_descriptors_refs);
- av_freep(&mxf->packages[i]->descriptor->sub_descriptors);
- }
- av_freep(&mxf->packages[i]->descriptor);
- av_freep(&mxf->packages[i]);
- }
av_freep(&mxf->packages_refs);
- av_freep(&mxf->packages);
- for (i = 0; i < mxf->essence_container_data_sets_count; i++)
- av_freep(&mxf->essence_container_data_sets[i]);
av_freep(&mxf->essence_container_data_sets_refs);
- av_freep(&mxf->essence_container_data_sets);
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;
}
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",
mxf_read_header,
mxf_read_packet,
mxf_read_close,
- NULL,
+ mxf_read_seek,
};