From 63f66a8701df93805473a4fa9801d86b1686a677 Mon Sep 17 00:00:00 2001
From: Linyu He <linyuh@google.com>
Date: Thu, 8 Dec 2022 20:48:49 +0000
Subject: [PATCH] [Zuma 8k] Revert ag/20294157: add 8k encoder profiles for P23
 devices (2nd attempt)

Per b/259732944#comment2, using CamcorderProfile.QUALITY_HIGH will
request an 8k stream if 8k is present in media_profiles. This is because
QUALITY_HIGH is the "quality level corresponding to the highest
available resolution".

(https://developer.android.com/reference/android/media/CamcorderProfile#QUALITY_HIGH)

However, the 8k support in camera HAL isn't ready, so we have to remove
8k from media_profiles to avoid breaking apps using QUALITY_HIGH.

Bug: 232811715
Bug: 259732944
Test: build
Test: boot & check GCA video recording
Change-Id: I52a2b6c577acfff1d871cc038916d1490abd0fd6
---
 media_profiles_husky.xml      | 21 ++++-----------------
 media_profiles_ripcurrent.xml | 21 ++++-----------------
 media_profiles_shiba.xml      | 21 ++++-----------------
 3 files changed, 12 insertions(+), 51 deletions(-)

diff --git a/media_profiles_husky.xml b/media_profiles_husky.xml
index e4cf76e..aa947e5 100644
--- a/media_profiles_husky.xml
+++ b/media_profiles_husky.xml
@@ -79,19 +79,6 @@
     <!-- Each camcorder profile defines a set of predefined configuration parameters -->
     <CamcorderProfiles cameraId="0">
 
-        <EncoderProfile quality="8kuhd" fileFormat="mp4" duration="60">
-            <Video codec="h264"
-                   bitRate="80000000"
-                   width="7680"
-                   height="4320"
-                   frameRate="30" />
-
-            <Audio codec="aac"
-                   bitRate="96000"
-                   sampleRate="48000"
-                   channels="1" />
-        </EncoderProfile>
-
         <EncoderProfile quality="2160p" fileFormat="mp4" duration="60">
             <Video codec="h264"
                    bitRate="72000000"
@@ -1762,14 +1749,14 @@
     -->
     <VideoEncoderCap name="hevc" enabled="true"
         minBitRate="64000" maxBitRate="100000000"
-        minFrameWidth="128" maxFrameWidth="7680"
-        minFrameHeight="96" maxFrameHeight="4320"
+        minFrameWidth="128" maxFrameWidth="3840"
+        minFrameHeight="96" maxFrameHeight="2160"
         minFrameRate="15" maxFrameRate="30" />
 
     <VideoEncoderCap name="h264" enabled="true"
         minBitRate="64000" maxBitRate="100000000"
-        minFrameWidth="128" maxFrameWidth="7680"
-        minFrameHeight="96" maxFrameHeight="4320"
+        minFrameWidth="128" maxFrameWidth="3840"
+        minFrameHeight="96" maxFrameHeight="2160"
         minFrameRate="15" maxFrameRate="30" />
 
     <VideoEncoderCap name="h263" enabled="true"
diff --git a/media_profiles_ripcurrent.xml b/media_profiles_ripcurrent.xml
index 4cc673b..ec2be61 100644
--- a/media_profiles_ripcurrent.xml
+++ b/media_profiles_ripcurrent.xml
@@ -79,19 +79,6 @@
     <!-- Each camcorder profile defines a set of predefined configuration parameters -->
     <CamcorderProfiles cameraId="0">
 
-        <EncoderProfile quality="8kuhd" fileFormat="mp4" duration="60">
-            <Video codec="h264"
-                   bitRate="80000000"
-                   width="7680"
-                   height="4320"
-                   frameRate="30" />
-
-            <Audio codec="aac"
-                   bitRate="96000"
-                   sampleRate="48000"
-                   channels="1" />
-        </EncoderProfile>
-
         <EncoderProfile quality="2160p" fileFormat="mp4" duration="60">
             <Video codec="h264"
                    bitRate="72000000"
@@ -1749,14 +1736,14 @@
     -->
     <VideoEncoderCap name="hevc" enabled="true"
         minBitRate="64000" maxBitRate="100000000"
-        minFrameWidth="128" maxFrameWidth="7680"
-        minFrameHeight="96" maxFrameHeight="4320"
+        minFrameWidth="128" maxFrameWidth="3840"
+        minFrameHeight="96" maxFrameHeight="2160"
         minFrameRate="15" maxFrameRate="30" />
 
     <VideoEncoderCap name="h264" enabled="true"
         minBitRate="64000" maxBitRate="100000000"
-        minFrameWidth="128" maxFrameWidth="7680"
-        minFrameHeight="96" maxFrameHeight="4320"
+        minFrameWidth="128" maxFrameWidth="3840"
+        minFrameHeight="96" maxFrameHeight="2160"
         minFrameRate="15" maxFrameRate="30" />
 
     <VideoEncoderCap name="h263" enabled="true"
diff --git a/media_profiles_shiba.xml b/media_profiles_shiba.xml
index e4cf76e..aa947e5 100644
--- a/media_profiles_shiba.xml
+++ b/media_profiles_shiba.xml
@@ -79,19 +79,6 @@
     <!-- Each camcorder profile defines a set of predefined configuration parameters -->
     <CamcorderProfiles cameraId="0">
 
-        <EncoderProfile quality="8kuhd" fileFormat="mp4" duration="60">
-            <Video codec="h264"
-                   bitRate="80000000"
-                   width="7680"
-                   height="4320"
-                   frameRate="30" />
-
-            <Audio codec="aac"
-                   bitRate="96000"
-                   sampleRate="48000"
-                   channels="1" />
-        </EncoderProfile>
-
         <EncoderProfile quality="2160p" fileFormat="mp4" duration="60">
             <Video codec="h264"
                    bitRate="72000000"
@@ -1762,14 +1749,14 @@
     -->
     <VideoEncoderCap name="hevc" enabled="true"
         minBitRate="64000" maxBitRate="100000000"
-        minFrameWidth="128" maxFrameWidth="7680"
-        minFrameHeight="96" maxFrameHeight="4320"
+        minFrameWidth="128" maxFrameWidth="3840"
+        minFrameHeight="96" maxFrameHeight="2160"
         minFrameRate="15" maxFrameRate="30" />
 
     <VideoEncoderCap name="h264" enabled="true"
         minBitRate="64000" maxBitRate="100000000"
-        minFrameWidth="128" maxFrameWidth="7680"
-        minFrameHeight="96" maxFrameHeight="4320"
+        minFrameWidth="128" maxFrameWidth="3840"
+        minFrameHeight="96" maxFrameHeight="2160"
         minFrameRate="15" maxFrameRate="30" />
 
     <VideoEncoderCap name="h263" enabled="true"