audio: update otter specific audio policy and routing paths

Change-Id: I17c8625cf96ac2ad9de8cf56ae8e2d5dd05f2b99

2 files changed, 95 insertions, 3 deletions

diff --git a/prebuilt/etc/audio_policy.conf b/prebuilt/etc/audio_policy.conf
index 1a1596f..8bacdb2 100644
--- a/prebuilt/etc/audio_policy.conf
+++ b/prebuilt/etc/audio_policy.conf
@@ -5,6 +5,7 @@
 global_configuration {
   attached_output_devices AUDIO_DEVICE_OUT_SPEAKER
   default_output_device AUDIO_DEVICE_OUT_SPEAKER
+  attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC
 }
 
 # audio hardware module section: contains descriptors for all audio hw modules present on the
@@ -25,16 +26,42 @@ audio_hw_modules {
         sampling_rates 44100
         channel_masks AUDIO_CHANNEL_OUT_STEREO
         formats AUDIO_FORMAT_PCM_16_BIT
-        devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO
+        devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO
         flags AUDIO_OUTPUT_FLAG_PRIMARY
       }
     }
     inputs {
       primary {
-        sampling_rates 8000|11025|16000|22050|32000|44100|48000
+        sampling_rates 8000|11025|16000|22050|24000|32000|44100|48000
         channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO
         formats AUDIO_FORMAT_PCM_16_BIT
-        devices AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADSET
+        devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADSET
+      }
+    }
+  }
+  a2dp {
+    outputs {
+      a2dp {
+        sampling_rates 44100
+        channel_masks AUDIO_CHANNEL_OUT_STEREO
+        formats AUDIO_FORMAT_PCM_16_BIT
+        devices AUDIO_DEVICE_OUT_ALL_A2DP
+      }
+    }
+  }
+  usb {
+    outputs {
+      usb_accessory {
+        sampling_rates 44100
+        channel_masks AUDIO_CHANNEL_OUT_STEREO
+        formats AUDIO_FORMAT_PCM_16_BIT
+        devices AUDIO_DEVICE_OUT_USB_ACCESSORY
+      }
+      usb_device {
+        sampling_rates 44100
+        channel_masks AUDIO_CHANNEL_OUT_STEREO
+        formats AUDIO_FORMAT_PCM_16_BIT
+        devices AUDIO_DEVICE_OUT_USB_DEVICE
       }
     }
   }
diff --git a/prebuilt/etc/mixer_paths.xml b/prebuilt/etc/mixer_paths.xml
new file mode 100644
index 0000000..0b7421e
--- /dev/null
+++ b/prebuilt/etc/mixer_paths.xml
@@ -0,0 +1,65 @@
+<mixer>
+	<!-- These are the initial mixer settings -->
+	<!-- general -->
+	<ctl name="DL1 Equalizer" value="High-pass 0dB" />
+	<ctl name="DL2 Left Equalizer" value="High-pass 0dB" />
+	<ctl name="DL2 Right Equalizer" value="High-pass 0dB" />
+	<ctl name="DL1 Media Playback Volume" value="128" />
+	<ctl name="DL1 PDM_DL2 Switch" value="1" />
+	<ctl name="DL1 Mixer Voice" value="0" />
+	<ctl name="DL1 PDM Switch" value="1" />
+	<ctl name="DL1 BT_VX Switch" value="0" />
+	<!-- turn off voice -->
+	<ctl name="Sidetone Mixer Capture" value="0" />
+	<!-- no pop -->
+	<ctl name="DL1 Mixer Multimedia" value="0" />
+	<ctl name="DL1 PDM Switch" value="0" />
+	<ctl name="DL1 BT_VX Switch" value="0" />
+
+	<path name="speaker">
+		<!-- codec output controls -->
+		<ctl name="SP driver mute" value="1" />
+		<ctl name="SP Analog Gain" value="127" />
+		<ctl name="DAC Playback Volume" value="140" />
+		<ctl name="Right DAC input selection" value="right data" />
+		<ctl name="Left DAC input selection" value="left data" />
+		<ctl name="Right Output Mixer From DAC_R" value="1" />
+		<ctl name="HP driver mute" value="1" />
+		<ctl name="HP Analog Gain" value="127" />
+		<ctl name="DL1 Mixer Multimedia" value="1" />
+		<ctl name="Sidetone Mixer Playback" value="1" />
+		<ctl name="DL1 Mono Mixer" value="0" />
+		<!-- enable speaker -->
+		<ctl name="DL1 MM_EXT Switch" value="1" />
+	</path>
+
+	<path name="headphone">
+		<!-- codec out controls -->
+		<ctl name="SP driver mute" value="1" />
+		<ctl name="SP Analog Gain" value="127" />
+		<ctl name="DAC Playback Volume" value="140" />
+		<ctl name="Right DAC input selection" value="right data" />
+		<ctl name="Left DAC input selection" value="left data" />
+		<ctl name="Right Output Mixer From DAC_R" value="1" />
+		<ctl name="HP driver mute" value="1" />
+		<ctl name="HP Analog Gain" value="127" />
+		<ctl name="DL1 Mixer Multimedia" value="1" />
+		<ctl name="Sidetone Mixer Playback" value="1" />
+		<ctl name="DL1 Mono Mixer" value="0" />
+		<!-- enable speaker -->
+		<ctl name="DL1 MM_EXT Switch" value="1" />
+	</path>
+
+	<path name="headset">
+		<!-- codec out controls -->
+		<ctl name="M_Input_Mixer CM_PGA_CNTL" value="2" />
+		<ctl name="P_Input_Mixer MIC1LM_PGA_CNTL" value="2" />
+		<!-- <ctl name="ADC COARSE GAIN" value="48" /> -->
+		<!-- <ctl name="ADC MIC_PGA GAIN" value="50" /> -->
+		<ctl name="AUDUL Voice UL Volume" value="120" />
+		<ctl name="SDT UL Volume" value="120" />
+		<!-- enable speaker -->
+		<ctl name="DL1 MM_EXT Switch" value="1" />
+		<ctl name="Sidetone Mixer Capture" value="1" />
+	</path>
+</mixer>