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

Add continuity counter support in Transport Streams

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=132684574
This commit is contained in:
aquilescanta 2016-09-09 09:50:37 -07:00 committed by Oliver Woodman
parent 3bad28ac91
commit 7e51c3af74
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ package com.google.android.exoplayer2.extractor.ts;
import android.util.Log; import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
import android.util.SparseBooleanArray; import android.util.SparseBooleanArray;
import android.util.SparseIntArray;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.extractor.DummyTrackOutput; import com.google.android.exoplayer2.extractor.DummyTrackOutput;
import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.extractor.Extractor;
@ -85,6 +86,7 @@ public final class TsExtractor implements Extractor {
private final int workaroundFlags; private final int workaroundFlags;
private final ParsableByteArray tsPacketBuffer; private final ParsableByteArray tsPacketBuffer;
private final ParsableBitArray tsScratch; private final ParsableBitArray tsScratch;
private final SparseIntArray continuityCounters;
/* package */ final SparseArray<TsPayloadReader> tsPayloadReaders; // Indexed by pid /* package */ final SparseArray<TsPayloadReader> tsPayloadReaders; // Indexed by pid
/* package */ final SparseBooleanArray trackIds; /* package */ final SparseBooleanArray trackIds;
@ -110,6 +112,7 @@ public final class TsExtractor implements Extractor {
tsPayloadReaders.put(TS_PAT_PID, new PatReader()); tsPayloadReaders.put(TS_PAT_PID, new PatReader());
trackIds = new SparseBooleanArray(); trackIds = new SparseBooleanArray();
nextEmbeddedTrackId = BASE_EMBEDDED_TRACK_ID; nextEmbeddedTrackId = BASE_EMBEDDED_TRACK_ID;
continuityCounters = new SparseIntArray();
} }
// Extractor implementation. // Extractor implementation.
@ -145,6 +148,7 @@ public final class TsExtractor implements Extractor {
tsPayloadReaders.valueAt(i).seek(); tsPayloadReaders.valueAt(i).seek();
} }
tsPacketBuffer.reset(); tsPacketBuffer.reset();
continuityCounters.clear();
} }
@Override @Override
@ -201,7 +205,17 @@ public final class TsExtractor implements Extractor {
tsScratch.skipBits(2); // transport_scrambling_control tsScratch.skipBits(2); // transport_scrambling_control
boolean adaptationFieldExists = tsScratch.readBit(); boolean adaptationFieldExists = tsScratch.readBit();
boolean payloadExists = tsScratch.readBit(); boolean payloadExists = tsScratch.readBit();
// Last 4 bits of scratch are skipped: continuity_counter boolean discontinuityFound = false;
int continuityCounter = tsScratch.readBits(4);
int previousCounter = continuityCounters.get(pid, continuityCounter - 1);
continuityCounters.put(pid, continuityCounter);
if (previousCounter == continuityCounter) {
// Duplicate packet found.
tsPacketBuffer.setPosition(endOfPacket);
return RESULT_CONTINUE;
} else if (continuityCounter != (previousCounter + 1) % 16) {
discontinuityFound = true;
}
// Skip the adaptation field. // Skip the adaptation field.
if (adaptationFieldExists) { if (adaptationFieldExists) {
@ -213,6 +227,9 @@ public final class TsExtractor implements Extractor {
if (payloadExists) { if (payloadExists) {
TsPayloadReader payloadReader = tsPayloadReaders.get(pid); TsPayloadReader payloadReader = tsPayloadReaders.get(pid);
if (payloadReader != null) { if (payloadReader != null) {
if (discontinuityFound) {
payloadReader.seek();
}
tsPacketBuffer.setLimit(endOfPacket); tsPacketBuffer.setLimit(endOfPacket);
payloadReader.consume(tsPacketBuffer, payloadUnitStartIndicator, output); payloadReader.consume(tsPacketBuffer, payloadUnitStartIndicator, output);
Assertions.checkState(tsPacketBuffer.getPosition() <= endOfPacket); Assertions.checkState(tsPacketBuffer.getPosition() <= endOfPacket);