From 90cef7a6c9502421a77ac5f3d701382e6680b50a Mon Sep 17 00:00:00 2001
From: Artem Borisov <dedsa2002@gmail.com>
Date: Fri, 24 Aug 2018 17:16:36 +0000
Subject: [PATCH] flo: Update configuration for CAF audio

Change-Id: I3c943e16adc3cbc9ffaea43ce78bd92cd9efd209
---
 BoardConfigCommon.mk          |  6 ++--
 audio/audio_platform_info.xml | 62 +++++++++++++++++++++++++++++++++++
 device-common.mk              |  1 +
 system.prop                   | 11 +++++--
 4 files changed, 74 insertions(+), 6 deletions(-)
 create mode 100644 audio/audio_platform_info.xml

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 128549f..9cbdfe7 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -35,10 +35,10 @@ TARGET_KERNEL_CONFIG := lineageos_flo_defconfig
 # QCOM Hardware
 BOARD_USES_QCOM_HARDWARE := true
 
+# Audio
 BOARD_USES_ALSA_AUDIO:= true
-BOARD_USES_LEGACY_ALSA_AUDIO:= false
-BOARD_USES_FLUENCE_INCALL := true
-BOARD_USES_SEPERATED_AUDIO_INPUT := true
+AUDIO_USE_LL_AS_PRIMARY_OUTPUT := true
+USE_CUSTOM_AUDIO_POLICY := 1
 
 # Binder API version
 TARGET_USES_64_BIT_BINDER := true
diff --git a/audio/audio_platform_info.xml b/audio/audio_platform_info.xml
new file mode 100644
index 0000000..22f41dc
--- /dev/null
+++ b/audio/audio_platform_info.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Copyright (c) 2014, The Linux Foundation. All rights reserved.         -->
+<!--                                                                        -->
+<!-- Redistribution and use in source and binary forms, with or without     -->
+<!-- modification, are permitted provided that the following conditions are -->
+<!-- met:                                                                   -->
+<!--     * Redistributions of source code must retain the above copyright   -->
+<!--       notice, this list of conditions and the following disclaimer.    -->
+<!--     * Redistributions in binary form must reproduce the above          -->
+<!--       copyright notice, this list of conditions and the following      -->
+<!--       disclaimer in the documentation and/or other materials provided  -->
+<!--       with the distribution.                                           -->
+<!--     * Neither the name of The Linux Foundation nor the names of its    -->
+<!--       contributors may be used to endorse or promote products derived  -->
+<!--       from this software without specific prior written permission.    -->
+<!--                                                                        -->
+<!-- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED           -->
+<!-- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF   -->
+<!-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -->
+<!-- ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -->
+<!-- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -->
+<!-- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF   -->
+<!-- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR        -->
+<!-- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  -->
+<!-- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->
+<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                          -->
+<audio_platform_info>
+    <acdb_ids>
+        <!-- Output devices -->
+        <device name="SND_DEVICE_OUT_HANDSET" acdb_id="7" />
+        <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="14" />
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" acdb_id="10" />
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_HDMI" acdb_id="14" />
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="14" />
+        <device name="SND_DEVICE_OUT_BT_SCO" acdb_id="22" />
+
+        <!-- Input devices -->
+        <device name="SND_DEVICE_IN_HANDSET_DMIC" acdb_id="4" />
+        <device name="SND_DEVICE_IN_HANDSET_STEREO_DMIC" acdb_id="4" />
+        <device name="SND_DEVICE_IN_VOICE_DMIC" acdb_id="4" />
+        <device name="SND_DEVICE_IN_SPEAKER_STEREO_DMIC" acdb_id="11" />
+        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" acdb_id="11" />
+        <device name="SND_DEVICE_IN_VOICE_SPEAKER_DMIC" acdb_id="11" />
+        <device name="SND_DEVICE_IN_VOICE_REC_MIC" acdb_id="62" />
+        <device name="SND_DEVICE_IN_CAMCORDER_MIC" acdb_id="61" />
+        <device name="SND_DEVICE_IN_BT_SCO_MIC" acdb_id="21" />
+    </acdb_ids>
+
+    <backend_names>
+        <!-- empty -->
+    </backend_names>
+
+    <pcm_ids>
+        <usecase name="USECASE_AUDIO_PLAYBACK_LOW_LATENCY" type="out" id="14" />
+        <usecase name="USECASE_VOICE_CALL" type="out" id="12" />
+    </pcm_ids>
+
+    <device_names>
+        <!-- empty -->
+    </device_names>
+</audio_platform_info>
+
diff --git a/device-common.mk b/device-common.mk
index 2951e1f..c1c02a4 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -45,6 +45,7 @@ PRODUCT_COPY_FILES += \
     frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
     frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
     device/asus/flo/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
+    device/asus/flo/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \
     device/asus/flo/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
     device/asus/flo/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml
 
diff --git a/system.prop b/system.prop
index f57358f..60a9b23 100644
--- a/system.prop
+++ b/system.prop
@@ -7,9 +7,14 @@ ro.qualcomm.bt.hci_transport=smd
 ro.audio.monitorRotation=true
 # Enable AAC 5.1 output
 media.aac_51_output_enabled=true
-persist.audio.handset.mic=dmic
-persist.audio.fluence.mode=endfire
-persist.audio.lowlatency.rec=false
+# Audio HAL configuration
+audio.offload.disable=1
+mm.enable.smoothstreaming=true
+ro.qc.sdk.audio.fluencetype=none
+persist.audio.fluence.voicecall=true
+persist.audio.fluence.voicerec=false
+persist.audio.fluence.speaker=true
+qcom.hw.aac.encoder=true
 
 # Camera
 camera.disable_zsl_mode=1