diff --git a/Project/MSVC2019/Library/MediaInfoLib.vcxproj b/Project/MSVC2019/Library/MediaInfoLib.vcxproj index 395ccd0c3..2feffd08b 100644 --- a/Project/MSVC2019/Library/MediaInfoLib.vcxproj +++ b/Project/MSVC2019/Library/MediaInfoLib.vcxproj @@ -439,6 +439,7 @@ + diff --git a/Project/MSVC2019/Library/MediaInfoLib.vcxproj.filters b/Project/MSVC2019/Library/MediaInfoLib.vcxproj.filters index 8b25705a4..e08f6d608 100644 --- a/Project/MSVC2019/Library/MediaInfoLib.vcxproj.filters +++ b/Project/MSVC2019/Library/MediaInfoLib.vcxproj.filters @@ -1489,5 +1489,8 @@ Header Files\Audio + + Header Files + \ No newline at end of file diff --git a/Source/MediaInfo/File__Analyze_Streams.h b/Source/MediaInfo/File__Analyze_Streams.h new file mode 100644 index 000000000..00190d232 --- /dev/null +++ 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 index 95be7eef3..c0503078e 100644 --- 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; StreamKindStream_Video || StreamKind==Stream_Max) + Encoded_Library_Tag = __T(""); //reset tag for new files for (size_t StreamPos=0; StreamPos #include @@ -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) } } }