From c52d029f749f3700b13afb36ba70864bc35f55b7 Mon Sep 17 00:00:00 2001
From: Kyle Repinski <repinski23@gmail.com>
Date: Sat, 26 Jul 2014 11:35:22 -0500
Subject: tuna: Add audio submix, enable WFD

Fixes Chromecast streaming!

Change-Id: Iae2ce082d45f91997b58df8284b25efb66aa67e4
Signed-off-by: Kyle Repinski <repinski23@gmail.com>

Conflicts:
	BoardConfig.mk
---
 BoardConfig.mk                                       |  3 +++
 audio/audio_policy.conf                              | 20 +++++++++++++++++++-
 device.mk                                            |  3 ++-
 .../frameworks/base/core/res/res/values/config.xml   |  3 +++
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 6a3bbea..127c3a7 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -42,6 +42,9 @@ TARGET_BOARD_PLATFORM := omap4
 TARGET_BOOTLOADER_BOARD_NAME := tuna
 
 BOARD_EGL_CFG := device/samsung/tuna/egl.cfg
+
+BOARD_USE_TI_DUCATI_H264_PROFILE := true
+
 BOARD_CREATE_TUNA_HDCP_KEYS_SYMLINK := true
 
 #BOARD_USES_HGL := true
diff --git a/audio/audio_policy.conf b/audio/audio_policy.conf
index bf387a2..a782448 100644
--- a/audio/audio_policy.conf
+++ b/audio/audio_policy.conf
@@ -5,7 +5,7 @@
 global_configuration {
   attached_output_devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER
   default_output_device AUDIO_DEVICE_OUT_SPEAKER
-  attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC
+  attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_REMOTE_SUBMIX
 }
 
 # audio hardware module section: contains descriptors for all audio hw modules present on the
@@ -63,6 +63,24 @@ audio_hw_modules {
       }
     }
   }
+  r_submix {
+    outputs {
+      submix {
+        sampling_rates 48000
+        channel_masks AUDIO_CHANNEL_OUT_STEREO
+        formats AUDIO_FORMAT_PCM_16_BIT
+        devices AUDIO_DEVICE_OUT_REMOTE_SUBMIX
+      }
+    }
+    inputs {
+      submix {
+        sampling_rates 48000
+        channel_masks AUDIO_CHANNEL_IN_STEREO
+        formats AUDIO_FORMAT_PCM_16_BIT
+        devices AUDIO_DEVICE_IN_REMOTE_SUBMIX
+      }
+    }
+  }
   usb {
     outputs {
       usb_accessory {
diff --git a/device.mk b/device.mk
index fbb1782..7ce3939 100644
--- a/device.mk
+++ b/device.mk
@@ -53,7 +53,8 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
 	audio.primary.tuna \
 	audio.a2dp.default \
-	audio.usb.default
+	audio.usb.default \
+	audio.r_submix.default
 
 PRODUCT_COPY_FILES += \
 	device/samsung/tuna/audio/audio_policy.conf:system/etc/audio_policy.conf \
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index c8654c8..54e2ce1 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -246,4 +246,7 @@
         <item>10</item>
     </integer-array>
 
+    <!-- Enable WiFi display support -->
+    <bool name="config_enableWifiDisplay">true</bool>
+
 </resources>
-- 
cgit v1.2.3