From 944f48c3db211011a1b6378b650e0da1c3a50ba7 Mon Sep 17 00:00:00 2001
From: Terry Huang <terrycrhuang@google.com>
Date: Wed, 25 May 2022 11:58:16 +0800
Subject: [PATCH 1/2] Enable Google Audio RIL library in PDK

Bug: 233831048
Test: libgooglerilaudio is built in PDK ROM
Change-Id: I395b3b16ff967f46fe2163dde5655c31344bcbe5
---
 device.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device.mk b/device.mk
index 64f554c3..e7af97ef 100644
--- a/device.mk
+++ b/device.mk
@@ -167,6 +167,7 @@ USES_LASSEN_MODEM := true
 ifeq ($(USES_GOOGLE_DIALER_CARRIER_SETTINGS),true)
 USE_GOOGLE_DIALER := true
 USE_GOOGLE_CARRIER_SETTINGS := true
+USES_GAUDIO := true
 endif
 
 ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))

From 079810e65bb1048d47eeb34525717c9f7182bfe3 Mon Sep 17 00:00:00 2001
From: Ruofei Ma <ruofeim@google.com>
Date: Wed, 15 Jun 2022 02:22:47 +0000
Subject: [PATCH 2/2] Revert "update performance-point for media performance
 class 13"

This reverts commit 53eef4db82f6f1d75d7b748239193cc149593d42.

Reason for revert: We do not need to support media performance class 13 for P21 devices and this change is causing regression in P21 so we have to revert it.

Bug: 235027936

Change-Id: I51099b94ac635e001cd56dd6cd250b1b8e0bd9f4
---
 media_codecs_aosp_c2.xml | 22 +++++++++++-----------
 media_codecs_bo_c2.xml   |  6 ++++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml
index 85096ee4..62b47070 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-1920x1080" range="240" />
+            <Limit name="performance-point-1280x720" 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-1920x1080" range="240" />
+            <Limit name="performance-point-1280x720" 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-1920x1080" range="240" />
+            <Limit name="performance-point-1280x720" 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-1920x1080" range="240" />
+            <Limit name="performance-point-1280x720" 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-1920x1080" range="240" />
+            <Limit name="performance-point-1280x720" 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-1920x1080" range="240" />
+            <Limit name="performance-point-1280x720" 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-1920x1080" range="240" />
+            <Limit name="performance-point-1280x720" 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-1920x1080" range="240" />
+            <Limit name="performance-point-1280x720" 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-1920x1080" range="240" />
+            <Limit name="performance-point-1280x720" 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-1920x1080" range="240" />
+            <Limit name="performance-point-1280x720" 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-1920x1080" range="240" />
+            <Limit name="performance-point-1280x720" 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 fb54359e..22ad88e2 100644
--- a/media_codecs_bo_c2.xml
+++ b/media_codecs_bo_c2.xml
@@ -25,7 +25,8 @@
           <Limit name="bitrate" range="1-120000000" />
           <Limit name="frame-rate" range="1-180" />
           <Limit name="concurrent-instances" max="16" />
-          <Limit name="performance-point-1920x1080" value="200" />
+          <Limit name="performance-point-1280x720" value="180" />
+          <Limit name="performance-point-1920x1080" value="120" />
           <Limit name="performance-point-3840x2160" value="60" />
           <Feature name="adaptive-playback" />
           <Feature name="can-swap-width-height" value="1" />
@@ -39,7 +40,8 @@
           <Limit name="bitrate" range="1-120000000" />
           <Limit name="frame-rate" range="1-180" />
           <Limit name="concurrent-instances" max="16" />
-          <Limit name="performance-point-1920x1080" value="200" />
+          <Limit name="performance-point-1280x720" value="180" />
+          <Limit name="performance-point-1920x1080" value="120" />
           <Limit name="performance-point-3840x2160" value="60" />
           <Feature name="adaptive-playback" />
           <Feature name="secure-playback" required="true" />