From 53eef4db82f6f1d75d7b748239193cc149593d42 Mon Sep 17 00:00:00 2001
From: wenchangliu <wenchangliu@google.com>
Date: Tue, 3 May 2022 08:46:21 +0000
Subject: [PATCH] update performance-point for media performance class 13

Support 6 instances of hardware video encoder/decoder
sessions (AVC, HEVC, VP9 or AV1) in any codec combination
running concurrently at 1080p resolution@30fps.

Bug: 233775011
Test: CtsMediaPerformanceClassTestCases
Test: CtsMediaEncoderTestCases
Test: android.media.misc.cts.MediaCodecListTest#testAllHardwareAcceleratedVideoCodecsPublishPerformancePoints
Change-Id: I0f260d83164cb8b4944a4a603408400c0c3a7184
---
 media_codecs_aosp_c2.xml | 22 +++++++++++-----------
 media_codecs_bo_c2.xml   |  6 ++----
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml
index 62b47070..85096ee4 100644
--- a/media_codecs_aosp_c2.xml
+++ b/media_codecs_aosp_c2.xml
@@ -26,7 +26,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-120000000" />
-            <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" />
@@ -39,7 +39,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-120000000" />
-            <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" />
@@ -53,7 +53,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-120000000" />
-            <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" />
@@ -66,7 +66,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-120000000" />
-            <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" />
@@ -105,7 +105,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" />
@@ -118,7 +118,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="16" />
             <Feature name="adaptive-playback" />
@@ -131,7 +131,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" />
@@ -148,7 +148,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-120000000" />
-            <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" />
@@ -162,7 +162,7 @@
             <Limit name="block-count" range="1-8160" />
             <Limit name="blocks-per-second" min="1" max="979200" />
             <Limit name="bitrate" range="1-120000000" />
-            <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" />
@@ -203,7 +203,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" />
@@ -217,7 +217,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" />
diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml
index 22ad88e2..fb54359e 100644
--- a/media_codecs_bo_c2.xml
+++ b/media_codecs_bo_c2.xml
@@ -25,8 +25,7 @@
           <Limit name="bitrate" range="1-120000000" />
           <Limit name="frame-rate" range="1-180" />
           <Limit name="concurrent-instances" max="16" />
-          <Limit name="performance-point-1280x720" value="180" />
-          <Limit name="performance-point-1920x1080" value="120" />
+          <Limit name="performance-point-1920x1080" value="200" />
           <Limit name="performance-point-3840x2160" value="60" />
           <Feature name="adaptive-playback" />
           <Feature name="can-swap-width-height" value="1" />
@@ -40,8 +39,7 @@
           <Limit name="bitrate" range="1-120000000" />
           <Limit name="frame-rate" range="1-180" />
           <Limit name="concurrent-instances" max="16" />
-          <Limit name="performance-point-1280x720" value="180" />
-          <Limit name="performance-point-1920x1080" value="120" />
+          <Limit name="performance-point-1920x1080" value="200" />
           <Limit name="performance-point-3840x2160" value="60" />
           <Feature name="adaptive-playback" />
           <Feature name="secure-playback" required="true" />