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
f3e62343
authored
Jun 17, 2021
by
christosts
Committed by
Ian Baker
Jul 16, 2021
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Forward FRAME-RATE from the master playlist to renditions
Issue: #8960 PiperOrigin-RevId: 379922704
parent
4190ff32
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletions
RELEASENOTES.md
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
RELEASENOTES.md
View file @
f3e62343
...
@@ -24,6 +24,8 @@
...
@@ -24,6 +24,8 @@
`EXT-X-MAP`
tag in a media playlist, would not be loaded when
`EXT-X-MAP`
tag in a media playlist, would not be loaded when
encountered during playback
encountered during playback
(
[
#9004
](
https://github.com/google/ExoPlayer/issues/9004
)
).
(
[
#9004
](
https://github.com/google/ExoPlayer/issues/9004
)
).
*
Forward the FRAME-RATE value from the master playlist to renditions.
(
[
#8960
](
https://github.com/google/ExoPlayer/issues/8960
)
).
*
UI:
*
UI:
*
Add
`PendingIntent.FLAG_IMMUTABLE`
flag when creating a broadcast intent
*
Add
`PendingIntent.FLAG_IMMUTABLE`
flag when creating a broadcast intent
in
`PlayerNotificationManager`
. This is required to avoid an error on
in
`PlayerNotificationManager`
. This is required to avoid an error on
...
...
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
View file @
f3e62343
...
@@ -1502,7 +1502,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
...
@@ -1502,7 +1502,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
.
setPeakBitrate
(
propagateBitrates
?
playlistFormat
.
peakBitrate
:
Format
.
NO_VALUE
)
.
setPeakBitrate
(
propagateBitrates
?
playlistFormat
.
peakBitrate
:
Format
.
NO_VALUE
)
.
setCodecs
(
codecs
)
.
setCodecs
(
codecs
)
.
setWidth
(
playlistFormat
.
width
)
.
setWidth
(
playlistFormat
.
width
)
.
setHeight
(
playlistFormat
.
height
);
.
setHeight
(
playlistFormat
.
height
)
.
setFrameRate
(
playlistFormat
.
frameRate
);
if
(
sampleMimeType
!=
null
)
{
if
(
sampleMimeType
!=
null
)
{
formatBuilder
.
setSampleMimeType
(
sampleMimeType
);
formatBuilder
.
setSampleMimeType
(
sampleMimeType
);
...
...
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