From 899b01eea912bae4d31ae9d0181018de41990f61 Mon Sep 17 00:00:00 2001
From: Ethan Chen <intervigil@gmail.com>
Date: Wed, 15 Apr 2015 22:56:51 -0700
Subject: shinano-common: Stop using prebuilt audio

* Add custom audio backends using audio_platform_info
* Match stock devices and ACDB IDs
* Specify MULTISESSION_VOICE for calls
* Specify LOW_LATENCY as primary output

Change-Id: I9d6927ab98c70ab71a181c656253f64491219470
---
 BoardConfigCommon.mk          |  4 +++
 audio/audio_platform_info.xml | 71 +++++++++++++++++++++++++++++++++++++++++++
 proprietary-files.txt         |  1 -
 shinano.mk                    |  4 +++
 4 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 audio/audio_platform_info.xml

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 044cd50..3d34cc6 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -31,6 +31,10 @@ TARGET_DTB_EXTRA_FLAGS := --force-v2
 # ANT+
 BOARD_ANT_WIRELESS_DEVICE := "vfs-prerelease"
 
+# Audio
+AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true
+AUDIO_FEATURE_LOW_LATENCY_PRIMARY := true
+
 # Bluetooth
 BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_BCM := true
diff --git a/audio/audio_platform_info.xml b/audio/audio_platform_info.xml
new file mode 100644
index 0000000..52e7b2c
--- /dev/null
+++ b/audio/audio_platform_info.xml
@@ -0,0 +1,71 @@
+<?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_SPEAKER" acdb_id="15" />
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" acdb_id="15" />
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="15" />
+        <device name="SND_DEVICE_OUT_VOIP_HANDSET" acdb_id="7" />
+        <device name="SND_DEVICE_OUT_VOIP_SPEAKER" acdb_id="15" />
+        <device name="SND_DEVICE_OUT_VOIP_HEADPHONES" acdb_id="10" />
+
+        <!-- Input devices -->
+        <device name="SND_DEVICE_IN_CAMCORDER_MIC" acdb_id="544" />
+        <device name="SND_DEVICE_IN_VOICE_REC_MIC" acdb_id="528" />
+    </acdb_ids>
+
+    <backend_names>
+        <!-- Output devices -->
+        <device name="SND_DEVICE_OUT_HANDSET" backend="handset" />
+        <device name="SND_DEVICE_OUT_SPEAKER" backend="speaker" />
+        <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" backend="speaker" />
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" />
+        <device name="SND_DEVICE_OUT_VOICE_HANDSET" backend="handset" />
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" backend="speaker" />
+        <device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" backend="handset" />
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-anc-nc-headphone" />
+        <device name="SND_DEVICE_OUT_VOIP_HANDSET" backend="handset" />
+        <device name="SND_DEVICE_OUT_VOIP_SPEAKER" backend="speaker" />
+
+        <!-- Input devices -->
+    </backend_names>
+
+    <pcm_ids>
+        <!-- empty -->
+    </pcm_ids>
+
+    <device_names>
+        <!-- Output devices -->
+        <device name="SND_DEVICE_OUT_VOIP_HANDSET" alias="voice-handset" />
+        <device name="SND_DEVICE_OUT_VOIP_SPEAKER" alias="voice-speaker" />
+        <device name="SND_DEVICE_OUT_VOIP_HEADPHONES" alias="voice-headphones" />
+
+        <!-- Input devices -->
+        <device name="SND_DEVICE_IN_VOICE_REC_MIC" alias="handset-mic-asr" />
+    </device_names>
+</audio_platform_info>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index e3cf067..6babb3b 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,5 +1,4 @@
 # Audio
-lib/hw/audio.primary.msm8974.so
 vendor/lib/libacdbloader.so
 vendor/lib/libacdbrtac.so
 vendor/lib/libadiertac.so
diff --git a/shinano.mk b/shinano.mk
index d12beaa..ea3d017 100644
--- a/shinano.mk
+++ b/shinano.mk
@@ -58,6 +58,10 @@ PRODUCT_PACKAGES += \
     com.dsi.ant.antradio_library \
     libantradio
 
+# Audio
+PRODUCT_COPY_FILES += \
+    $(COMMON_PATH)/audio/audio_platform_info.xml:system/etc/audio_platform_info.xml
+
 # Bluetooth
 PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/bluetooth/bt_vendor.conf:system/etc/bluetooth/bt_vendor.conf
-- 
cgit v1.2.3