From 1012636603f45db58203f1999e4c3ee3e637d2db Mon Sep 17 00:00:00 2001
From: wenchangliu <wenchangliu@google.com>
Date: Mon, 7 Mar 2022 08:43:49 +0000
Subject: [PATCH 1/2] Update correct max block counts

Fix incorrcet video resolution capability report from
media_codecs_aosp_c2.xml.

Bug: 222095724
Test: demo-transformer HEVC 2160p transcoding
Change-Id: Ie0bb25c88440f7806b01bcaa49b23980d7f4e45f
---
 media_codecs_aosp_c2.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml
index 929ceb71..5d34a907 100644
--- a/media_codecs_aosp_c2.xml
+++ b/media_codecs_aosp_c2.xml
@@ -115,7 +115,7 @@
             <Limit name="size" min="64x64" max="3840x2176" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="64x64" />
-            <Limit name="block-count" range="1-2025" />
+            <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" />
@@ -128,7 +128,7 @@
             <Limit name="size" min="64x64" max="3840x2176" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="64x64" />
-            <Limit name="block-count" range="1-2025" />
+            <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" />
@@ -158,7 +158,7 @@
             <Limit name="size" min="64x64" max="3840x2176" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="32x32" />
-            <Limit name="block-count" range="1-8100" />
+            <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" />
@@ -209,7 +209,7 @@
             <Limit name="size" min="64x64" max="3840x2176" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="64x64" />
-            <Limit name="block-count" range="1-2025" />
+            <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" />

From 8e6ff8503de9182c666662a38a038e722f2c81cc Mon Sep 17 00:00:00 2001
From: Ytai Ben-Tsvi <ytai@google.com>
Date: Fri, 17 Sep 2021 16:04:02 -0700
Subject: [PATCH 2/2] Build with spatializer feature

Build with Decibel spatializer library and enable spatial audio
feature

Bug: 189423448
Test: make.
Change-Id: Iff997d4100dcd2aabfdaf62b8abdba788cb9741c
---
 device.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index 123fa7a8..129e8f9e 100644
--- a/device.mk
+++ b/device.mk
@@ -950,7 +950,8 @@ PRODUCT_PACKAGES += \
 	audio.r_submix.default \
 	libamcsextfile \
 	audio_amcs_ext \
-
+	libspatialaudio \
+	librondo
 
 #Audio Vendor libraries
 PRODUCT_PACKAGES += \
@@ -987,6 +988,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	ro.audio.monitorRotation = true \
 	ro.audio.offload_wakelock=false
 
+# DO NOT SUBMIT declare use of spatial audio
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.audio.spatializer_enabled=true
+
 ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
 # IAudioMetricExt HIDL
 PRODUCT_PACKAGES += \