From 3f86a05db90e4853a3a1f7086560917c14472423 Mon Sep 17 00:00:00 2001
From: Linyu He <linyuh@google.com>
Date: Wed, 21 Jun 2023 20:27:09 +0000
Subject: [PATCH] [Zuma 8k] Remove 8K from "shusky" (P23) media_profiles on
 udc-d1-dev

Zuma 8K won't be shipped on P23 devices, so "8K" should be removed
from media_profiles as it's visible to the public.

This CL removes 8K support on udc-d1-dev, which is the branch for
launching P23.

To continue developing 8K using P23 devices, we'll re-enable 8K support
on udc-qpr-dev with a follow-up CL.

Bug: 288304801
Test: python gca_smoke.py
Test: CTS & PTS
Change-Id: Ie0c35ea2c2bb1ab49912b69079b2038b42f632f1
---
 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 cfc89bb..8abc330 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="high" 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 20e20ee..6e2977d 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="high" 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_shiba.xml b/media_profiles_shiba.xml
index 4b3b8e3..1da2154 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="high" fileFormat="mp4" duration="60">
             <Video codec="h264"
                    bitRate="72000000"
@@ -1394,14 +1381,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"