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

Fix PTS wraparound in HLS+Webvtt

Browse Source 
Issue:#2928

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169246424
This commit is contained in:
aquilescanta 2017-09-19 08:46:04 -07:00 committed by Oliver Woodman
parent 5b0e693419
commit fed2a1a6ea
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java
View File

@ -141,8 +141,7 @@ import java.util.regex.Pattern;
throw new ParserException("X-TIMESTAMP-MAP doesn't contain media timestamp: " + line); throw new ParserException("X-TIMESTAMP-MAP doesn't contain media timestamp: " + line);
} }
vttTimestampUs = WebvttParserUtil.parseTimestampUs(localTimestampMatcher.group(1)); vttTimestampUs = WebvttParserUtil.parseTimestampUs(localTimestampMatcher.group(1));
tsTimestampUs = TimestampAdjuster.ptsToUs( tsTimestampUs = TimestampAdjuster.ptsToUs(Long.parseLong(mediaTimestampMatcher.group(1)));
Long.parseLong(mediaTimestampMatcher.group(1)));
} }
} }
@ -155,8 +154,8 @@ import java.util.regex.Pattern;
} }
long firstCueTimeUs = WebvttParserUtil.parseTimestampUs(cueHeaderMatcher.group(1)); long firstCueTimeUs = WebvttParserUtil.parseTimestampUs(cueHeaderMatcher.group(1));
long sampleTimeUs = timestampAdjuster.adjustSampleTimestamp( long sampleTimeUs = timestampAdjuster.adjustTsTimestamp(
firstCueTimeUs + tsTimestampUs - vttTimestampUs); TimestampAdjuster.usToPts(firstCueTimeUs + tsTimestampUs - vttTimestampUs));
long subsampleOffsetUs = sampleTimeUs - firstCueTimeUs; long subsampleOffsetUs = sampleTimeUs - firstCueTimeUs;
// Output the track. // Output the track.
TrackOutput trackOutput = buildTrackOutput(subsampleOffsetUs); TrackOutput trackOutput = buildTrackOutput(subsampleOffsetUs);