loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for section_syntax_indicator in TS tables

Browse Source 
Issue:#7325
PiperOrigin-RevId: 314321914
This commit is contained in:
aquilescanta 2020-06-02 14:53:15 +01:00 committed by Oliver Woodman
parent 5e2b89b562
commit 79acadcc89
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
View File

@ -460,10 +460,15 @@ public final class TsExtractor implements Extractor {
// See ISO/IEC 13818-1, section 2.4.4.4 for more information on table id assignment. // See ISO/IEC 13818-1, section 2.4.4.4 for more information on table id assignment.
return; return;
} }
// section_syntax_indicator(1), '0'(1), reserved(2), section_length(12), // section_syntax_indicator(1), '0'(1), reserved(2), section_length(4)
// transport_stream_id (16), reserved (2), version_number (5), current_next_indicator (1), int secondHeaderByte = sectionData.readUnsignedByte();
// section_number (8), last_section_number (8) if ((secondHeaderByte & 0x80) == 0) {
sectionData.skipBytes(7); // section_syntax_indicator must be 1. See ISO/IEC 13818-1, section 2.4.4.5.
return;
}
// section_length(8), transport_stream_id (16), reserved (2), version_number (5),
// current_next_indicator (1), section_number (8), last_section_number (8)
sectionData.skipBytes(6);
int programCount = sectionData.bytesLeft() / 4; int programCount = sectionData.bytesLeft() / 4;
for (int i = 0; i < programCount; i++) { for (int i = 0; i < programCount; i++) {
@ -535,8 +540,14 @@ public final class TsExtractor implements Extractor {
timestampAdjusters.add(timestampAdjuster); timestampAdjusters.add(timestampAdjuster);
} }
// section_syntax_indicator(1), '0'(1), reserved(2), section_length(12) // section_syntax_indicator(1), '0'(1), reserved(2), section_length(4)
sectionData.skipBytes(2); int secondHeaderByte = sectionData.readUnsignedByte();
if ((secondHeaderByte & 0x80) == 0) {
// section_syntax_indicator must be 1. See ISO/IEC 13818-1, section 2.4.4.9.
return;
}
// section_length(8)
sectionData.skipBytes(1);
int programNumber = sectionData.readUnsignedShort(); int programNumber = sectionData.readUnsignedShort();
// Skip 3 bytes (24 bits), including: // Skip 3 bytes (24 bits), including: