From 412664dc84c406d815839ae34c8bc4b00fe4d548 Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Mon, 7 Mar 2022 11:20:40 -0800
Subject: [PATCH 1/3] DO NOT MERGE Oriole/Raven: enable Dolby DD+ decoder

Bug: 198197610
Test: playback of EAC-3 file makes air vibrate

Change-Id: I88f2bc9fae6eb8a5e76156bc640045679d1d749a
---
 device-oriole.mk             | 13 +++++++
 device-raven.mk              | 13 +++++++
 media_codecs_bo_dolby_c2.xml | 66 ++++++++++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+)
 create mode 100644 media_codecs_bo_dolby_c2.xml

diff --git a/device-oriole.mk b/device-oriole.mk
index cee0836..680b054 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -217,3 +217,16 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # This device is shipped with 31 (Android S)
 PRODUCT_SHIPPING_API_LEVEL := 31
+
+##############################################
+# DOLBY integration
+include vendor/dolby/ds/dolby-buildspec.mk
+$(call inherit-product, vendor/dolby/ds/dolby-product.mk)
+
+# add list of codecs, but overwrite device/google/gs101/media_codecs_bo_c2.xml
+# with same file but with Dolby codecs listed
+PRODUCT_COPY_FILES := \
+    device/google/raviole/media_codecs_bo_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \
+    $(PRODUCT_COPY_FILES) 
+
+PRODUCT_RESTRICT_VENDOR_FILES := false
diff --git a/device-raven.mk b/device-raven.mk
index fba7876..406492c 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -233,3 +233,16 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # This device is shipped with 31 (Android S)
 PRODUCT_SHIPPING_API_LEVEL := 31
+
+#############################################
+# DOLBY integration
+include vendor/dolby/ds/dolby-buildspec.mk
+$(call inherit-product, vendor/dolby/ds/dolby-product.mk)
+
+# add list of codecs, but overwrite device/google/gs101/media_codecs_bo_c2.xml
+# with same file but with Dolby codecs listed
+PRODUCT_COPY_FILES := \
+    device/google/raviole/media_codecs_bo_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \
+    $(PRODUCT_COPY_FILES) 
+
+PRODUCT_RESTRICT_VENDOR_FILES := false
diff --git a/media_codecs_bo_dolby_c2.xml b/media_codecs_bo_dolby_c2.xml
new file mode 100644
index 0000000..3197674
--- /dev/null
+++ b/media_codecs_bo_dolby_c2.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<MediaCodecs>
+    <Include href="media_codecs_aosp_c2.xml" />
+    <Decoders>
+        <MediaCodec name="c2.google.av1.decoder" type="video/av01">
+          <Limit name="size" min="96x96" max="3840x2160" />
+          <Limit name="alignment" value="2x2" />
+          <Limit name="block-size" value="16x16" />
+          <Limit name="block-count" range="36-32400" />
+          <Limit name="blocks-per-second" min="24" max="1944000" />
+          <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-3840x2160" value="60" />
+          <Feature name="adaptive-playback" />
+          <Feature name="can-swap-width-height" value="1" />
+        </MediaCodec>
+        <MediaCodec name="c2.google.av1.decoder.secure" type="video/av01">
+          <Limit name="size" min="96x96" max="3840x2160" />
+          <Limit name="alignment" value="2x2" />
+          <Limit name="block-size" value="16x16" />
+          <Limit name="block-count" range="36-32400" />
+          <Limit name="blocks-per-second" min="24" max="1944000" />
+          <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-3840x2160" value="60" />
+          <Feature name="adaptive-playback" />
+          <Feature name="secure-playback" required="true" />
+          <Feature name="can-swap-width-height" value="1" />
+        </MediaCodec>
+        <MediaCodec name="c2.dolby.eac3.decoder">
+            <Type name="audio/ac3">
+                <Alias name="OMX.dolby.ac3.decoder"/>
+                <Limit name="channel-count" max="6"/>
+                <Limit name="sample-rate" ranges="32000,44100,48000"/>
+                <Limit name="bitrate" range="32000-640000"/>
+            </Type>
+            <Attribute name="software-codec"/>
+            <Type name="audio/eac3">
+                <Alias name="OMX.dolby.eac3.decoder"/>
+                <Limit name="channel-count" max="8"/>
+                <Limit name="sample-rate" ranges="32000,44100,48000"/>
+                <Limit name="bitrate" range="32000-6144000"/>
+            </Type>
+        </MediaCodec>
+    </Decoders>
+</MediaCodecs>

From 3f0fcbce02c260857e02c6633f68ffba26d1a003 Mon Sep 17 00:00:00 2001
From: Steve Berbary <sberbary@google.com>
Date: Tue, 8 Mar 2022 06:12:39 +0000
Subject: [PATCH 2/3] Update raven SVN to 25 Bug:  223313197

Change-Id: If21b8cd2be84e877f7e0a946b63e58df057f17b2
---
 device-raven.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-raven.mk b/device-raven.mk
index 406492c..c6c2c9d 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -187,7 +187,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=24
+    ro.vendor.build.svn=25
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \

From 6414ff31c8a37eb4e6c55db26ac72588b5abc216 Mon Sep 17 00:00:00 2001
From: Steve Berbary <sberbary@google.com>
Date: Tue, 8 Mar 2022 06:12:14 +0000
Subject: [PATCH 3/3] Update oriole SVN to 25 Bug:  223313197

Change-Id: Iff092322df7a366281dcf89d8c9987064b6347f8
---
 device-oriole.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-oriole.mk b/device-oriole.mk
index 680b054..6eda039 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -175,7 +175,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=24
+    ro.vendor.build.svn=25
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \