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

Noop naming generalization for H265Reader

Browse Source 
This change generalizes the concept of "reading parameter sets" to
"reading prefix NAL units", ahead of a change that will treat AUD
and suffix SEI NAL units in the same way.

The change also introduces some static isXxxNalUnit methods for
clarity.

Issue: #7113
PiperOrigin-RevId: 307376967
This commit is contained in:
olly 2020-04-20 12:54:52 +01:00 committed by Oliver Woodman
parent eb8c174b4c
commit 9a7290000c
1 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java
View File

@ -65,7 +65,7 @@ public final class H265Reader implements ElementaryStreamReader {
private final NalUnitTargetBuffer sps; private final NalUnitTargetBuffer sps;
private final NalUnitTargetBuffer pps; private final NalUnitTargetBuffer pps;
private final NalUnitTargetBuffer prefixSei; private final NalUnitTargetBuffer prefixSei;
private final NalUnitTargetBuffer suffixSei; // TODO: Are both needed? private final NalUnitTargetBuffer suffixSei;
private long totalBytesWritten; private long totalBytesWritten;
// Per packet state that gets reset at the start of each packet. // Per packet state that gets reset at the start of each packet.
@ -424,17 +424,17 @@ public final class H265Reader implements ElementaryStreamReader {
private final TrackOutput output; private final TrackOutput output;
// Per NAL unit state. A sample consists of one or more NAL units. // Per NAL unit state. A sample consists of one or more NAL units.
private long nalUnitStartPosition; private long nalUnitPosition;
private boolean nalUnitHasKeyframeData; private boolean nalUnitHasKeyframeData;
private int nalUnitBytesRead; private int nalUnitBytesRead;
private long nalUnitTimeUs; private long nalUnitTimeUs;
private boolean lookingForFirstSliceFlag; private boolean lookingForFirstSliceFlag;
private boolean isFirstSlice; private boolean isFirstSlice;
private boolean isFirstParameterSet; private boolean isFirstPrefixNalUnit;
// Per sample state that gets reset at the start of each sample. // Per sample state that gets reset at the start of each sample.
private boolean readingSample; private boolean readingSample;
private boolean writingParameterSets; private boolean readingPrefix;
private long samplePosition; private long samplePosition;
private long sampleTimeUs; private long sampleTimeUs;
private boolean sampleIsKeyframe; private boolean sampleIsKeyframe;
@ -446,31 +446,29 @@ public final class H265Reader implements ElementaryStreamReader {
public void reset() { public void reset() {
lookingForFirstSliceFlag = false; lookingForFirstSliceFlag = false;
isFirstSlice = false; isFirstSlice = false;
isFirstParameterSet = false; isFirstPrefixNalUnit = false;
readingSample = false; readingSample = false;
writingParameterSets = false; readingPrefix = false;
} }
public void startNalUnit( public void startNalUnit(
long position, int offset, int nalUnitType, long pesTimeUs, boolean hasOutputFormat) { long position, int offset, int nalUnitType, long pesTimeUs, boolean hasOutputFormat) {
isFirstSlice = false; isFirstSlice = false;
isFirstParameterSet = false; isFirstPrefixNalUnit = false;
nalUnitTimeUs = pesTimeUs; nalUnitTimeUs = pesTimeUs;
nalUnitBytesRead = 0; nalUnitBytesRead = 0;
nalUnitStartPosition = position; nalUnitPosition = position;
if (nalUnitType >= VPS_NUT) { if (!isVclBodyNalUnit(nalUnitType)) {
if (!writingParameterSets && readingSample) { if (readingSample && !readingPrefix) {
// This is a non-VCL NAL unit, so flush the previous sample.
if (hasOutputFormat) { if (hasOutputFormat) {
outputSample(offset); outputSample(offset);
} }
readingSample = false; readingSample = false;
} }
if (nalUnitType <= PPS_NUT) { if (isPrefixNalUnit(nalUnitType)) {
// This sample will have parameter sets at the start. isFirstPrefixNalUnit = !readingPrefix;
isFirstParameterSet = !writingParameterSets; readingPrefix = true;
writingParameterSets = true;
} }
} }
@ -492,30 +490,40 @@ public final class H265Reader implements ElementaryStreamReader {
} }
public void endNalUnit(long position, int offset, boolean hasOutputFormat) { public void endNalUnit(long position, int offset, boolean hasOutputFormat) {
if (writingParameterSets && isFirstSlice) { if (readingPrefix && isFirstSlice) {
// This sample has parameter sets. Reset the key-frame flag based on the first slice. // This sample has parameter sets. Reset the key-frame flag based on the first slice.
sampleIsKeyframe = nalUnitHasKeyframeData; sampleIsKeyframe = nalUnitHasKeyframeData;
writingParameterSets = false; readingPrefix = false;
} else if (isFirstParameterSet || isFirstSlice) { } else if (isFirstPrefixNalUnit || isFirstSlice) {
// This NAL unit is at the start of a new sample (access unit). // This NAL unit is at the start of a new sample (access unit).
if (hasOutputFormat && readingSample) { if (hasOutputFormat && readingSample) {
// Output the sample ending before this NAL unit. // Output the sample ending before this NAL unit.
int nalUnitLength = (int) (position - nalUnitStartPosition); int nalUnitLength = (int) (position - nalUnitPosition);
outputSample(offset + nalUnitLength); outputSample(offset + nalUnitLength);
} }
samplePosition = nalUnitStartPosition; samplePosition = nalUnitPosition;
sampleTimeUs = nalUnitTimeUs; sampleTimeUs = nalUnitTimeUs;
readingSample = true;
sampleIsKeyframe = nalUnitHasKeyframeData; sampleIsKeyframe = nalUnitHasKeyframeData;
readingSample = true;
} }
} }
private void outputSample(int offset) { private void outputSample(int offset) {
@C.BufferFlags int flags = sampleIsKeyframe ? C.BUFFER_FLAG_KEY_FRAME : 0; @C.BufferFlags int flags = sampleIsKeyframe ? C.BUFFER_FLAG_KEY_FRAME : 0;
int size = (int) (nalUnitStartPosition - samplePosition); int size = (int) (nalUnitPosition - samplePosition);
output.sampleMetadata(sampleTimeUs, flags, size, offset, null); output.sampleMetadata(sampleTimeUs, flags, size, offset, null);
} }
/** Returns whether a NAL unit type is one that occurs before any VCL NAL units in a sample. */
private static boolean isPrefixNalUnit(int nalUnitType) {
// TODO: Include AUD_NUT and PREFIX_SEI_NUT
return VPS_NUT <= nalUnitType && nalUnitType <= PPS_NUT;
} }
/** Returns whether a NAL unit type is one that occurs in the VLC body of a sample. */
private static boolean isVclBodyNalUnit(int nalUnitType) {
// TODO: Include SUFFIX_SEI_NUT
return nalUnitType < VPS_NUT;
}
}
} }