commit af9e2b0c046c71d715d9de096ef4e912ac22ca77
author Jason Lee <jasl@google.com> Wed May 12 01:39:14 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 12 01:39:14 2021 +0000
tree ad413a671f004856b9f27bc03e7453af8d43c420
parent a8e4bb849e45ff045ee01decd63e4fd358ac7f36
parent 30e3d9a5f122c15f5b13317d20a9ee6d7a02e44d

Cap VideoEncoderCap maxFrameRate to 30 am: 30e3d9a5f1

Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/14494378

Change-Id: I98f40749ad893fbff24f3f012dd13f5af4cf35ba

media_profiles_oriole.xml

diff --git a/media_profiles_oriole.xml b/media_profiles_oriole.xml
index 89004be..87444ad 100644
--- a/media_profiles_oriole.xml
+++ b/media_profiles_oriole.xml
@@ -1029,13 +1029,13 @@
         minBitRate="64000" maxBitRate="100000000"
         minFrameWidth="128" maxFrameWidth="3840"
         minFrameHeight="96" maxFrameHeight="2160"
-        minFrameRate="15" maxFrameRate="60" />
+        minFrameRate="15" maxFrameRate="30" />
 
     <VideoEncoderCap name="h264" enabled="true"
         minBitRate="64000" maxBitRate="100000000"
         minFrameWidth="128" maxFrameWidth="3840"
         minFrameHeight="96" maxFrameHeight="2160"
-        minFrameRate="15" maxFrameRate="60" />
+        minFrameRate="15" maxFrameRate="30" />
 
     <VideoEncoderCap name="h263" enabled="true"
         minBitRate="64000" maxBitRate="1000000"

media_profiles_raven.xml

diff --git a/media_profiles_raven.xml b/media_profiles_raven.xml
index 0fdc03d..7ebbef6 100644
--- a/media_profiles_raven.xml
+++ b/media_profiles_raven.xml
@@ -1554,13 +1554,13 @@
         minBitRate="64000" maxBitRate="100000000"
         minFrameWidth="128" maxFrameWidth="3840"
         minFrameHeight="96" maxFrameHeight="2160"
-        minFrameRate="15" maxFrameRate="60" />
+        minFrameRate="15" maxFrameRate="30" />
 
     <VideoEncoderCap name="h264" enabled="true"
         minBitRate="64000" maxBitRate="100000000"
         minFrameWidth="128" maxFrameWidth="3840"
         minFrameHeight="96" maxFrameHeight="2160"
-        minFrameRate="15" maxFrameRate="60" />
+        minFrameRate="15" maxFrameRate="30" />
 
     <VideoEncoderCap name="h263" enabled="true"
         minBitRate="64000" maxBitRate="1000000"

media_profiles_slider.xml

diff --git a/media_profiles_slider.xml b/media_profiles_slider.xml
index 7ce81e5..a0d55d4 100644
--- a/media_profiles_slider.xml
+++ b/media_profiles_slider.xml
@@ -1358,13 +1358,13 @@
         minBitRate="64000" maxBitRate="100000000"
         minFrameWidth="128" maxFrameWidth="3840"
         minFrameHeight="96" maxFrameHeight="2160"
-        minFrameRate="15" maxFrameRate="60" />
+        minFrameRate="15" maxFrameRate="30" />
 
     <VideoEncoderCap name="h264" enabled="true"
         minBitRate="64000" maxBitRate="100000000"
         minFrameWidth="128" maxFrameWidth="3840"
         minFrameHeight="96" maxFrameHeight="2160"
-        minFrameRate="15" maxFrameRate="60" />
+        minFrameRate="15" maxFrameRate="30" />
 
     <VideoEncoderCap name="h263" enabled="true"
         minBitRate="64000" maxBitRate="1000000"

media_profiles_whitefin.xml

diff --git a/media_profiles_whitefin.xml b/media_profiles_whitefin.xml
index ebc685a..02eb8b0 100644
--- a/media_profiles_whitefin.xml
+++ b/media_profiles_whitefin.xml
@@ -916,13 +916,13 @@
         minBitRate="64000" maxBitRate="100000000"
         minFrameWidth="128" maxFrameWidth="3840"
         minFrameHeight="96" maxFrameHeight="2160"
-      minFrameRate="15" maxFrameRate="60" />
+      minFrameRate="15" maxFrameRate="30" />
 
     <VideoEncoderCap name="h264" enabled="true"
         minBitRate="64000" maxBitRate="100000000"
         minFrameWidth="128" maxFrameWidth="3840"
         minFrameHeight="96" maxFrameHeight="2160"
-        minFrameRate="15" maxFrameRate="60" />
+        minFrameRate="15" maxFrameRate="30" />
 
     <VideoEncoderCap name="h263" enabled="true"
         minBitRate="64000" maxBitRate="1000000"