Skip to content

F
ffmpeg
Commit 0bcada9f authored by Tomas Härdin's avatar Tomas Härdin Committed by Michael Niedermayer
Browse files
Options

mxfdec: Add Avid's essence element key 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 1e14bfc1
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
libavformat/mxfdec.c
View file @ 0bcada9f
......@@ -221,6 +221,7 @@ typedef struct {
/* 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,0x01,0x0d,0x01,0x03,0x01 };
static const uint8_t mxf_avid_essence_element_key[] = { 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0e,0x04,0x03,0x01 };
static const uint8_t mxf_system_item_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x03,0x01,0x04 };
static const uint8_t mxf_klv_key[] = { 0x06,0x0e,0x2b,0x34 };
/* complete keys to match */
......@@ -393,7 +394,8 @@ static int mxf_read_packet_old(AVFormatContext *s, AVPacket *pkt)
}
return 0;
}
if (IS_KLV_KEY(klv.key, mxf_essence_element_key)) {
if (IS_KLV_KEY(klv.key, mxf_essence_element_key) ||
IS_KLV_KEY(klv.key, mxf_avid_essence_element_key)) {
int index = mxf_get_stream_index(s, &klv);
if (index < 0) {
av_log(s, AV_LOG_ERROR, "error getting stream index %d\n", AV_RB32(klv.key+12));
......@@ -1661,6 +1663,7 @@ static int mxf_read_header(AVFormatContext *s, AVFormatParameters *ap)
av_dlog(s, "size %"PRIu64" offset %#"PRIx64"\n", klv.length, klv.offset);
if (IS_KLV_KEY(klv.key, mxf_encrypted_triplet_key) ||
IS_KLV_KEY(klv.key, mxf_essence_element_key) ||
IS_KLV_KEY(klv.key, mxf_avid_essence_element_key) ||
IS_KLV_KEY(klv.key, mxf_system_item_key)) {
if (!mxf->current_partition->essence_offset) {
/* for OP1a we compute essence_offset
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment