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

Add maxNumRefFrames to NalUnitUtil

Browse source 
Needed for AVI support.

PiperOrigin-RevId: 436991922
This commit is contained in:
aquilescanta 2022-03-24 14:41:28 +00:00 committed by Ian Baker
parent 22830dcdd0
commit 2d025a2797
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
library/extractor/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java
View file

@ -48,6 +48,7 @@ public final class NalUnitUtil {
public final int constraintsFlagsAndReservedZero2Bits; public final int constraintsFlagsAndReservedZero2Bits;
public final int levelIdc; public final int levelIdc;
public final int seqParameterSetId; public final int seqParameterSetId;
public final int maxNumRefFrames;
public final int width; public final int width;
public final int height; public final int height;
public final float pixelWidthHeightRatio; public final float pixelWidthHeightRatio;
@ -63,6 +64,7 @@ public final class NalUnitUtil {
int constraintsFlagsAndReservedZero2Bits, int constraintsFlagsAndReservedZero2Bits,
int levelIdc, int levelIdc,
int seqParameterSetId, int seqParameterSetId,
int maxNumRefFrames,
int width, int width,
int height, int height,
float pixelWidthHeightRatio, float pixelWidthHeightRatio,
@ -76,6 +78,7 @@ public final class NalUnitUtil {
this.constraintsFlagsAndReservedZero2Bits = constraintsFlagsAndReservedZero2Bits; this.constraintsFlagsAndReservedZero2Bits = constraintsFlagsAndReservedZero2Bits;
this.levelIdc = levelIdc; this.levelIdc = levelIdc;
this.seqParameterSetId = seqParameterSetId; this.seqParameterSetId = seqParameterSetId;
this.maxNumRefFrames = maxNumRefFrames;
this.width = width; this.width = width;
this.height = height; this.height = height;
this.pixelWidthHeightRatio = pixelWidthHeightRatio; this.pixelWidthHeightRatio = pixelWidthHeightRatio;
@ -382,7 +385,7 @@ public final class NalUnitUtil {
data.readUnsignedExpGolombCodedInt(); // offset_for_ref_frame[i] data.readUnsignedExpGolombCodedInt(); // offset_for_ref_frame[i]
} }
} }
data.readUnsignedExpGolombCodedInt(); // max_num_ref_frames int maxNumRefFrames = data.readUnsignedExpGolombCodedInt(); // max_num_ref_frames
data.skipBit(); // gaps_in_frame_num_value_allowed_flag data.skipBit(); // gaps_in_frame_num_value_allowed_flag
int picWidthInMbs = data.readUnsignedExpGolombCodedInt() + 1; int picWidthInMbs = data.readUnsignedExpGolombCodedInt() + 1;
@ -442,6 +445,7 @@ public final class NalUnitUtil {
constraintsFlagsAndReservedZero2Bits, constraintsFlagsAndReservedZero2Bits,
levelIdc, levelIdc,
seqParameterSetId, seqParameterSetId,
maxNumRefFrames,
frameWidth, frameWidth,
frameHeight, frameHeight,
pixelWidthHeightRatio, pixelWidthHeightRatio,

1
library/extractor/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java
View file

@ -124,6 +124,7 @@ public final class NalUnitUtilTest {
public void parseSpsNalUnit() { public void parseSpsNalUnit() {
NalUnitUtil.SpsData data = NalUnitUtil.SpsData data =
NalUnitUtil.parseSpsNalUnit(SPS_TEST_DATA, SPS_TEST_DATA_OFFSET, SPS_TEST_DATA.length); NalUnitUtil.parseSpsNalUnit(SPS_TEST_DATA, SPS_TEST_DATA_OFFSET, SPS_TEST_DATA.length);
assertThat(data.maxNumRefFrames).isEqualTo(4);
assertThat(data.width).isEqualTo(640); assertThat(data.width).isEqualTo(640);
assertThat(data.height).isEqualTo(360); assertThat(data.height).isEqualTo(360);
assertThat(data.deltaPicOrderAlwaysZeroFlag).isFalse(); assertThat(data.deltaPicOrderAlwaysZeroFlag).isFalse();