+ MXF ULs refactoring

More ULs, especially ISXD & IAB
MediaArea · Nov 6, 2024 · b7764f0 · b7764f0
1 parent 07f916a
commit b7764f0
Show file tree

Hide file tree

Showing 17 changed files with 13,956 additions and 6,236 deletions.
diff --git a/Project/CodeBlocks/Library/MediaInfoLib.cbp b/Project/CodeBlocks/Library/MediaInfoLib.cbp
@@ -153,6 +153,7 @@
 		<Unit filename="..\..\..\Source\MediaInfo\Multiple\File_Mpeg_Psi.h" />
 		<Unit filename="..\..\..\Source\MediaInfo\Multiple\File_Mxf.cpp" />
 		<Unit filename="..\..\..\Source\MediaInfo\Multiple\File_Mxf.h" />
+		<Unit filename="..\..\..\Source\MediaInfo\Multiple\File_Mxf_Automated.h" />
 		<Unit filename="..\..\..\Source\MediaInfo\Multiple\File_Nsv.cpp" />
 		<Unit filename="..\..\..\Source\MediaInfo\Multiple\File_Nsv.h" />
 		<Unit filename="..\..\..\Source\MediaInfo\Multiple\File_Ogg.cpp" />

diff --git a/Project/MSVC2013/Library/MediaInfoLib.vcxproj.filters b/Project/MSVC2013/Library/MediaInfoLib.vcxproj.filters
@@ -1603,5 +1603,8 @@
     <ClInclude Include="..\..\..\Source\MediaInfo\Text\File_Pac_Codepages.h">
       <Filter>Header Files\Text</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Mxf_Automated.h">
+      <Filter>Header Files\Multiple</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/Project/MSVC2015/Library/MediaInfoLib.vcxproj.filters b/Project/MSVC2015/Library/MediaInfoLib.vcxproj.filters
@@ -1603,5 +1603,8 @@
     <ClInclude Include="..\..\..\Source\MediaInfo\Text\File_Pac_Codepages.h">
       <Filter>Header Files\Text</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Mxf_Automated.h">
+      <Filter>Header Files\Multiple</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/Project/MSVC2017/Library/MediaInfoLib.vcxproj.filters b/Project/MSVC2017/Library/MediaInfoLib.vcxproj.filters
@@ -1603,5 +1603,8 @@
     <ClInclude Include="..\..\..\Source\MediaInfo\Text\File_Pac_Codepages.h">
       <Filter>Header Files\Text</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Mxf_Automated.h">
+      <Filter>Header Files\Multiple</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/Project/MSVC2019/Library/MediaInfoLib.vcxproj.filters b/Project/MSVC2019/Library/MediaInfoLib.vcxproj.filters
@@ -1603,5 +1603,8 @@
     <ClInclude Include="..\..\..\Source\MediaInfo\Text\File_Pac_Codepages.h">
       <Filter>Header Files\Text</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Mxf_Automated.h">
+      <Filter>Header Files\Multiple</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/Project/MSVC2022/Library/MediaInfoLib.vcxproj b/Project/MSVC2022/Library/MediaInfoLib.vcxproj
@@ -527,6 +527,7 @@
     <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Ism.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Ivf.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Lxf.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Mxf_Automated.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Nsv.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_P2_Clip.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Pmp.h" />

diff --git a/Project/MSVC2022/Library/MediaInfoLib.vcxproj.filters b/Project/MSVC2022/Library/MediaInfoLib.vcxproj.filters
@@ -1603,5 +1603,8 @@
     <ClInclude Include="..\..\..\Source\MediaInfo\Text\File_Pac_Codepages.h">
       <Filter>Header Files\Text</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Mxf_Automated.h">
+      <Filter>Header Files\Multiple</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/Project/Qt/MediaInfoLib.pro b/Project/Qt/MediaInfoLib.pro
@@ -179,6 +179,7 @@ HEADERS += \
         ../../Source/MediaInfo/Multiple/File_MpegPs.h \
         ../../Source/MediaInfo/Multiple/File_MpegTs.h \
         ../../Source/MediaInfo/Multiple/File_Mxf.h \
+        ../../Source/MediaInfo/Multiple/File_Mxf_Automated.h \
         ../../Source/MediaInfo/Multiple/File_Nut.h \
         ../../Source/MediaInfo/Multiple/File_Ogg.h \
         ../../Source/MediaInfo/Multiple/File_Ogg_SubElement.h \

diff --git a/Source/MediaInfo/File__Analyse_Automatic.h b/Source/MediaInfo/File__Analyse_Automatic.h
@@ -1538,8 +1538,10 @@ enum other
     Other_Format_Profile,
     Other_Format_Compression,
     Other_Format_Settings,
+    Other_Format_Settings_Wrapping,
     Other_Format_AdditionalFeatures,
     Other_MuxingMode,
+    Other_MuxingMode_MoreInfo,
     Other_CodecID,
     Other_CodecID_String,
     Other_CodecID_Info,

diff --git a/Source/MediaInfo/File__Analyze_Streams.cpp b/Source/MediaInfo/File__Analyze_Streams.cpp
@@ -664,6 +664,11 @@ void File__Analyze::Get_LightLevel(Ztring &MaxCLL, Ztring &MaxFALL, int32u Divis
 //---------------------------------------------------------------------------
 size_t File__Analyze::Stream_Prepare (stream_t KindOfStream, size_t StreamPos)
 {
+    if (KindOfStream == Stream_Video && Count_Get(Stream_Video) == 1)
+        int A = 0;
+    if (KindOfStream == Stream_Other)
+        int A = 0;
+
     //Integrity
     if (KindOfStream>Stream_Max)
         return Error;
@@ -871,6 +876,9 @@ bool ShowSource_IsInList(video Value)
 //---------------------------------------------------------------------------
 void File__Analyze::Fill (stream_t StreamKind, size_t StreamPos, size_t Parameter, const Ztring &Value, bool Replace)
 {
+    if (StreamKind == Stream_Audio && Parameter == Audio_Format_Settings_Wrapping)
+        int A = 0;
+
     // Sanitize
     if (!Value.empty())
     {
@@ -1712,6 +1720,9 @@ void File__Analyze::Fill_Measure(stream_t StreamKind, size_t StreamPos, const ch
 //---------------------------------------------------------------------------
 void File__Analyze::Fill (stream_t StreamKind, size_t StreamPos, const char* Parameter, const Ztring &Value, bool Replace)
 {
+    if (string(Parameter) == "ovn_creation")
+        int A = 0;
+
     //Integrity
     if (StreamKind>Stream_Max || Parameter==NULL || Parameter[0]=='\0')
         return;

diff --git a/Source/MediaInfo/MediaInfo_Config_Automatic.cpp b/Source/MediaInfo/MediaInfo_Config_Automatic.cpp
@@ -5691,8 +5691,10 @@ void MediaInfo_Config_Other (ZtringListList &Info)
     "Format_Profile;;;Y NTY\n"
     "Format_Compression;;;Y NTY\n"
     "Format_Settings;;;Y NTY\n"
+    "Format_Settings_Wrapping;;;Y YTY\n"
     "Format_AdditionalFeatures;;;N YTY\n"
     "MuxingMode;;;Y YTY\n"
+    "MuxingMode_MoreInfo;;;Y NT\n"
     "CodecID;;;Y YTY\n"
     "CodecID/String;;;Y NT\n"
     "CodecID/Info;;;Y NT\n"