Use aspect ratio from mpeg2 video bitstream if known

bbc · Apr 22, 2024 · d73b650 · d73b650
1 parent 5212eb2
commit d73b650
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 1 deletion.
diff --git a/include/bmx/mxf_helper/MPEG2LGMXFDescriptorHelper.h b/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;

diff --git a/include/bmx/writer_helper/MPEG2LGWriterHelper.h b/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;

diff --git a/src/as02/AS02MPEG2LGTrack.cpp b/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;
 }

diff --git a/src/avid_mxf/AvidMPEG2LGTrack.cpp b/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;

diff --git a/src/mxf_helper/MPEG2LGMXFDescriptorHelper.cpp b/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;

diff --git a/src/mxf_op1a/OP1AMPEG2LGTrack.cpp b/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()

diff --git a/src/rdd9_mxf/RDD9MPEG2LGTrack.cpp b/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);

diff --git a/src/writer_helper/MPEG2LGWriterHelper.cpp b/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++;
 }
 

diff --git a/test/avid_mxf/test_mpeg2lg.cmake b/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")