From b5a464cbccd8109aabf0e6bc40f7c0860580c874 Mon Sep 17 00:00:00 2001
From: christosts <christosts@google.com>
Date: Thu, 17 Jun 2021 11:43:26 +0100
Subject: [PATCH] Forward FRAME-RATE from the master playlist to renditions

Issue: #8960

#minor-release

PiperOrigin-RevId: 379922704
---
 RELEASENOTES.md                                                | 3 +++
 .../android/exoplayer2/source/hls/HlsSampleStreamWrapper.java  | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 0c6cfbdf2f..4c841fd1ac 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -73,6 +73,9 @@
     *   Add `setUseFastForwardActionInCompactView(boolean)` and
         `setUseRewindActionInCompactView(boolean)` to make it possible to show
         seek actions in compact view mode.
+*   HLS
+    *   Forward the FRAME-RATE value from the master playlist to renditions.
+        ([#8960](https://github.com/google/ExoPlayer/issues/8960)).
 
 ### 2.14.1 (2021-06-11)
 
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 6e367d338e..15813ff04a 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
@@ -1506,7 +1506,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);