From 38360f626729a75a016ba20a546b40405b30ea80 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 7 Aug 2017 11:05:12 -0700
Subject: [PATCH] Add support for HLS's FRAME-RATE attribute

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164482135
---
 .../hls/playlist/HlsMasterPlaylistParserTest.java     |  7 +++++--
 .../source/hls/playlist/HlsPlaylistParser.java        | 11 ++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
index f835c87466..35cd7f03d8 100644
--- a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
+++ b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
@@ -42,10 +42,10 @@ public class HlsMasterPlaylistParserTest extends TestCase {
       + "#EXT-X-STREAM-INF:BANDWIDTH=1280000,CODECS=\"mp4a.40.2 , avc1.66.30 \"\n"
       + "http://example.com/spaces_in_codecs.m3u8\n"
       + "\n"
-      + "#EXT-X-STREAM-INF:BANDWIDTH=2560000,RESOLUTION=384x160\n"
+      + "#EXT-X-STREAM-INF:BANDWIDTH=2560000,FRAME-RATE=25,RESOLUTION=384x160\n"
       + "http://example.com/mid.m3u8\n"
       + "\n"
-      + "#EXT-X-STREAM-INF:BANDWIDTH=7680000\n"
+      + "#EXT-X-STREAM-INF:BANDWIDTH=7680000,FRAME-RATE=29.997\n"
       + "http://example.com/hi.m3u8\n"
       + "\n"
       + "#EXT-X-STREAM-INF:BANDWIDTH=65000,CODECS=\"mp4a.40.5\"\n"
@@ -96,18 +96,21 @@ public class HlsMasterPlaylistParserTest extends TestCase {
     assertNull(variants.get(2).format.codecs);
     assertEquals(384, variants.get(2).format.width);
     assertEquals(160, variants.get(2).format.height);
+    assertEquals(25.0f, variants.get(2).format.frameRate);
     assertEquals("http://example.com/mid.m3u8", variants.get(2).url);
 
     assertEquals(7680000, variants.get(3).format.bitrate);
     assertNull(variants.get(3).format.codecs);
     assertEquals(Format.NO_VALUE, variants.get(3).format.width);
     assertEquals(Format.NO_VALUE, variants.get(3).format.height);
+    assertEquals(29.997f, variants.get(3).format.frameRate);
     assertEquals("http://example.com/hi.m3u8", variants.get(3).url);
 
     assertEquals(65000, variants.get(4).format.bitrate);
     assertEquals("mp4a.40.5", variants.get(4).format.codecs);
     assertEquals(Format.NO_VALUE, variants.get(4).format.width);
     assertEquals(Format.NO_VALUE, variants.get(4).format.height);
+    assertEquals((float) Format.NO_VALUE, variants.get(4).format.frameRate);
     assertEquals("http://example.com/audio-only.m3u8", variants.get(4).url);
   }
 
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index 09d6fcfa18..c5d3302eca 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -81,6 +81,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
   private static final Pattern REGEX_BANDWIDTH = Pattern.compile("[^-]BANDWIDTH=(\\d+)\\b");
   private static final Pattern REGEX_CODECS = Pattern.compile("CODECS=\"(.+?)\"");
   private static final Pattern REGEX_RESOLUTION = Pattern.compile("RESOLUTION=(\\d+x\\d+)");
+  private static final Pattern REGEX_FRAME_RATE = Pattern.compile("FRAME-RATE=([\\d\\.]+)\\b");
   private static final Pattern REGEX_TARGET_DURATION = Pattern.compile(TAG_TARGET_DURATION
       + ":(\\d+)\\b");
   private static final Pattern REGEX_VERSION = Pattern.compile(TAG_VERSION + ":(\\d+)\\b");
@@ -238,6 +239,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
             break;
         }
       } else if (line.startsWith(TAG_STREAM_INF)) {
+        noClosedCaptions |= line.contains(ATTR_CLOSED_CAPTIONS_NONE);
         int bitrate = parseIntAttr(line, REGEX_BANDWIDTH);
         String averageBandwidthString = parseOptionalStringAttr(line, REGEX_AVERAGE_BANDWIDTH);
         if (averageBandwidthString != null) {
@@ -246,7 +248,6 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
         }
         String codecs = parseOptionalStringAttr(line, REGEX_CODECS);
         String resolutionString = parseOptionalStringAttr(line, REGEX_RESOLUTION);
-        noClosedCaptions |= line.contains(ATTR_CLOSED_CAPTIONS_NONE);
         int width;
         int height;
         if (resolutionString != null) {
@@ -262,11 +263,15 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
           width = Format.NO_VALUE;
           height = Format.NO_VALUE;
         }
+        float frameRate = Format.NO_VALUE;
+        String frameRateString = parseOptionalStringAttr(line, REGEX_FRAME_RATE);
+        if (frameRateString != null) {
+          frameRate = Float.parseFloat(frameRateString);
+        }
         line = iterator.next(); // #EXT-X-STREAM-INF's URI.
         if (variantUrls.add(line)) {
           Format format = Format.createVideoContainerFormat(Integer.toString(variants.size()),
-              MimeTypes.APPLICATION_M3U8, null, codecs, bitrate, width, height, Format.NO_VALUE,
-              null, 0);
+              MimeTypes.APPLICATION_M3U8, null, codecs, bitrate, width, height, frameRate, null, 0);
           variants.add(new HlsMasterPlaylist.HlsUrl(line, format));
         }
       }