From f3e62343fcb82579e587e03c987e66ca68ab10fe Mon Sep 17 00:00:00 2001 From: christosts Date: Thu, 17 Jun 2021 11:43:26 +0100 Subject: [PATCH] Forward FRAME-RATE from the master playlist to renditions Issue: #8960 PiperOrigin-RevId: 379922704 --- RELEASENOTES.md | 2 ++ .../android/exoplayer2/source/hls/HlsSampleStreamWrapper.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 95c8f33560..ccf6d2f7c2 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -24,6 +24,8 @@ `EXT-X-MAP` tag in a media playlist, would not be loaded when encountered during playback ([#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: * Add `PendingIntent.FLAG_IMMUTABLE` flag when creating a broadcast intent in `PlayerNotificationManager`. This is required to avoid an error on diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java index 37468bfb1d..0bca1b2198 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java @@ -1502,7 +1502,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; .setPeakBitrate(propagateBitrates ? playlistFormat.peakBitrate : Format.NO_VALUE) .setCodecs(codecs) .setWidth(playlistFormat.width) - .setHeight(playlistFormat.height); + .setHeight(playlistFormat.height) + .setFrameRate(playlistFormat.frameRate); if (sampleMimeType != null) { formatBuilder.setSampleMimeType(sampleMimeType);