From 5472e8745576ed0c2d78b44fb7855f791b7ebe13 Mon Sep 17 00:00:00 2001
From: wenchangliu <wenchangliu@google.com>
Date: Fri, 7 Jul 2023 02:44:27 +0000
Subject: [PATCH] advertise performance points for 1080p resolution

We advertise 4k@120 for meet Performance class U requirements.
However, to compliant with performance class T requirements,
We need advertise at least performace point to 180 FPS for 1080p resolution.

Bug: 290220438
Test: run cts -m CtsMediaMiscTestCases
Test: run cts -m CtsMediaPerformanceClassTestCases
Change-Id: I1eeee5f166ecc4f4416777b321a3d74d651029f2
---
 media_codecs_aosp_c2.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml
index c2e37a7d..c1d4a891 100644
--- a/media_codecs_aosp_c2.xml
+++ b/media_codecs_aosp_c2.xml
@@ -26,7 +26,7 @@
             <Limit name="block-count" range="1-129600" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-240000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="performance-point-7680x4320" range="30" />
             <Limit name="concurrent-instances" max="16" />
@@ -41,7 +41,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-240000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="2" />
             <Feature name="adaptive-playback" />
@@ -56,7 +56,7 @@
             <Limit name="block-count" range="1-129600" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-240000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="performance-point-7680x4320" range="30" />
             <Limit name="concurrent-instances" max="16" />
@@ -71,7 +71,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-240000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="2" />
             <Feature name="adaptive-playback" />
@@ -113,7 +113,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-80000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="adaptive-playback" />
@@ -127,7 +127,7 @@
             <Limit name="block-count" range="1-8160" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-80000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="performance-point-7680x4320" range="30" />
             <Limit name="concurrent-instances" max="16" />
@@ -142,7 +142,7 @@
             <Limit name="block-count" range="1-2040" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-80000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="2" />
             <Feature name="adaptive-playback" />
@@ -160,7 +160,7 @@
             <Limit name="block-count" range="1-129600" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-240000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="performance-point-7680x4320" range="30" />
             <Limit name="concurrent-instances" max="16" />
@@ -177,7 +177,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="972000" />
             <Limit name="bitrate" range="1-240000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="performance-point-7680x4320" range="30" />
             <Limit name="concurrent-instances" max="16" />
@@ -227,7 +227,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-80000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="can-swap-width-height" value="1" />
@@ -243,7 +243,7 @@
             <Limit name="block-count" range="1-2040" />
             <Limit name="blocks-per-second" min="1" max="243000" />
             <Limit name="bitrate" range="1-80000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="can-swap-width-height" value="1" />