From 08850e91c7c469808a632d48fb1330fce3cdf0f3 Mon Sep 17 00:00:00 2001
From: Boyu Zhang <boyuzhang@google.com>
Date: Tue, 15 Nov 2022 04:18:44 +0000
Subject: [PATCH] Revert "Add 720p@480fps media profiles for P23 devices."

This reverts commit 9e97195ff4f64ff07c13315d2ae9745841e03433.

Reason for revert: The CL makes the CTS test testConstrainedHighSpeedCapability fail because we didn't add 480fps to camera characteristics, which in turn is because 480fps on P23 was descoped.

Change-Id: Ic200d63e911e8c49fb86f00855f7d38f2a926e52
---
 media_profiles_husky.xml | 14 --------------
 media_profiles_shiba.xml | 14 --------------
 2 files changed, 28 deletions(-)

diff --git a/media_profiles_husky.xml b/media_profiles_husky.xml
index e02fa25..09e48c6 100644
--- a/media_profiles_husky.xml
+++ b/media_profiles_husky.xml
@@ -309,20 +309,6 @@
                    channels="1" />
         </EncoderProfile>
 
-        <EncoderProfile quality="highspeed720p" fileFormat="mp4" duration="60">
-            <Video codec="h264"
-                   bitRate="72000000"
-                   width="1280"
-                   height="720"
-                   frameRate="480" />
-
-            <!-- audio setting is ignored -->
-            <Audio codec="aac"
-                   bitRate="96000"
-                   sampleRate="48000"
-                   channels="1" />
-        </EncoderProfile>
-
         <ImageEncoding quality="90" />
         <ImageEncoding quality="80" />
         <ImageEncoding quality="70" />
diff --git a/media_profiles_shiba.xml b/media_profiles_shiba.xml
index e02fa25..09e48c6 100644
--- a/media_profiles_shiba.xml
+++ b/media_profiles_shiba.xml
@@ -309,20 +309,6 @@
                    channels="1" />
         </EncoderProfile>
 
-        <EncoderProfile quality="highspeed720p" fileFormat="mp4" duration="60">
-            <Video codec="h264"
-                   bitRate="72000000"
-                   width="1280"
-                   height="720"
-                   frameRate="480" />
-
-            <!-- audio setting is ignored -->
-            <Audio codec="aac"
-                   bitRate="96000"
-                   sampleRate="48000"
-                   channels="1" />
-        </EncoderProfile>
-
         <ImageEncoding quality="90" />
         <ImageEncoding quality="80" />
         <ImageEncoding quality="70" />