Merge pull request #2457 from JeromeMartinez/MXF_ADM_Profiles

MXF: crosscheck of ADM profiles

Author: JeromeMartinez

Source/MediaInfo/Audio/File_Adm.cpp

@@ -7704,6 +7704,12 @@ void File_Adm::Streams_Fill()
     File_Adm_Private->clear();
 }
 
+//---------------------------------------------------------------------------
+void File_Adm::Streams_Finish()
+{
+    Streams_Finish_Conformance();
+}
+
 //***************************************************************************
 // Buffer - File header
 //***************************************************************************

Source/MediaInfo/Audio/File_Adm.h

@@ -51,6 +51,7 @@ private :
     //Streams management
     void Streams_Accept();
     void Streams_Fill();
+    void Streams_Finish();
 
     //Buffer - File header
     bool FileHeader_Begin();

Source/MediaInfo/Multiple/File_Mxf.cpp

@@ -2428,6 +2428,10 @@ void File_Mxf::Streams_Finish()
         Merge(*DolbyAudioMetadata, Stream_Audio, 0, 0);
     if (Adm)
     {
+        Fill(Adm);
+        #if defined(MEDIAINFO_ADM_YES)
+        CompareAdmProfiles();
+        #endif
         Finish(Adm);
         Merge(*Adm, Stream_Audio, 0, 0);
     }
@@ -2472,7 +2476,7 @@ void File_Mxf::Streams_Finish()
     //Commercial names
     Streams_Finish_CommercialNames();
 
-    Merge_Conformance();
+    Streams_Finish_Conformance();
 }
 
 //---------------------------------------------------------------------------
@@ -10908,8 +10912,15 @@ void File_Mxf::RIFFChunkStreamID_link1()
 void File_Mxf::ADMProfileLevelULBatch()
 {
     VECTOR(16);
+    set<int128u> List;
     for (int32u i=0; i<Count; i++)
-        Skip_UUID(                                              "UUID");
+    {
+        int128u UUID;
+        Get_UUID (UUID,                                         "UUID"); Param_Info1(Mxf_Param_Info((int32u)UUID.hi, UUID.lo)); Element_Info1(Mxf_Param_Info((int32u)UUID.hi, UUID.lo));
+        List.insert(UUID);
+    }
+
+    ADMProfileLevelULBatch_List[InstanceUID] = std::move(List);
 }
 
 //---------------------------------------------------------------------------
@@ -11345,25 +11356,6 @@ void File_Mxf::MGAMetadataSectionLinkID()
     Skip_UUID(                                                  "UUID");
 }
 
-//---------------------------------------------------------------------------
-void File_Mxf::SADMMetadataSectionLinkID()
-{
-    //Parsing
-    Skip_UUID(                                                  "UUID");
-}
-
-//---------------------------------------------------------------------------
-void File_Mxf::SADMProfileLevelULBatch()
-{
-    //Parsing
-    VECTOR(16);
-    for (int32u i=0; i<Count; i++)
-    {
-        //Parsing
-        Skip_UUID(                                              "UUID");
-    }
-}
-
 //---------------------------------------------------------------------------
 void File_Mxf::MultipleDescriptor_FileDescriptors()
 {
@@ -16019,6 +16011,87 @@ void File_Mxf::Descriptor_Fill(const char* Name, const Ztring& Value)
         Info->second = Value;
 }
 
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_ADM_YES)
+struct adm_ul_to_string
+{
+    int64u UL;
+    const char* Name;
+};
+static adm_ul_to_string Mxf_ADM_UL_To_String[] = {
+    { 0x0402021102010000LL, "AdvSS Emission, Version 1, Level 0" },
+    { 0x0402021102020000LL, "AdvSS Emission, Version 1, Level 1" },
+    { 0x0402021102030000LL, "AdvSS Emission, Version 1, Level 2" },
+    { 0x0D02020101000000LL, "EBU Production, Version 1"},
+    { 0x0E09010106010100LL, "Dolby Atmos Master, Version 1"},
+    { 0x0E09010106010200LL, "Dolby Atmos Master, Version 1"}, // 1.1
+    { 0x0E09010106020100LL, "Dolby E Emission, Version 1, Level 1"},
+};
+void File_Mxf::CompareAdmProfiles()
+{
+    if (ADMProfileLevelULBatch_List.empty() || ADMProfileLevelULBatch_List.size() > 1)
+        return; // TODO: support multiple ADMProfileLevelULBatch
+
+    std::set<string> Profile_List_Container;
+    auto CanNotCompare = false;
+    for (const auto& Item : ADMProfileLevelULBatch_List.cbegin()->second)
+    {
+        const char* Item_String = nullptr;
+        for (const auto& UL_To_String : Mxf_ADM_UL_To_String)
+        {
+            if (Item.lo == UL_To_String.UL)
+            {
+                Item_String = UL_To_String.Name;
+                break;
+            }
+        }
+
+        if (!Item_String)
+        {
+            CanNotCompare = true;
+            continue;
+        }
+
+        Profile_List_Container.insert(Item_String);
+    }
+
+    auto Max = Adm->Count_Get(Stream_Audio, 0);
+    std::set<string> Profile_List_Stream;
+    for (size_t Pos = 0; Pos < Max; Pos++)
+    {
+        const auto& Name = Adm->Retrieve_Const(Stream_Audio, 0, Pos, Info_Name);
+        if ((Name.size() < 22 || Name.size() > 23 || Name.rfind(__T("AdmProfile AdmProfile"), 0)) && Name != __T("AdmProfile"))
+            continue;
+
+        Profile_List_Stream.insert(Adm->Retrieve_Const(Stream_Audio, 0, Pos, Info_Text).To_UTF8());
+    }
+
+    for (const auto& Profile_Container : Profile_List_Container)
+    {
+        const auto Profile_Stream = Profile_List_Stream.find(Profile_Container);
+        if (Profile_Stream == Profile_List_Stream.end())
+            Adm->Fill_Conformance("Crosscheck AdmProfile", '\"' + Profile_Container + "\" is listed in the container but not found in the ADM content");
+        else
+            Profile_List_Stream.erase(Profile_Stream);
+    }
+
+    for (const auto& Profile_Stream : Profile_List_Stream)
+    {
+        auto IsKnown = false;
+        for (const auto& UL_To_String : Mxf_ADM_UL_To_String)
+        {
+            if (Profile_Stream == UL_To_String.Name)
+            {
+                IsKnown = true;
+                break;
+            }
+        }
+        if (IsKnown && !CanNotCompare)
+            Adm->Fill_Conformance("Crosscheck AdmProfile", '\"' + Profile_Stream + "\" is not listed in the container but found in the ADM content");
+    }
+}
+#endif
+
 } //NameSpace
 
 #endif //MEDIAINFO_MXF_*

Source/MediaInfo/Multiple/File_Mxf.h

@@ -421,8 +421,8 @@ protected :
     void MGAAudioMetadataIdentifier();                          //
     void MGAAudioMetadataPayloadULArray();                      //
     void MGAMetadataSectionLinkID();                            //
-    void SADMMetadataSectionLinkID();                           //
-    void SADMProfileLevelULBatch();                             //
+    void SADMMetadataSectionLinkID() { MGAMetadataSectionLinkID(); }
+    void SADMProfileLevelULBatch() { ADMProfileLevelULBatch(); }
     void MPEGAudioBitRate();                         //
     void MultipleDescriptor_FileDescriptors();                  //3F01
     void RFC5646SpokenLanguage();
@@ -1459,6 +1459,8 @@ protected :
     int32u ADMChannelMapping_LocalChannelID;
     string ADMChannelMapping_ADMAudioTrackUID;
     std::bitset<2> ADMChannelMapping_Presence;
+    std::map<int128u, set<int128u> > ADMProfileLevelULBatch_List;
+    void CompareAdmProfiles();
     #endif
     #if defined(MEDIAINFO_IAB_YES)
     File__Analyze* Adm_ForLaterMerge;

Source/MediaInfo/Multiple/File_Mxf_Automated.h

@@ -4974,6 +4974,9 @@ C(0402020204010000, "MPEG-1 Audio Coding")
 C(0402020204020000, "MPEG-2 Audio Coding")
 C(0402020204030000, "MPEG-2 Advanced Audio Coding")
 C(0402020204040000, "MPEG-4 Advanced Audio Coding")
+C(0402021102010000, "AdvSS Emission Profile, Version 1, Level 0")
+C(0402021102020000, "AdvSS Emission Profile, Version 1, Level 1")
+C(0402021102030000, "AdvSS Emission Profile, Version 1, Level 2")
 C(0403000000000000, "Data Essence")
 C(0403010000000000, "Generic Event Text Essence")
 C(0403010100000000, "Generic Subtitle  Essence")
@@ -5239,6 +5242,7 @@ C(0D01130101040000, "AAF AIFF-AIFC Container")
 C(0D01130101040100, "AAF AIFF-AIFC Audio Container")
 C(0D02000000000000, "EBU/UER")
 C(0D02010000000000, "EBUCore")
+C(0D02020101000000, "EBU Production Profile")
 C(0D03000000000000, "Pro-MPEG Forum")
 C(0D04000000000000, "BBC")
 C(0D04010000000000, "Archive Preservation Project")
@@ -5320,6 +5324,9 @@ C(0E09010105020000, "Soundfield Group 5.1.4")
 C(0E09010105040000, "Soundfield Group 7.1.4")
 C(0E09010105060000, "Soundfield Group 9.1.4")
 C(0E09010105070000, "Soundfield Group 9.1.6")
+C(0E09010106010100, "Dolby Atmos Master ADM v1.0")
+C(0E09010106010200, "Dolby Atmos Master ADM v1.1")
+C(0E09010106020100, "Dolby E ADM Profile v1.0")
 C(0E09060400000000, "Immersive Audio Coding")
 C(0E09060500000000, "MXF-GC IAData Frame Wrapped")
 C(0E09060600000000, "UTF-8 Text Data Essence Coding")