RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mxfdec: Consider OPAtom files that do not have exactly one EC to be OP1a 

This fixes demuxing of 2011_DCPTEST_24FPS.V.mxf.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Tomas Härdin 2012-01-26 13:21:43 +01:00 committed by Diego Biurrun
parent 9123950be0
commit 240ddbce56
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavformat/mxfdec.c
View File

@ -59,7 +59,7 @@ typedef enum {
} MXFPartitionType;
typedef enum {
OP1a,
OP1a = 1,
OP1b,
OP1c,
OP2a,
@ -410,6 +410,7 @@ static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size
MXFPartition *partition, *tmp_part;
UID op;
uint64_t footer_partition;
uint32_t nb_essence_containers;
if (mxf->partitions_count+1 >= UINT_MAX / sizeof(*mxf->partitions))
return AVERROR(ENOMEM);
@ -464,6 +465,7 @@ static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size
avio_skip(pb, 8);
partition->body_sid = avio_rb32(pb);
avio_read(pb, op, sizeof(UID));
nb_essence_containers = avio_rb32(pb);
/* some files don'thave FooterPartition set in every partition */
if (footer_partition) {
@ -501,9 +503,22 @@ static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size
else if (op[12] == 3 && op[13] == 1) mxf->op = OP3a;
else if (op[12] == 3 && op[13] == 2) mxf->op = OP3b;
else if (op[12] == 3 && op[13] == 3) mxf->op = OP3c;
else if (op[12] == 0x10) mxf->op = OPAtom;
else if (op[12] == 64&& op[13] == 1) mxf->op = OPSonyOpt;
else {
else if (op[12] == 0x10) {
/* SMPTE 390m: "There shall be exactly one essence container"
* 2011_DCPTEST_24FPS.V.mxf violates this and is frame wrapped,
* which is why we assume OP1a. */
if (nb_essence_containers != 1) {
/* only nag once */
if (!mxf->op)
av_log(mxf->fc, AV_LOG_WARNING,
"\"OPAtom\" with %u ECs - assuming OP1a\n",
nb_essence_containers);
mxf->op = OP1a;
} else
mxf->op = OPAtom;
} else {
av_log(mxf->fc, AV_LOG_ERROR, "unknown operational pattern: %02xh %02xh - guessing OP1a\n", op[12], op[13]);
mxf->op = OP1a;
}