loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-07 15:40:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove pointless references to ElementaryStreamReaders.

Browse Source
This commit is contained in:
Oliver Woodman 2015-05-01 20:30:00 +01:00
parent d82343d06c
commit cfab852096
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java
View File

@ -25,6 +25,7 @@ import com.google.android.exoplayer.util.ParsableByteArray;
import android.util.Log; import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
import android.util.SparseBooleanArray;
import java.io.IOException; import java.io.IOException;
@ -49,7 +50,7 @@ public final class TsExtractor implements Extractor {
private static final long MAX_PTS = 0x1FFFFFFFFL; private static final long MAX_PTS = 0x1FFFFFFFFL;
private final ParsableByteArray tsPacketBuffer; private final ParsableByteArray tsPacketBuffer;
private final SparseArray<ElementaryStreamReader> streamReaders; // Indexed by streamType private final SparseBooleanArray streamTypes;
private final SparseArray<TsPayloadReader> tsPayloadReaders; // Indexed by pid private final SparseArray<TsPayloadReader> tsPayloadReaders; // Indexed by pid
private final long firstSampleTimestampUs; private final long firstSampleTimestampUs;
private final ParsableBitArray tsScratch; private final ParsableBitArray tsScratch;
@ -67,7 +68,7 @@ public final class TsExtractor implements Extractor {
this.firstSampleTimestampUs = firstSampleTimestampUs; this.firstSampleTimestampUs = firstSampleTimestampUs;
tsScratch = new ParsableBitArray(new byte[3]); tsScratch = new ParsableBitArray(new byte[3]);
tsPacketBuffer = new ParsableByteArray(TS_PACKET_SIZE); tsPacketBuffer = new ParsableByteArray(TS_PACKET_SIZE);
streamReaders = new SparseArray<ElementaryStreamReader>(); streamTypes = new SparseBooleanArray();
tsPayloadReaders = new SparseArray<TsPayloadReader>(); tsPayloadReaders = new SparseArray<TsPayloadReader>();
tsPayloadReaders.put(TS_PAT_PID, new PatReader()); tsPayloadReaders.put(TS_PAT_PID, new PatReader());
lastPts = Long.MIN_VALUE; lastPts = Long.MIN_VALUE;
@ -255,7 +256,7 @@ public final class TsExtractor implements Extractor {
data.skipBytes(esInfoLength); data.skipBytes(esInfoLength);
entriesSize -= esInfoLength + 5; entriesSize -= esInfoLength + 5;
if (streamReaders.get(streamType) != null) { if (streamTypes.get(streamType)) {
continue; continue;
} }
@ -270,7 +271,6 @@ public final class TsExtractor implements Extractor {
break; break;
case TS_STREAM_TYPE_H264: case TS_STREAM_TYPE_H264:
SeiReader seiReader = new SeiReader(output.track(TS_STREAM_TYPE_EIA608)); SeiReader seiReader = new SeiReader(output.track(TS_STREAM_TYPE_EIA608));
streamReaders.put(TS_STREAM_TYPE_EIA608, seiReader);
pesPayloadReader = new H264Reader(output.track(TS_STREAM_TYPE_H264), seiReader); pesPayloadReader = new H264Reader(output.track(TS_STREAM_TYPE_H264), seiReader);
break; break;
case TS_STREAM_TYPE_ID3: case TS_STREAM_TYPE_ID3:
@ -279,7 +279,7 @@ public final class TsExtractor implements Extractor {
} }
if (pesPayloadReader != null) { if (pesPayloadReader != null) {
streamReaders.put(streamType, pesPayloadReader); streamTypes.put(streamType, true);
tsPayloadReaders.put(elementaryPid, new PesReader(pesPayloadReader)); tsPayloadReaders.put(elementaryPid, new PesReader(pesPayloadReader));
} }
} }