Merge pull request #67 from bbc/philipn-mpeg2video-sd-aspect-ratio

Use parsed MPEG-2 video aspect ratio in descriptor

Author: philipnbbc

include/bmx/mxf_helper/MPEG2LGMXFDescriptorHelper.h

@@ -34,6 +34,7 @@
 
 
 #include <bmx/mxf_helper/PictureMXFDescriptorHelper.h>
+#include <bmx/essence_parser/MPEG2EssenceParser.h>
 
 
 
@@ -66,6 +67,7 @@ class MPEG2LGMXFDescriptorHelper : public PictureMXFDescriptorHelper
 
     virtual mxfpp::FileDescriptor* CreateFileDescriptor(mxfpp::HeaderMetadata *header_metadata);
     virtual void UpdateFileDescriptor();
+    void UpdateFileDescriptor(MPEG2EssenceParser *essence_parser);
 
 public:
     MXFFrameLayout GetFrameLayout() const;

include/bmx/writer_helper/MPEG2LGWriterHelper.h

@@ -35,6 +35,7 @@
 #include <vector>
 
 #include <bmx/essence_parser/MPEG2EssenceParser.h>
+#include <bmx/mxf_helper/MPEG2LGMXFDescriptorHelper.h>
 
 
 
@@ -55,6 +56,7 @@ class MPEG2LGWriterHelper
     MPEG2LGWriterHelper();
     ~MPEG2LGWriterHelper();
 
+    void SetDescriptorHelper(MPEG2LGMXFDescriptorHelper *descriptor_helper);
     void SetFlavour(Flavour flavour);
 
 public:
@@ -85,6 +87,7 @@ class MPEG2LGWriterHelper
     uint32_t GetBitRate() const             { return mBitRate; }
 
 private:
+    MPEG2LGMXFDescriptorHelper *mDescriptorHelper;
     Flavour mFlavour;
 
     MPEG2EssenceParser mEssenceParser;

src/as02/AS02MPEG2LGTrack.cpp

@@ -63,6 +63,7 @@ AS02MPEG2LGTrack::AS02MPEG2LGTrack(AS02Clip *clip, uint32_t track_index, Essence
 {
     mTrackNumber = MXF_MPEG_PICT_TRACK_NUM(0x01, MXF_MPEG_PICT_FRAME_WRAPPED_EE_TYPE, 0x00);
     mEssenceElementKey = VIDEO_ELEMENT_KEY;
+    mWriterHelper.SetDescriptorHelper(dynamic_cast<MPEG2LGMXFDescriptorHelper*>(mDescriptorHelper));
 
     mIndexStartPosition = 0;
 }

src/avid_mxf/AvidMPEG2LGTrack.cpp

@@ -53,6 +53,7 @@ using namespace mxfpp;
 AvidMPEG2LGTrack::AvidMPEG2LGTrack(AvidClip *clip, uint32_t track_index, EssenceType essence_type, File *file)
 : AvidPictureTrack(clip, track_index, essence_type, file)
 {
+    mWriterHelper.SetDescriptorHelper(dynamic_cast<MPEG2LGMXFDescriptorHelper*>(mDescriptorHelper));
     mWriterHelper.SetFlavour(MPEG2LGWriterHelper::AVID_FLAVOUR);
 
     mTrackNumber = MXF_AVID_MPEG_PICT_TRACK_NUM;

src/avid_mxf/AvidTrack.cpp

@@ -648,8 +648,6 @@ void AvidTrack::CreateHeaderMetadata()
     if (track_growing_duration >= 0)
         descriptor->setContainerDuration(track_growing_duration);
     descriptor->setLinkedTrackID(AV_TRACK_ID);
-    // replace essence container label with generic AAF-KLV (aka MXF) label
-    descriptor->setEssenceContainer(MXF_EC_L(AvidAAFKLVEssenceContainer));
 
     // Preface - ContentStorage - EssenceContainerData
     EssenceContainerData *ess_container_data = new EssenceContainerData(mHeaderMetadata);

src/mxf_helper/AVCMXFDescriptorHelper.cpp

@@ -279,6 +279,10 @@ void AVCMXFDescriptorHelper::UpdateFileDescriptor()
     BMX_ASSERT(cdci_descriptor);
 
     cdci_descriptor->setPictureEssenceCoding(SUPPORTED_ESSENCE[mEssenceIndex].pc_label);
+
+    // override setting of MXF_EC_L(AvidAAFKLVEssenceContainer) for AVC
+    if ((mFlavour & MXFDESC_AVID_FLAVOUR))
+        cdci_descriptor->setEssenceContainer(ChooseEssenceContainerUL());
 }
 
 void AVCMXFDescriptorHelper::UpdateFileDescriptor(FileDescriptor *file_desc_in)

src/mxf_helper/MPEG2LGMXFDescriptorHelper.cpp

@@ -441,6 +441,17 @@ void MPEG2LGMXFDescriptorHelper::UpdateFileDescriptor()
     }
 }
 
+void MPEG2LGMXFDescriptorHelper::UpdateFileDescriptor(MPEG2EssenceParser *essence_parser)
+{
+    UpdateFileDescriptor();
+
+    GenericPictureEssenceDescriptor *picture_descriptor = dynamic_cast<GenericPictureEssenceDescriptor*>(mFileDescriptor);
+    BMX_ASSERT(picture_descriptor);
+
+    if (essence_parser->HaveKnownAspectRatio())
+        picture_descriptor->setAspectRatio(essence_parser->GetAspectRatio());
+}
+
 MXFFrameLayout MPEG2LGMXFDescriptorHelper::GetFrameLayout() const
 {
     return SUPPORTED_ESSENCE[mEssenceIndex].frame_layout;

src/mxf_helper/MXFDescriptorHelper.cpp

@@ -168,7 +168,12 @@ void MXFDescriptorHelper::SetFlavour(int flavour)
 
 void MXFDescriptorHelper::UpdateFileDescriptor()
 {
-    mFileDescriptor->setEssenceContainer(ChooseEssenceContainerUL());
+    if ((mFlavour & MXFDESC_AVID_FLAVOUR)) {
+        // replace essence container label with generic AAF-KLV (aka MXF) label
+        mFileDescriptor->setEssenceContainer(MXF_EC_L(AvidAAFKLVEssenceContainer));
+    } else {
+        mFileDescriptor->setEssenceContainer(ChooseEssenceContainerUL());
+    }
     mFileDescriptor->setSampleRate(mSampleRate);
 }
 

src/mxf_op1a/OP1AMPEG2LGTrack.cpp

@@ -53,6 +53,7 @@ OP1AMPEG2LGTrack::OP1AMPEG2LGTrack(OP1AFile *file, uint32_t track_index, uint32_
 {
     mTrackNumber = MXF_MPEG_PICT_TRACK_NUM(0x01, MXF_MPEG_PICT_FRAME_WRAPPED_EE_TYPE, 0x00);
     mEssenceElementKey = VIDEO_ELEMENT_KEY;
+    mWriterHelper.SetDescriptorHelper(dynamic_cast<MPEG2LGMXFDescriptorHelper*>(mDescriptorHelper));
 }
 
 OP1AMPEG2LGTrack::~OP1AMPEG2LGTrack()

src/rdd9_mxf/RDD9MPEG2LGTrack.cpp

@@ -53,6 +53,7 @@ RDD9MPEG2LGTrack::RDD9MPEG2LGTrack(RDD9File *file, uint32_t track_index, uint32_
 {
     mPictureDescriptorHelper = dynamic_cast<PictureMXFDescriptorHelper*>(mDescriptorHelper);
     BMX_ASSERT(mPictureDescriptorHelper);
+    mWriterHelper.SetDescriptorHelper(dynamic_cast<MPEG2LGMXFDescriptorHelper*>(mDescriptorHelper));
     mValidator = 0;
 
     mPictureDescriptorHelper->SetAspectRatio(ASPECT_RATIO_16_9);

src/writer_helper/MPEG2LGWriterHelper.cpp

@@ -51,6 +51,7 @@ using namespace bmx;
 
 MPEG2LGWriterHelper::MPEG2LGWriterHelper()
 {
+    mDescriptorHelper = 0;
     mFlavour = DEFAULT_FLAVOUR;
     mPosition = 0;
     mPrevKeyFramePosition = -1;
@@ -84,6 +85,11 @@ MPEG2LGWriterHelper::~MPEG2LGWriterHelper()
 {
 }
 
+void MPEG2LGWriterHelper::SetDescriptorHelper(MPEG2LGMXFDescriptorHelper *descriptor_helper)
+{
+    mDescriptorHelper = descriptor_helper;
+}
+
 void MPEG2LGWriterHelper::SetFlavour(Flavour flavour)
 {
     mFlavour = flavour;
@@ -222,6 +228,9 @@ void MPEG2LGWriterHelper::ProcessFrame(const unsigned char *data, uint32_t size)
         mKeyFrameTemporalReference = mTemporalReference;
     }
 
+    if (mPosition == 0 && mDescriptorHelper)
+        mDescriptorHelper->UpdateFileDescriptor(&mEssenceParser);
+
     mPosition++;
 }
 

test/ard_zdf_hdf/rdd9_422p_1080i50.md5

@@ -1 +1 @@
-f1aa95aad6519480d2f69c125d47d0bf
+bad02518507a654682ec58d3dc1ada3c

test/as02/d10_30.md5s

@@ -1 +1 @@
-a5aee1b8f2b960598538702662bfa2cf;ab07fec8c17208d34e0b290dd279f6ac;d8b021e1b8bc3bd3796676b0b5e8f594;16ff89dda611b560eda0739fd90d0214
+a5aee1b8f2b960598538702662bfa2cf;d34019490530640eb647b03085843957;d8b021e1b8bc3bd3796676b0b5e8f594;16ff89dda611b560eda0739fd90d0214

test/as02/d10_40.md5s

@@ -1 +1 @@
-94046f5c90f3aa07e3385761b8a510ce;51034c94d12ef7b85a6a7f57085531c5;d8b021e1b8bc3bd3796676b0b5e8f594;16ff89dda611b560eda0739fd90d0214
+94046f5c90f3aa07e3385761b8a510ce;afb9e0f010a78247378fb75f6d53a0b2;d8b021e1b8bc3bd3796676b0b5e8f594;16ff89dda611b560eda0739fd90d0214

test/as02/d10_50.md5s

@@ -1 +1 @@
-6bfa58b2bee4dbff150e4694bed74db6;073c06f920d870b522c46b54a4270461;d8b021e1b8bc3bd3796676b0b5e8f594;16ff89dda611b560eda0739fd90d0214
+6bfa58b2bee4dbff150e4694bed74db6;250d42bc12b18d6cfb1d8ddb1d645157;d8b021e1b8bc3bd3796676b0b5e8f594;16ff89dda611b560eda0739fd90d0214

test/as02/mpeg2lg_422p_hl_1080i.md5s

@@ -1 +1 @@
-f5f5b68c8e9b06b79ef6e9d961c6751c;3931efc0db1187e141cc76ce9c5ff230;a8714959eca95a9c8abeb2c224a22b6c;893379a98fe760b04e877c53ab2ac983
+f5f5b68c8e9b06b79ef6e9d961c6751c;b56113bc316dab3debf6065c85b80a33;a8714959eca95a9c8abeb2c224a22b6c;893379a98fe760b04e877c53ab2ac983

test/as02/mpeg2lg_mp_h14_1080i.md5s

@@ -1 +1 @@
-6acaff85d141c4e07453c258cce278dc;936a7cf8e363cf4dd6948d4cb2a55967;a8714959eca95a9c8abeb2c224a22b6c;893379a98fe760b04e877c53ab2ac983
+6acaff85d141c4e07453c258cce278dc;deaa06dc046d85562cbdb2e86f6a450d;a8714959eca95a9c8abeb2c224a22b6c;893379a98fe760b04e877c53ab2ac983

test/as02/mpeg2lg_mp_hl_1920_1080i.md5s

@@ -1 +1 @@
-bac49a2fd4dbfdffeb549fdfc0de5654;820a339b74d24327b3c6eedd6b9835e0;a8714959eca95a9c8abeb2c224a22b6c;893379a98fe760b04e877c53ab2ac983
+bac49a2fd4dbfdffeb549fdfc0de5654;f49125555cdb550e160cdc927522c1e3;a8714959eca95a9c8abeb2c224a22b6c;893379a98fe760b04e877c53ab2ac983

test/as10/high_hd_2014_rb.md5

@@ -1 +1 @@
-3a012e270b9af16d148e1e6c3eaa0630
+bfed98706a7224560f11e5ebe67db6c4

test/as10/high_hd_2014_tw.md5

@@ -1 +1 @@
-2be49778a30d18cb51bd12c74787e0d4
+443c68e668852387e2b438e524709554

test/as11/d10_50.md5

@@ -1 +1 @@
-8dc6d0146128d45851f307a7ca0a2a95
+4774f9d092b7e41f4a7eae85cf87c7ac

test/as11/mpeg2lg_422p_hl_1080i.md5

@@ -1 +1 @@
-db7dca43ec4a70f6213b3bac82e95516
+1db8d1899b16ff0da6802468e3f66380

test/avid_mxf/d10_30.md5s

@@ -1 +1 @@
-6288fa4e85299a7539c8667243aa0f46;8cd5ddceb3e3cc3e38128c11d95d9521;eb9a969918e345f3a813f66029791d60
+c75cf21ceb03ada67935a7a2d4566b5f;8cd5ddceb3e3cc3e38128c11d95d9521;eb9a969918e345f3a813f66029791d60

test/avid_mxf/d10_40.md5s

@@ -1 +1 @@
-0db2321d67fe4a6b2719dcb2e84bcf1f;8cd5ddceb3e3cc3e38128c11d95d9521;eb9a969918e345f3a813f66029791d60
+ea55a386bcac85f86fde36a4eae2aa99;8cd5ddceb3e3cc3e38128c11d95d9521;eb9a969918e345f3a813f66029791d60

test/avid_mxf/d10_50.md5s

@@ -1 +1 @@
-4f3bde3a104a7af0487c7bbe09ad0dba;8cd5ddceb3e3cc3e38128c11d95d9521;eb9a969918e345f3a813f66029791d60
+3dce2618baab3d4a879a0da44b2d4e99;8cd5ddceb3e3cc3e38128c11d95d9521;eb9a969918e345f3a813f66029791d60

test/avid_mxf/mpeg2lg_422p_hl_1080i.md5s

@@ -1 +1 @@
-f189845c35fbe0a69d36b181d85937f9;0ece8877ab256657df705de6a01a8a48;f323a74f1505abc8bf201eeef07e0089
+ed79a21d4f918f7164cdf37622f90cf2;0ece8877ab256657df705de6a01a8a48;f323a74f1505abc8bf201eeef07e0089

test/avid_mxf/mpeg2lg_mp_h14_1080i.md5s

@@ -1 +1 @@
-d7628e1083ec63520e8f415f07f61556;0ece8877ab256657df705de6a01a8a48;f323a74f1505abc8bf201eeef07e0089
+fcc05c86d169936e07d305b6b5cb1b76;0ece8877ab256657df705de6a01a8a48;f323a74f1505abc8bf201eeef07e0089

test/avid_mxf/mpeg2lg_mp_hl_1920_1080i.md5s

@@ -1 +1 @@
-fbd8e5365fbd58c4a4908cd2e78319f7;0ece8877ab256657df705de6a01a8a48;f323a74f1505abc8bf201eeef07e0089
+13a2b871633f523c2189244409c605cf;0ece8877ab256657df705de6a01a8a48;f323a74f1505abc8bf201eeef07e0089

test/avid_mxf/test_mpeg2lg.cmake

@@ -1,4 +1,4 @@
-# Test creating an Avid MXF file containing AVC video and 2 PCM tracks
+# Test creating an Avid MXF file containing MPEG2 video and 2 PCM tracks
 
 include("${TEST_SOURCE_DIR}/test_common.cmake")
 

test/bmxtranswrap/d10_50_d10_op1a.md5

@@ -1 +1 @@
-8e1f11662563ea1d0af0ec9b27c1466b
+63905d1fe92d72aaa89cbbb62a0bb3dd

test/bmxtranswrap/d10_50_op1a_d10.md5

@@ -1 +1 @@
-487ae11fe97e410b7d2fd9e2074947e2
+c1881c8a93cb188d265ffbd2d8bb9c9e

test/create_test_essence.cpp

@@ -50,6 +50,9 @@
 #define MPEG_P_FRAME_TYPE           0x02
 #define MPEG_B_FRAME_TYPE           0x03
 
+#define MPEG_4_3_ASPECT_RATIO       0x02
+#define MPEG_16_9_ASPECT_RATIO      0x03
+
 
 typedef enum
 {
@@ -112,7 +115,9 @@ typedef enum
     TYPE_RDD36_4444                     = 56,
     TYPE_16BIT_PCM_SAMPLES              = 57,
     TYPE_RDD36_422_ITU2020              = 58,
-    TYPE_END                            = 59,
+    TYPE_MPEG2LG_MP_ML_576I             = 59,
+    TYPE_MPEG2LG_MP_ML_576I_4_3         = 60,
+    TYPE_END                            = 61,
 } EssenceType;
 
 typedef struct
@@ -128,6 +133,7 @@ typedef struct
     uint32_t v_size;
     uint32_t temporal_ref;
     uint8_t frame_type;
+    uint8_t aspect_ratio;
 } MPEGInfo;
 
 
@@ -226,6 +232,7 @@ static void fill_mpeg_frame(unsigned char *data, uint32_t data_size, const MPEGI
         set_offset = 0;
         set_mpeg_bits(data, set_offset * 8 + 32, 12, info->h_size);
         set_mpeg_bits(data, set_offset * 8 + 44, 12, info->v_size);
+        set_mpeg_bits(data, set_offset * 8 + 56, 4,  info->aspect_ratio);
         set_mpeg_bits(data, set_offset * 8 + 64, 18, info->bit_rate);
         set_offset += 100;
 
@@ -397,6 +404,7 @@ static void write_d10(FILE *file, int type, unsigned int duration)
     mpeg_info.low_delay      = true;
     mpeg_info.h_size         = 720;
     mpeg_info.v_size         = 608;
+    mpeg_info.aspect_ratio   = MPEG_16_9_ASPECT_RATIO;
     mpeg_info.frame_type     = MPEG_I_FRAME_TYPE;
 
     uint32_t frame_size;
@@ -424,12 +432,14 @@ static void write_d10(FILE *file, int type, unsigned int duration)
         write_buffer(file, data, frame_size);
 }
 
-static void write_mpeg2lg(FILE *file, int type, unsigned int duration, bool low_delay, bool closed_gop)
+static void write_mpeg2lg(FILE *file, int type, unsigned int duration, bool low_delay, bool closed_gop,
+                          uint8_t aspect_ratio = MPEG_16_9_ASPECT_RATIO)
 {
     MPEGInfo mpeg_info;
     memset(&mpeg_info, 0, sizeof(mpeg_info));
     mpeg_info.is_progressive = false;
     mpeg_info.low_delay      = low_delay;
+    mpeg_info.aspect_ratio   = aspect_ratio;
 
     uint32_t i_frame_size, non_i_frame_size;
     switch (type)
@@ -482,6 +492,15 @@ static void write_mpeg2lg(FILE *file, int type, unsigned int duration, bool low_
             mpeg_info.v_size        = 1080;
             mpeg_info.bit_rate      = (35 * 1000 * 1000) / 400;
             break;
+        case TYPE_MPEG2LG_MP_ML_576I:
+            i_frame_size     = 19500;
+            non_i_frame_size = 16500;
+            mpeg_info.profile_level = 0x72;
+            mpeg_info.chroma_format = 1;
+            mpeg_info.h_size        = 720;
+            mpeg_info.v_size        = 576;
+            mpeg_info.bit_rate      = (10 * 1000 * 1000) / 400;
+            break;
         case TYPE_MPEG2LG_MP_H14_1080I:
         case TYPE_MPEG2LG_MP_H14_1080P:
         default:
@@ -1122,11 +1141,15 @@ int main(int argc, const char **argv)
         case TYPE_MPEG2LG_MP_HL_1080P_1440:
         case TYPE_MPEG2LG_422P_HL_720P:
         case TYPE_MPEG2LG_MP_HL_720P:
+        case TYPE_MPEG2LG_MP_ML_576I:
             write_mpeg2lg(file, type, duration, true, false);
             break;
         case TYPE_AS10_MPEG2LG_422P_HL_1080I:
             write_mpeg2lg(file, TYPE_MPEG2LG_422P_HL_1080I, duration, false, true);
             break;
+        case TYPE_MPEG2LG_MP_ML_576I_4_3:
+            write_mpeg2lg(file, type, duration, true, false, MPEG_4_3_ASPECT_RATIO);
+            break;
         case TYPE_UNC_SD:
         case TYPE_UNC_HD_1080I:
         case TYPE_UNC_HD_1080P:

test/d10_mxf/d10_30_25.md5

@@ -1 +1 @@
-0f70d9f846a2865ec234aee9590be9ff
+d40abc3ef4926830de25b684373457a6

test/d10_mxf/d10_30_2997.md5

@@ -1 +1 @@
-842e24656f5b69ab085eacc505ddc780
+caaf8b0c001c25c67d99b91bbb725556

test/d10_mxf/d10_40_25.md5

@@ -1 +1 @@
-afd5f51df4561337c129cb01214acdc4
+f3e7466b779d4e502feb01cf401edbee

test/d10_mxf/d10_40_2997.md5

@@ -1 +1 @@
-6e62f6adec11065622203c7e75cc2b38
+710393a8627ab511866ef1b717a94d05

test/d10_mxf/d10_50_25.md5

@@ -1 +1 @@
-348bd11e46867293aafe2a37c840d099
+59a2b344b0f36b5352ed2e42f83aa77c

test/d10_mxf/d10_50_2997.md5

@@ -1 +1 @@
-23d2a8765e29772fdd6d8b7666053be9
+ed67035576138428504035391cefcedf

test/growing_file/growing_file.md5

@@ -1 +1 @@
-12c3d2fda3b1efdaf8d34bd4c66aab25
+2c0703daa26c571738c6f313cfd2b054

test/mxf_op1a/CMakeLists.txt

@@ -9,6 +9,7 @@ set(tests
     dv
     indexfollows
     mpeg2lg
+    mpeg2lg_576i
     rdd36
     soundonly
     unc

test/mxf_op1a/d10_30.md5

@@ -1 +1 @@
-d3ca997e1f0dafbb0b48b5f168cf04a9
+f302f15bac0f81333a3412e820486497