Skip to content

Retain the Encoded Library information stored in a tag (fix #1267) #1268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eugenesvk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Retain the Encoded Library information stored in a tag (fix #1267) #1268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Project/MSVC2022/Library/MediaInfoLib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,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" />
Expand Down
3 changes: 3 additions & 0 deletions Project/MSVC2022/Library/MediaInfoLib.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1600,6 +1600,9 @@
<ClInclude Include="..\..\..\Source\MediaInfo\Video\File_CineForm.h">
<Filter>Header Files\Video</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\MediaInfo\File__Analyze_Streams.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Adm.h">
<Filter>Header Files\Audio</Filter>
</ClInclude>
Expand Down
15 changes: 15 additions & 0 deletions Source/MediaInfo/File__Analyze_Streams.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
7 changes: 7 additions & 0 deletions Source/MediaInfo/File__Analyze_Streams_Finish.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#endif
//---------------------------------------------------------------------------

#include "MediaInfo/File__Analyze_Streams.h" //declaration of Encoded_Library_Tag
//---------------------------------------------------------------------------
#include "MediaInfo/Setup.h"
//---------------------------------------------------------------------------
Expand Down Expand Up @@ -2136,6 +2137,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
Expand Down Expand Up @@ -4993,9 +4996,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);
}
}

//---------------------------------------------------------------------------
Expand Down
4 changes: 4 additions & 0 deletions Source/MediaInfo/Multiple/File_Mk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,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>
Expand All @@ -119,6 +120,7 @@ using namespace std;
namespace MediaInfoLib
{

Ztring Encoded_Library_Tag;
//***************************************************************************
// Constants
//***************************************************************************
Expand Down Expand Up @@ -1038,6 +1040,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)
}
}
}
Expand Down
Loading