Retain the Encoded Library information stored in a tag

MediaArea · May 25, 2020 · 4c4ab2f · 4c4ab2f
1 parent 84fc9d1
commit 4c4ab2f
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 0 deletions.
diff --git a/Project/MSVC2019/Library/MediaInfoLib.vcxproj b/Project/MSVC2019/Library/MediaInfoLib.vcxproj
@@ -439,6 +439,7 @@
     <ClInclude Include="..\..\..\Source\MediaInfo\File__Analyze.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\File__Analyze_Element.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\File__Analyze_MinimizeSize.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\File__Analyze_Streams.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\File__Base.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\File__Duplicate.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\File__HasReferences.h" />

diff --git a/Project/MSVC2019/Library/MediaInfoLib.vcxproj.filters b/Project/MSVC2019/Library/MediaInfoLib.vcxproj.filters
@@ -1489,5 +1489,8 @@
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Mpegh3da.h">
       <Filter>Header Files\Audio</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\File__Analyze_Streams.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/Source/MediaInfo/File__Analyze_Streams.h b/Source/MediaInfo/File__Analyze_Streams.h
@@ -0,0 +1,15 @@
+//---------------------------------------------------------------------------
+#ifndef File__Analyze_StreamsH
+#define File__Analyze_StreamsH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "ZenLib/Ztring.h"
+using namespace ZenLib;
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+extern Ztring Encoded_Library_Tag;
+}
+#endif
diff --git a/Source/MediaInfo/File__Analyze_Streams_Finish.cpp b/Source/MediaInfo/File__Analyze_Streams_Finish.cpp
@@ -18,6 +18,7 @@
 #endif
 //---------------------------------------------------------------------------
 
+#include "MediaInfo/File__Analyze_Streams.h" //declaration of Encoded_Library_Tag
 //---------------------------------------------------------------------------
 #include "MediaInfo/Setup.h"
 //---------------------------------------------------------------------------
@@ -73,6 +74,8 @@ Ztring File__Analyze_Encoded_Library_String (const Ztring &CompanyName, const Zt
             String+=Date;
             String+=__T(")");
         }
+        if (!Encoded_Library_Tag.empty())
+            String+=MediaInfoLib::Config.TagSeparator_Get()+Encoded_Library_Tag; //add discarded Encoder tag back
         return String;
     }
     else
@@ -1448,9 +1451,13 @@ void File__Analyze::Streams_Finish_HumanReadable()
 {
     //Generic
     for (size_t StreamKind=Stream_General; StreamKind<Stream_Max; StreamKind++)
+    {
+        if(StreamKind>Stream_Video || StreamKind==Stream_Max)
+            Encoded_Library_Tag = __T(""); //reset tag for new files
         for (size_t StreamPos=0; StreamPos<Count_Get((stream_t)StreamKind); StreamPos++)
             for (size_t Parameter=0; Parameter<Count_Get((stream_t)StreamKind, StreamPos); Parameter++)
                 Streams_Finish_HumanReadable_PerStream((stream_t)StreamKind, StreamPos, Parameter);
+    }
 }
 
 //---------------------------------------------------------------------------

diff --git a/Source/MediaInfo/Multiple/File_Mk.cpp b/Source/MediaInfo/Multiple/File_Mk.cpp
@@ -91,6 +91,7 @@
 #if MEDIAINFO_EVENTS
     #include "MediaInfo/MediaInfo_Events.h"
 #endif //MEDIAINFO_EVENTS
+#include "MediaInfo/File__Analyze_Streams.h" //declaration of Encoded_Library_Tag
 #include "MediaInfo/MediaInfo_Config_MediaInfo.h"
 #include <cstring>
 #include <cmath>
@@ -105,6 +106,7 @@
 namespace MediaInfoLib
 {
 
+Ztring Encoded_Library_Tag;
 //***************************************************************************
 // Constants
 //***************************************************************************
@@ -1010,6 +1012,8 @@ void File_Mk::Streams_Finish()
                     }
                     if ((Tag->first!=__T("Language") || Retrieve(StreamKind_Last, StreamPos_Last, "Language").empty())) // Prioritize Tracks block over tags
                         Fill(StreamKind_Last, StreamPos_Last, Tag->first.To_UTF8().c_str(), Tag->second);
+                    if (Tag->first==__T("Encoded_Library") && StreamKind_Last==Stream_Video && Encoded_Library_Tag.empty())
+                        Encoded_Library_Tag = Tag->second; //save video Encoder tag value in a shared variable (once)
                 }
             }
         }