sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1979 from vitekn/dev-v2

Browse source 
Fix NPE in TsExtractor when ElementaryStreamReaderFactory returns null
This commit is contained in:
Santiago Seifert 2016-10-21 11:45:21 +01:00 committed by GitHub
commit e4bafd964d
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
library/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
View file

@ -467,8 +467,10 @@ public final class TsExtractor implements Extractor {
pesPayloadReader = id3Reader; pesPayloadReader = id3Reader;
} else { } else {
pesPayloadReader = streamReaderFactory.createStreamReader(streamType, esInfo); pesPayloadReader = streamReaderFactory.createStreamReader(streamType, esInfo);
if (pesPayloadReader != null) {
pesPayloadReader.init(output, new TrackIdGenerator(trackId, MAX_PID_PLUS_ONE)); pesPayloadReader.init(output, new TrackIdGenerator(trackId, MAX_PID_PLUS_ONE));
} }
}
if (pesPayloadReader != null) { if (pesPayloadReader != null) {
tsPayloadReaders.put(elementaryPid, new PesReader(pesPayloadReader, timestampAdjuster)); tsPayloadReaders.put(elementaryPid, new PesReader(pesPayloadReader, timestampAdjuster));