Merge pull request #1311 from JeromeMartinez/Dolby_ED2

Dolby ED2: don't convert object Cartesian positions to a channel layout
MediaArea · Oct 9, 2020 · 3aed02a · 3aed02a
2 parents 68206b0 + cad43db
commit 3aed02a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Source/MediaInfo/Audio/File_DolbyE.cpp b/Source/MediaInfo/Audio/File_DolbyE.cpp
@@ -1282,10 +1282,12 @@ void File_DolbyE::Streams_Fill_ED2()
         string Summary;
         if (Summary.empty())
             Summary=sound_category_Values[DynObject.sound_category];
+        /*
         if (Summary.empty())
             Summary=ChannelLayout;
         if (Summary.empty())
             Summary=Position_Polar;
+        */
         if (Summary.empty())
             Summary="Yes";
 
@@ -1302,11 +1304,13 @@ void File_DolbyE::Streams_Fill_ED2()
         {
             string A=P;
             const dyn_object::dyn_object_alt& DynObject_Current=ObjectElements[Bed_Object_Count+p].Alts[0];
+            /*
             if (!ChannelLayout.empty())
             {
                 Fill(Stream_Audio, 0, (A+" ChannelLayout").c_str(), ChannelLayout);
                 Fill_SetOptions(Stream_Audio, 0, (A+" ChannelLayout").c_str(), "Y NTY");
             }
+            */
             if (!Position_Polar.empty())
             {
                 Fill(Stream_Audio, 0, (A+" Position_Polar").c_str(), Position_Polar);
@@ -1347,20 +1351,24 @@ void File_DolbyE::Streams_Fill_ED2()
             string Summary2;
             if (Summary2.empty())
                 Summary2=sound_category_Values[DynObject.sound_category];
+            /*
             if (Summary2.empty())
                 Summary2=ChannelLayout;
             if (Summary2.empty())
                 Summary2=Position_Polar;
+            */
             if (Summary2.empty())
                 Summary2="Yes";
 
             string A=P+Ztring(__T(" Alt")+Ztring::ToZtring(a)).To_UTF8();
             Fill(Stream_Audio, 0, A.c_str(), Summary2);
+            /*
             if (!ChannelLayout.empty())
             {
                 Fill(Stream_Audio, 0, (A+" ChannelLayout").c_str(), ChannelLayout);
                 Fill_SetOptions(Stream_Audio, 0, (A+" ChannelLayout").c_str(), "Y NTY");
             }
+            */
             if (!Position_Polar.empty())
             {
                 Fill(Stream_Audio, 0, (A+" Position_Polar").c_str(), Position_Polar);

diff --git a/Source/MediaInfo/MediaInfo_Config_MediaInfo.cpp b/Source/MediaInfo/MediaInfo_Config_MediaInfo.cpp
@@ -1649,7 +1649,8 @@ void MediaInfo_Config_MediaInfo::File_ExpandSubs_Update(void** Source)
                                                             if ((*Stream_More)[StreamKind][StreamPos][k][Info_Name]==ToSearch3)
                                                             {
                                                                 Found=(*Stream_More)[StreamKind][StreamPos][k][Info_Text];
-                                                                if (k
+                                                                if (k && !Temp.empty()
+                                                                 && Temp[Temp.size()-1][Info_Name].rfind(__T(" ChannelLayout" ))+14==Temp[Temp.size()-1][Info_Name].size()
                                                                  && (*Stream_More)[StreamKind][StreamPos][k  ][Info_Name].rfind(__T(" Position_Polar"))+15==(*Stream_More)[StreamKind][StreamPos][k  ][Info_Name].size()
                                                                  && (*Stream_More)[StreamKind][StreamPos][k-1][Info_Name].rfind(__T(" ChannelLayout" ))+14!=(*Stream_More)[StreamKind][StreamPos][k-1][Info_Name].size())
                                                                 {