From fcaad093614bc4714bb76c8bf19e8c002f6e6dbe Mon Sep 17 00:00:00 2001
From: Ruofei Ma <ruofeim@google.com>
Date: Fri, 14 Oct 2022 01:04:14 +0000
Subject: [PATCH 1/3] update performance-point for AV1 decoder

AV1 decoder supports 6 instances 1080p at 30fps, so we need
to publish 180fps for 1080p performance point. Since 180fps
is not standard performance point, we also publish 120fps to
meet the requirement which requires at least one standard
performance point is published.

Bug: 242818250

Test: CtsMediaPerformanceClassTestCases
Test: android.media.misc.cts.MediaCodecListTest#testAllHardwareAcceleratedVideoCodecsPublishPerformancePoints

Signed-off-by: Ruofei Ma <ruofeim@google.com>
Change-Id: I3a46cd3b4856de0e6f6ecb411e47f9e8c366a79d
(cherry picked from commit 747f7bb6d7181049d4ced3f1d6f0665945554b1c)
Merged-In: I3a46cd3b4856de0e6f6ecb411e47f9e8c366a79d
---
 media_codecs_bo_c2.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml
index 7830b9c9..ec2a4d20 100644
--- a/media_codecs_bo_c2.xml
+++ b/media_codecs_bo_c2.xml
@@ -26,7 +26,8 @@
           <Limit name="bitrate" range="1-120000000" />
           <Limit name="frame-rate" range="1-120" />
           <Limit name="concurrent-instances" max="16" />
-          <Limit name="performance-point-1920x1080" value="200" />
+          <Limit name="performance-point-1920x1080" value="180" />
+          <Limit name="performance-point-1920x1080" value="120" />
           <Limit name="performance-point-3840x2160" value="60" />
           <!--Feature name="adaptive-playback" /-->
         </MediaCodec>
@@ -39,7 +40,8 @@
           <Limit name="bitrate" range="1-120000000" />
           <Limit name="frame-rate" range="1-120" />
           <Limit name="concurrent-instances" max="16" />
-          <Limit name="performance-point-1920x1080" value="200" />
+          <Limit name="performance-point-1920x1080" 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" />

From 87f57a51170e744f5c9b866f42f2a65f8316a17c Mon Sep 17 00:00:00 2001
From: Ruofei Ma <ruofeim@google.com>
Date: Fri, 21 Oct 2022 15:33:50 +0000
Subject: [PATCH 2/3] Revert "update performance-point for AV1 decoder"

This reverts commit 747f7bb6d7181049d4ced3f1d6f0665945554b1c.

Reason for revert: This fix has side effects as described in b/254207680

Bug: 254207680

Change-Id: I771f4d04b17d7e733d9ac163665994a16ea5d711
(cherry picked from commit 05e1012a22d4900aa01834152a908a46972468e4)
Merged-In: I771f4d04b17d7e733d9ac163665994a16ea5d711
---
 media_codecs_bo_c2.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml
index ec2a4d20..7830b9c9 100644
--- a/media_codecs_bo_c2.xml
+++ b/media_codecs_bo_c2.xml
@@ -26,8 +26,7 @@
           <Limit name="bitrate" range="1-120000000" />
           <Limit name="frame-rate" range="1-120" />
           <Limit name="concurrent-instances" max="16" />
-          <Limit name="performance-point-1920x1080" 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" /-->
         </MediaCodec>
@@ -40,8 +39,7 @@
           <Limit name="bitrate" range="1-120000000" />
           <Limit name="frame-rate" range="1-120" />
           <Limit name="concurrent-instances" max="16" />
-          <Limit name="performance-point-1920x1080" 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" />

From e6bf5a0f8fa21877accb55f59d9935fb1e92fbb8 Mon Sep 17 00:00:00 2001
From: Hua Cheng <huach@google.com>
Date: Mon, 24 Oct 2022 15:55:15 +0800
Subject: [PATCH 3/3] [Steadiface] Disable landmark inference dsp usage.

Bug: 255244818
Test: CTS, GCA

Change-Id: Ia58fd269e611e8eda8d7abfce25f906f9f9e4f18
(cherry picked from commit f7f4d8e84f71a825df2caee074c589daaa4b2ae9)
Merged-In: Ia58fd269e611e8eda8d7abfce25f906f9f9e4f18
---
 device.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device.mk b/device.mk
index 2a3a6287..b09b2136 100644
--- a/device.mk
+++ b/device.mk
@@ -654,6 +654,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.earlyGl.app.duration=16600000
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.frame_rate_multiple_threshold=120
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.layer_caching_active_layer_timeout_ms=1000
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.treat_170m_as_sRGB=1
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.vendor.camera.sf_usedsp=0
 
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.enable_layer_caching=true
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms?=80