mxfdec: Move FooterPartition to MXFContext and make sure it's never set to zero

[ffmpeg] / libavformat / mxfdec.c

diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 9adeb1feee68697bdb120604f7502b9cf71753b2..8ec4a7032df99a220e3f2792dd0a9361f520c661 100644 (file)
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -75,7 +75,6 @@ typedef struct {
     int complete;
     MXFPartitionType type;
     uint64_t previous_partition;
-    uint64_t footer_partition;
     int index_sid;
     int body_sid;
 } MXFPartition;
@@ -166,6 +165,7 @@ typedef struct {
     struct AVAES *aesc;
     uint8_t *local_tags;
     int local_tags_count;
+    uint64_t footer_partition;
 } MXFContext;
 
 enum MXFWrappingScheme {
@@ -402,6 +402,7 @@ static int mxf_read_partition_pack(void *arg, ByteIOContext *pb, int tag, int si
     MXFContext *mxf = arg;
     MXFPartition *partition;
     UID op;
+    uint64_t footer_partition;
 
     if (mxf->partitions_count+1 >= UINT_MAX / sizeof(*mxf->partitions))
         return AVERROR(ENOMEM);
@@ -432,16 +433,26 @@ static int mxf_read_partition_pack(void *arg, ByteIOContext *pb, int tag, int si
     partition->complete = uid[14] > 2;
     avio_skip(pb, 16);
     partition->previous_partition = avio_rb64(pb);
-    partition->footer_partition = avio_rb64(pb);
+    footer_partition = avio_rb64(pb);
     avio_skip(pb, 16);
     partition->index_sid = avio_rb32(pb);
     avio_skip(pb, 8);
     partition->body_sid = avio_rb32(pb);
     avio_read(pb, op, sizeof(UID));
 
+    /* some files don'thave FooterPartition set in every partition */
+    if (footer_partition) {
+        if (mxf->footer_partition && mxf->footer_partition != footer_partition) {
+            av_log(mxf->fc, AV_LOG_ERROR, "inconsistent FooterPartition value: %li != %li\n",
+                   mxf->footer_partition, footer_partition);
+        } else {
+            mxf->footer_partition = footer_partition;
+        }
+    }
+
     av_dlog(mxf->fc, "PartitionPack: PreviousPartition = 0x%lx, "
             "FooterPartition = 0x%lx, IndexSID = %i, BodySID = %i\n",
-            partition->previous_partition, partition->footer_partition,
+            partition->previous_partition, footer_partition,
             partition->index_sid, partition->body_sid);
 
     if      (op[12] == 1 && op[13] == 1) mxf->op = OP1a;
@@ -916,12 +927,12 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
             st->codec->sample_rate = descriptor->sample_rate.num / descriptor->sample_rate.den;
             /* TODO: implement CODEC_ID_RAWAUDIO */
             if (st->codec->codec_id == CODEC_ID_PCM_S16LE) {
-                if (descriptor->bits_per_sample == 24)
+                if (descriptor->bits_per_sample > 16 && descriptor->bits_per_sample <= 24)
                     st->codec->codec_id = CODEC_ID_PCM_S24LE;
                 else if (descriptor->bits_per_sample == 32)
                     st->codec->codec_id = CODEC_ID_PCM_S32LE;
             } else if (st->codec->codec_id == CODEC_ID_PCM_S16BE) {
-                if (descriptor->bits_per_sample == 24)
+                if (descriptor->bits_per_sample > 16 && descriptor->bits_per_sample <= 24)
                     st->codec->codec_id = CODEC_ID_PCM_S24BE;
                 else if (descriptor->bits_per_sample == 32)
                     st->codec->codec_id = CODEC_ID_PCM_S32BE;