# HG changeset patch # User bcoudurier # Date 1154606886 0 # Node ID 0ad43274c24714cdb82a761a4016df7bfefee4b5 # Parent 4e673fe9ac5e12d8c9ea3524c756b0938149bc5d skip run-in sequence before reading header diff -r 4e673fe9ac5e -r 0ad43274c247 mxf.c --- a/mxf.c Thu Aug 03 11:59:38 2006 +0000 +++ b/mxf.c Thu Aug 03 12:08:06 2006 +0000 @@ -165,6 +165,8 @@ 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 offset_t mxf_header_offset = 0; + #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", \ @@ -873,6 +875,11 @@ KLVPacket klv; mxf->fc = s; + dprintf("header offset %llx\n", mxf_header_offset); + if (url_fseek(&s->pb, mxf_header_offset, SEEK_SET) < 0) { + av_log(s, AV_LOG_ERROR, "error seeking to header offset\n"); + return -1; + } while (!url_feof(&s->pb)) { const MXFMetadataReadTableEntry *function; @@ -943,8 +950,10 @@ /* 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)) + if (IS_KLV_KEY(bufp, mxf_header_partition_pack_key)) { + mxf_header_offset = bufp - p->buf; return AVPROBE_SCORE_MAX; + } } return 0; }