Skip to content

Matroska: preserve LanguageIETF priority regardless of element order #2645

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
maghuro wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Matroska: preserve LanguageIETF priority regardless of element order #2645

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
19 changes: 19 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 @@ -3562,6 +3562,7 @@ void File_Mk::Segment_Tracks_TrackEntry()
TrackType=(int64u)-1;
TrackNumber=(int64u)-1;
AudioBitDepth=(int64u)-1;
TrackHasLanguageIETF=false;
TrackVideoDisplayWidth=0;
TrackVideoDisplayHeight=0;
AvgBytesPerSec=0;
Expand Down Expand Up @@ -4282,6 +4283,24 @@ void File_Mk::Segment_Tracks_TrackEntry_Language()
FILLING_BEGIN();
if (Segment_Info_Count>1)
return; //First element has the priority
if (TrackHasLanguageIETF)
return;
Fill(StreamKind_Last, StreamPos_Last, "Language", Data, true);
FILLING_END();
}

//---------------------------------------------------------------------------
void File_Mk::Segment_Tracks_TrackEntry_LanguageIETF()
{
//Parsing
Ztring Data=String_Get();

FILLING_BEGIN();
if (Segment_Info_Count>1)
return; //First element has the priority
if (Data.empty())
return;
TrackHasLanguageIETF=true;
Fill(StreamKind_Last, StreamPos_Last, "Language", Data, true);
FILLING_END();
}
Expand Down
3 changes: 2 additions & 1 deletion Source/MediaInfo/Multiple/File_Mk.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ private :
void Segment_Tracks_TrackEntry_MaxBlockAdditionID(){UInteger_Info();};
void Segment_Tracks_TrackEntry_Name();
void Segment_Tracks_TrackEntry_Language();
void Segment_Tracks_TrackEntry_LanguageIETF(){Segment_Tracks_TrackEntry_Language();};
void Segment_Tracks_TrackEntry_LanguageIETF();
void Segment_Tracks_TrackEntry_CodecID();
void Segment_Tracks_TrackEntry_CodecPrivate();
void Segment_Tracks_TrackEntry_CodecName(){UTF8_Info();};
Expand Down Expand Up @@ -478,6 +478,7 @@ private :
void CodecID_Manage();
int64u TrackType{};
int64u AudioBitDepth{};
bool TrackHasLanguageIETF{};

//Temp - BlockAddition
int64u BlockAddIDType;
Expand Down