Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
2d025a27
authored
Mar 24, 2022
by
aquilescanta
Committed by
Ian Baker
Mar 24, 2022
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Add maxNumRefFrames to NalUnitUtil
Needed for AVI support. PiperOrigin-RevId: 436991922
parent
22830dcd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletions
library/extractor/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java
library/extractor/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java
library/extractor/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java
View file @
2d025a27
...
@@ -48,6 +48,7 @@ public final class NalUnitUtil {
...
@@ -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 {
...
@@ -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 {
...
@@ -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 {
...
@@ -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 {
...
@@ -442,6 +445,7 @@ public final class NalUnitUtil {
constraintsFlagsAndReservedZero2Bits
,
constraintsFlagsAndReservedZero2Bits
,
levelIdc
,
levelIdc
,
seqParameterSetId
,
seqParameterSetId
,
maxNumRefFrames
,
frameWidth
,
frameWidth
,
frameHeight
,
frameHeight
,
pixelWidthHeightRatio
,
pixelWidthHeightRatio
,
...
...
library/extractor/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java
View file @
2d025a27
...
@@ -124,6 +124,7 @@ public final class NalUnitUtilTest {
...
@@ -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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment