justdan96/tsMuxer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Detect tracks from longest playlist (#333)" (#334)

Browse Source 
This reverts commit 1c7c911359ff418ecaadc09c49f9ae9e7e32889d.
This commit is contained in:
Daniel Kamil Kozar 2020-09-07 23:34:00 +02:00 committed by GitHub
parent 1c7c911359
commit bb3263f9fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tsMuxer/main.cpp
View File

@ -616,7 +616,7 @@ int main(int argc, char** argv)
bool switchToSsif = false;
if (mplsParser.m_playItems.size() > 0)
{
MPLSPlayItem& item = mplsParser.m_playItems[mplsParser.m_playItem];
MPLSPlayItem& item = mplsParser.m_playItems[0];
string itemName = streamDir + item.fileName + mediaExt;
if (fileExists(itemName))
{

36
tsMuxer/tsPacket.cpp
View File

@ -1296,12 +1296,7 @@ int CLPIParser::compose(uint8_t* buffer, int bufferSize)
// -------------------------- MPLSParser ----------------------------
MPLSParser::MPLSParser()
: m_chapterLen(0),
m_playItem(0),
number_of_SubPaths(0),
m_m2tsOffset(0),
isDependStreamExist(false),
mvc_base_view_r(false)
: m_chapterLen(0), number_of_SubPaths(0), m_m2tsOffset(0), isDependStreamExist(false), mvc_base_view_r(false)
{
number_of_primary_video_stream_entries = 0;
number_of_primary_audio_stream_entries = 0;
@ -2530,15 +2525,14 @@ void MPLSParser::STN_table(BitStreamReader& reader, int PlayItem_id)
number_of_DolbyVision_video_stream_entries = reader.getBits(8); // 8 uimsbf
reader.skipBits(32); // reserved_for_future_use 32 bslbf
std::vector<MPLSStreamInfo> streamInfos;
for (int primary_video_stream_id = 0; primary_video_stream_id < number_of_primary_video_stream_entries;
primary_video_stream_id++)
{
MPLSStreamInfo streamInfo;
streamInfo.parseStreamEntry(reader);
streamInfo.parseStreamAttributes(reader);
streamInfos.push_back(streamInfo);
if (PlayItem_id == 0)
m_streamInfo.push_back(streamInfo);
}
for (int primary_audio_stream_id = 0; primary_audio_stream_id < number_of_primary_audio_stream_entries;
primary_audio_stream_id++)
@ -2546,7 +2540,8 @@ void MPLSParser::STN_table(BitStreamReader& reader, int PlayItem_id)
MPLSStreamInfo streamInfo;
streamInfo.parseStreamEntry(reader);
streamInfo.parseStreamAttributes(reader);
streamInfos.push_back(streamInfo);
if (PlayItem_id == 0)
m_streamInfo.push_back(streamInfo);
}
for (int PG_textST_stream_id = 0;
@ -2556,7 +2551,8 @@ void MPLSParser::STN_table(BitStreamReader& reader, int PlayItem_id)
MPLSStreamInfo streamInfo;
streamInfo.parseStreamEntry(reader);
streamInfo.parseStreamAttributes(reader);
streamInfos.push_back(streamInfo);
if (PlayItem_id == 0)
m_streamInfo.push_back(streamInfo);
}
for (int IG_stream_id = 0; IG_stream_id < number_of_IG_stream_entries; IG_stream_id++)
@ -2564,7 +2560,8 @@ void MPLSParser::STN_table(BitStreamReader& reader, int PlayItem_id)
MPLSStreamInfo streamInfo;
streamInfo.parseStreamEntry(reader);
streamInfo.parseStreamAttributes(reader);
streamInfos.push_back(streamInfo);
if (PlayItem_id == 0)
m_streamInfo.push_back(streamInfo);
}
for (int secondary_audio_stream_id = 0; secondary_audio_stream_id < number_of_secondary_audio_stream_entries;
@ -2574,7 +2571,8 @@ void MPLSParser::STN_table(BitStreamReader& reader, int PlayItem_id)
streamInfo.isSecondary = true;
streamInfo.parseStreamEntry(reader);
streamInfo.parseStreamAttributes(reader);
streamInfos.push_back(streamInfo);
if (PlayItem_id == 0)
m_streamInfo.push_back(streamInfo);
// comb_info_Secondary_audio_Primary_audio(){
int number_of_primary_audio_ref_entries = reader.getBits(8); // 8 uimsbf
@ -2596,7 +2594,8 @@ void MPLSParser::STN_table(BitStreamReader& reader, int PlayItem_id)
streamInfo.isSecondary = true;
streamInfo.parseStreamEntry(reader);
streamInfo.parseStreamAttributes(reader);
streamInfos.push_back(streamInfo);
if (PlayItem_id == 0)
m_streamInfo.push_back(streamInfo);
// comb_info_Secondary_video_Secondary_audio(){
int number_of_secondary_audio_ref_entries = reader.getBits(8); // 8 uimsbf
@ -2629,13 +2628,8 @@ void MPLSParser::STN_table(BitStreamReader& reader, int PlayItem_id)
MPLSStreamInfo streamInfo;
streamInfo.parseStreamEntry(reader);
streamInfo.parseStreamAttributes(reader);
streamInfos.push_back(streamInfo);
}
if (streamInfos.size() > m_streamInfo.size())
{
m_streamInfo = std::move(streamInfos);
m_playItem = PlayItem_id;
if (PlayItem_id == 0)
m_streamInfo.push_back(streamInfo);
}
}

1
tsMuxer/tsPacket.h
View File

@ -529,7 +529,6 @@ struct MPLSParser
bool is_seamless_angle_change;
int m_chapterLen;
int m_playItem;
uint32_t IN_time;
uint32_t OUT_time;