commit fe70acc4be4dbd68e76867f9c9236dd235902e47
author Eden Huang <edenhuang@google.com> Wed May 29 18:31:02 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed May 29 18:31:02 2019 -0700
tree b48823c3f2e9417bce2e01333dbd65b6257c5243
parent c151ea41193e88dfd40ef1acedd7d19757f90b64
parent cc26555f94be0cb7cac37176b333fd2578b0cd90

Merge "camera: Enable 4k@60fps recording" into qt-r1-dev
am: cc26555f94

Change-Id: If5419cd1ee648f0fc16fde157abb5f61fee8a737

media_profiles_V1_0.xml

diff --git a/media_profiles_V1_0.xml b/media_profiles_V1_0.xml
index 23ddfc8..2f0563c 100644
--- a/media_profiles_V1_0.xml
+++ b/media_profiles_V1_0.xml
@@ -37,13 +37,13 @@
                    channels="1" />
         </EncoderProfile>
 
-        <!-- high: 3840 x 2160 30fps -->
+        <!-- high: 3840 x 2160 60fps 72.0 Mbps -->
         <EncoderProfile quality="high" fileFormat="mp4" duration="30">
             <Video codec="h264"
-                   bitRate="42000000"
+                   bitRate="72000000"
                    width="3840"
                    height="2160"
-                   frameRate="30" />
+                   frameRate="60" />
             <Audio codec="aac"
                    bitRate="96000"
                    sampleRate="48000"
@@ -128,13 +128,13 @@
                    channels="1" />
         </EncoderProfile>
 
-        <!-- 2160p: 3840 x 2160 30fps -->
+        <!-- 2160p: 3840 x 2160 60fps 72.0 Mbps -->
         <EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
             <Video codec="h264"
-                   bitRate="42000000"
+                   bitRate="72000000"
                    width="3840"
                    height="2160"
-                   frameRate="30" />
+                   frameRate="60" />
             <Audio codec="aac"
                    bitRate="96000"
                    sampleRate="48000"
@@ -572,7 +572,7 @@
         minBitRate="64000" maxBitRate="100000000"
         minFrameWidth="176" maxFrameWidth="3840"
         minFrameHeight="144" maxFrameHeight="2160"
-        minFrameRate="15" maxFrameRate="30" />
+        minFrameRate="15" maxFrameRate="60" />
 
     <VideoEncoderCap name="h263" enabled="true"
         minBitRate="64000" maxBitRate="2000000"