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

Handle empty RawCC files.

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=143667717
This commit is contained in:
cdrolle 2017-01-05 08:15:29 -08:00 committed by Oliver Woodman
parent 8a0e76ba32
commit 01d22f8123
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
library/src/main/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractor.java
View File

@ -83,8 +83,11 @@ public final class RawCcExtractor implements Extractor {
while (true) { while (true) {
switch (parserState) { switch (parserState) {
case STATE_READING_HEADER: case STATE_READING_HEADER:
parseHeader(input); if (parseHeader(input)) {
parserState = STATE_READING_TIMESTAMP_AND_COUNT; parserState = STATE_READING_TIMESTAMP_AND_COUNT;
} else {
return RESULT_END_OF_INPUT;
}
break; break;
case STATE_READING_TIMESTAMP_AND_COUNT: case STATE_READING_TIMESTAMP_AND_COUNT:
if (parseTimestampAndSampleCount(input)) { if (parseTimestampAndSampleCount(input)) {
@ -114,14 +117,18 @@ public final class RawCcExtractor implements Extractor {
// Do nothing // Do nothing
} }
private void parseHeader(ExtractorInput input) throws IOException, InterruptedException { private boolean parseHeader(ExtractorInput input) throws IOException, InterruptedException {
dataScratch.reset(); dataScratch.reset();
input.readFully(dataScratch.data, 0, HEADER_SIZE); if (input.readFully(dataScratch.data, 0, HEADER_SIZE, true)) {
if (dataScratch.readInt() != HEADER_ID) { if (dataScratch.readInt() != HEADER_ID) {
throw new IOException("Input not RawCC"); throw new IOException("Input not RawCC");
}
version = dataScratch.readUnsignedByte();
// no versions use the flag fields yet
return true;
} else {
return false;
} }
version = dataScratch.readUnsignedByte();
// no versions use the flag fields yet
} }
private boolean parseTimestampAndSampleCount(ExtractorInput input) throws IOException, private boolean parseTimestampAndSampleCount(ExtractorInput input) throws IOException,