highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mxfdec: Fix Avid AirSpeed files being misinterpreted as OP1a

Browse Source 
The "ECs != 1 -> OP1a" assumption was wrong. Luckily, the file that triggered
that behavior had two ECs, not zero. Hence distinguishing between them is
simple in this case.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Tomas Härdin 2012-03-02 11:33:28 +01:00 committed by Michael Niedermayer
parent bf2290a80c
commit 8c7721e709
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/mxfdec.c
View File

@ -510,13 +510,18 @@ static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size
else if (op[12] == 64&& op[13] == 1) mxf->op = OPSONYOpt; else if (op[12] == 64&& op[13] == 1) mxf->op = OPSONYOpt;
else if (op[12] == 0x10) { else if (op[12] == 0x10) {
/* SMPTE 390m: "There shall be exactly one essence container" /* SMPTE 390m: "There shall be exactly one essence container"
* 2011_DCPTEST_24FPS.V.mxf violates this and is frame wrapped, hence why we assume OP1a */ * The following block deals with files that violate this, namely:
* 2011_DCPTEST_24FPS.V.mxf - two ECs, OP1a
* abcdefghiv016f56415e.mxf - zero ECs, OPAtom, output by Avid AirSpeed */
if (nb_essence_containers != 1) { if (nb_essence_containers != 1) {
MXFOP op = nb_essence_containers ? OP1a : OPAtom;
/* only nag once */ /* only nag once */
if (!mxf->op) if (!mxf->op)
av_log(mxf->fc, AV_LOG_WARNING, "\"OPAtom\" with %u ECs - assuming OP1a\n", nb_essence_containers); av_log(mxf->fc, AV_LOG_WARNING, "\"OPAtom\" with %u ECs - assuming %s\n",
nb_essence_containers, op == OP1a ? "OP1a" : "OPAtom");
mxf->op = OP1a; mxf->op = op;
} else } else
mxf->op = OPAtom; mxf->op = OPAtom;
} else { } else {