audio: Multizone: Add support for auxiliary input

Add support for the auxiliary input available in the JAMR3
board in the Jacinto6 EVMs. The auxiliary input is a stereo
analog port.

Change-Id: I815dbcad3ea3ec47c57580a3243a631abdcbf4b9
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>

diff --git a/audio/multizone/AudioHw.cpp b/audio/multizone/AudioHw.cpp
index 7b237a0ec611a414eac443b4ce65d6817f1c0b24..d323139d201788c6a827ce2f49362890bf1c4fb4 100644 (file)
--- a/audio/multizone/AudioHw.cpp
+++ b/audio/multizone/AudioHw.cpp
@@ -735,6 +735,7 @@ uint32_t AudioHwDevice::getSupportedDevices() const
     devices = AUDIO_DEVICE_IN_BUILTIN_MIC |
               AUDIO_DEVICE_IN_BACK_MIC |
               AUDIO_DEVICE_IN_VOICE_CALL |
+              AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET |
               AUDIO_DEVICE_OUT_SPEAKER |
               AUDIO_DEVICE_OUT_WIRED_HEADPHONE |
               AUDIO_DEVICE_OUT_WIRED_HEADSET |
@@ -1114,6 +1115,14 @@ AudioStreamIn* AudioHwDevice::openInputStream(audio_io_handle_t handle,
             srcSlot1 = 1;
         }
         break;
+    case AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET:
+        if (!usesJAMR3()) {
+            ALOGE("AudioHwDevice: device 0x%08x requires JAMR3", devices);
+            return NULL;
+        }
+        srcSlot0 = 0;
+        srcSlot1 = 1;
+        break;
     default:
         ALOGE("AudioHwDevice: device 0x%08x is not supported", devices);
         return NULL;

diff --git a/audio/multizone/audio_policy.conf b/audio/multizone/audio_policy.conf
index 2f4eb1991f07f6d65d21e310890f557a98be49b1..473409c35add3f48e688dba8e3e89a0aded66dfc 100644 (file)
--- a/audio/multizone/audio_policy.conf
+++ b/audio/multizone/audio_policy.conf
@@ -5,7 +5,7 @@
 global_configuration {
   attached_output_devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_WIRED_HEADPHONE2
   default_output_device AUDIO_DEVICE_OUT_SPEAKER
-  attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC
+  attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET
 }
 
 # Zone affinity section: lists the output devices allowed per listening zone. Devices are
@@ -57,7 +57,7 @@ audio_hw_modules {
         sampling_rates 8000|11025|16000|22050|32000|44100|48000
         channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO
         formats AUDIO_FORMAT_PCM_16_BIT
-        devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_VOICE_CALL
+        devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_VOICE_CALL|AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET
       }
     }
   }