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

Fix dummy pusi solution for byte range and key frame only NAL stream cases

Browse source
This commit is contained in:
Daniele Sparano 2024-03-14 18:12:50 +00:00 committed by Rohit Singh
parent c002ff6a6f
commit 85826ebc19
4 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/extractor/src/main/java/androidx/media3/extractor/ts/H264Reader.java
View file

@ -170,6 +170,7 @@ public final class H264Reader implements ElementaryStreamReader {
public void packetFinished(boolean isEndOfInput) { public void packetFinished(boolean isEndOfInput) {
assertTracksCreated(); assertTracksCreated();
if (isEndOfInput) { if (isEndOfInput) {
sampleReader.getSampleIsKeyframe();
sampleReader.end(totalBytesWritten); sampleReader.end(totalBytesWritten);
} }
} }
@ -494,6 +495,10 @@ public final class H264Reader implements ElementaryStreamReader {
sampleIsKeyframe = false; sampleIsKeyframe = false;
readingSample = true; readingSample = true;
} }
return getSampleIsKeyframe();
}
public boolean getSampleIsKeyframe() {
boolean treatIFrameAsKeyframe = boolean treatIFrameAsKeyframe =
allowNonIdrKeyframes ? sliceHeader.isISlice() : randomAccessIndicator; allowNonIdrKeyframes ? sliceHeader.isISlice() : randomAccessIndicator;
sampleIsKeyframe |= sampleIsKeyframe |=
@ -513,8 +518,8 @@ public final class H264Reader implements ElementaryStreamReader {
public void end(long position) { public void end(long position) {
// Output a final sample with the NAL units currently held // Output a final sample with the NAL units currently held
nalUnitStartPosition = position; nalUnitStartPosition = position + 1;
outputSample(/* offset= */ 0); outputSample(/* offset= */ - 1);
readingSample = false; readingSample = false;
} }

10
libraries/extractor/src/main/java/androidx/media3/extractor/ts/H265Reader.java
View file

@ -175,6 +175,7 @@ public final class H265Reader implements ElementaryStreamReader {
public void packetFinished(boolean isEndOfInput) { public void packetFinished(boolean isEndOfInput) {
assertTracksCreated(); assertTracksCreated();
if (isEndOfInput) { if (isEndOfInput) {
sampleReader.getSampleIsKeyframe();
sampleReader.end(totalBytesWritten); sampleReader.end(totalBytesWritten);
} }
} }
@ -377,6 +378,11 @@ public final class H265Reader implements ElementaryStreamReader {
} }
} }
public boolean getSampleIsKeyframe() {
sampleIsKeyframe = nalUnitHasKeyframeData;
return sampleIsKeyframe;
}
private void outputSample(int offset) { private void outputSample(int offset) {
if (sampleTimeUs == C.TIME_UNSET) { if (sampleTimeUs == C.TIME_UNSET) {
return; return;
@ -388,8 +394,8 @@ public final class H265Reader implements ElementaryStreamReader {
public void end(long position) { public void end(long position) {
// Output a final sample with the NAL units currently held // Output a final sample with the NAL units currently held
nalUnitPosition = position; nalUnitPosition = position + 1;
outputSample(/* offset= */ 0); outputSample(/* offset= */ - 1);
readingSample = false; readingSample = false;
} }

16
libraries/extractor/src/main/java/androidx/media3/extractor/ts/PesReader.java
View file

@ -36,10 +36,10 @@ public final class PesReader implements TsPayloadReader {
private static final String TAG = "PesReader"; private static final String TAG = "PesReader";
private static final int STATE_FINDING_HEADER = 0; public static final int STATE_FINDING_HEADER = 0;
private static final int STATE_READING_HEADER = 1; public static final int STATE_READING_HEADER = 1;
private static final int STATE_READING_HEADER_EXTENSION = 2; public static final int STATE_READING_HEADER_EXTENSION = 2;
private static final int STATE_READING_BODY = 3; public static final int STATE_READING_BODY = 3;
private static final int HEADER_SIZE = 9; private static final int HEADER_SIZE = 9;
private static final int MAX_HEADER_EXTENSION_SIZE = 10; private static final int MAX_HEADER_EXTENSION_SIZE = 10;
@ -165,6 +165,14 @@ public final class PesReader implements TsPayloadReader {
bytesRead = 0; bytesRead = 0;
} }
public int getState() {
return state;
}
public boolean hasPacketLength() {
return payloadSize != C.LENGTH_UNSET;
}
/** /**
* Continues a read from the provided {@code source} into a given {@code target}. It's assumed * Continues a read from the provided {@code source} into a given {@code target}. It's assumed
* that the data should be written into {@code target} starting from an offset of zero. * that the data should be written into {@code target} starting from an offset of zero.

6
libraries/extractor/src/main/java/androidx/media3/extractor/ts/TsExtractor.java
View file

@ -15,6 +15,7 @@
*/ */
package androidx.media3.extractor.ts; package androidx.media3.extractor.ts;
import static androidx.media3.extractor.ts.PesReader.STATE_READING_BODY;
import static androidx.media3.extractor.ts.TsPayloadReader.EsInfo.AUDIO_TYPE_UNDEFINED; import static androidx.media3.extractor.ts.TsPayloadReader.EsInfo.AUDIO_TYPE_UNDEFINED;
import static androidx.media3.extractor.ts.TsPayloadReader.FLAG_PAYLOAD_UNIT_START_INDICATOR; import static androidx.media3.extractor.ts.TsPayloadReader.FLAG_PAYLOAD_UNIT_START_INDICATOR;
import static java.lang.annotation.ElementType.TYPE_USE; import static java.lang.annotation.ElementType.TYPE_USE;
@ -451,7 +452,10 @@ public final class TsExtractor implements Extractor {
for (int i = 0; i < tsPayloadReaders.size(); i++) { for (int i = 0; i < tsPayloadReaders.size(); i++) {
TsPayloadReader payloadReader = tsPayloadReaders.valueAt(i); TsPayloadReader payloadReader = tsPayloadReaders.valueAt(i);
if (payloadReader instanceof PesReader) { if (payloadReader instanceof PesReader) {
payloadReader.consume(new ParsableByteArray(), FLAG_PAYLOAD_UNIT_START_INDICATOR); PesReader pesReader = (PesReader)payloadReader;
if (pesReader.getState() == STATE_READING_BODY && !pesReader.hasPacketLength()) {
pesReader.consume(new ParsableByteArray(), FLAG_PAYLOAD_UNIT_START_INDICATOR);
}
} }
} }
return RESULT_END_OF_INPUT; return RESULT_END_OF_INPUT;