diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2016-04-06 15:26:55 +0100 |
|---|---|---|
| committer | LuK1337 <priv.luk@gmail.com> | 2016-04-09 12:44:54 +0200 |
| commit | 4a53ba22e96c6e6a438c6e6c380ebdb48d5cc016 (patch) | |
| tree | 02dcd1ee7bd95e55ee7b5bdd9de78a4212f5deaf /audio | |
| parent | 32a0246a248e7b341e41262429be42c08ef93f94 (diff) | |
msm8916-common: audio: Add support for line-out
Change I0d1163d7f7716f9a0366f2be245d50adad55b0cc in the audio HAL
changes the output for line-out from headset to an explicit AUDIO_DEVICE_OUT_LINE,
with change I5c574dc08e26fa053f60337acb17fb5b73ebbaa1 extending it to speaker+line
Declare it here to avoid "no such HW module" errors.
Change-Id: Icd1b90604ad563885e08d7a6cc6d7fa4a243a4cf
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audio_policy.conf | 8 | ||||
| -rw-r--r-- | audio/mixer_paths_mtp.xml | 12 | ||||
| -rw-r--r-- | audio/mixer_paths_mtp_dual.xml | 12 |
3 files changed, 28 insertions, 4 deletions
diff --git a/audio/audio_policy.conf b/audio/audio_policy.conf index 2795797..871f8b6 100644 --- a/audio/audio_policy.conf +++ b/audio/audio_policy.conf @@ -26,28 +26,28 @@ audio_hw_modules { sampling_rates 8000|11025|16000|22050|32000|44100|48000 channel_masks AUDIO_CHANNEL_OUT_MONO|AUDIO_CHANNEL_OUT_STEREO formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET|AUDIO_DEVICE_OUT_FM + devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET|AUDIO_DEVICE_OUT_FM flags AUDIO_OUTPUT_FLAG_PRIMARY } low_latency { sampling_rates 44100|48000 channel_masks AUDIO_CHANNEL_OUT_STEREO formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET + devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET flags AUDIO_OUTPUT_FLAG_FAST } compress_offload { sampling_rates 8000|11025|16000|22050|32000|44100|48000|64000|88200|96000|176400|192000 channel_masks AUDIO_CHANNEL_OUT_MONO|AUDIO_CHANNEL_OUT_STEREO formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2 - devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET + devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING } voip_rx { sampling_rates 8000|16000 channel_masks AUDIO_CHANNEL_OUT_MONO formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_AMR_NB|AUDIO_FORMAT_AMR_WB|AUDIO_FORMAT_QCELP|AUDIO_FORMAT_EVRC|AUDIO_FORMAT_EVRCB|AUDIO_FORMAT_EVRCWB|AUDIO_FORMAT_EVRCNW - devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET|AUDIO_DEVICE_OUT_ALL_USB|AUDIO_DEVICE_OUT_ALL_SCO + devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET|AUDIO_DEVICE_OUT_ALL_USB|AUDIO_DEVICE_OUT_ALL_SCO flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX } } diff --git a/audio/mixer_paths_mtp.xml b/audio/mixer_paths_mtp.xml index 1951551..d39d6b9 100644 --- a/audio/mixer_paths_mtp.xml +++ b/audio/mixer_paths_mtp.xml @@ -830,4 +830,16 @@ <ctl name="MI2S_DL_HL Switch" value="1" /> </path> + <path name="line"> + <path name="headphones" /> + </path> + + <path name="voice-line"> + <path name="voice-headphones" /> + </path> + + <path name="speaker-and-line"> + <path name="speaker-and-headphones" /> + </path> + </mixer> diff --git a/audio/mixer_paths_mtp_dual.xml b/audio/mixer_paths_mtp_dual.xml index c2c8a08..4db9453 100644 --- a/audio/mixer_paths_mtp_dual.xml +++ b/audio/mixer_paths_mtp_dual.xml @@ -999,4 +999,16 @@ <ctl name="MI2S_DL_HL Switch" value="1" /> </path> + <path name="line"> + <path name="headphones" /> + </path> + + <path name="voice-line"> + <path name="voice-headphones" /> + </path> + + <path name="speaker-and-line"> + <path name="speaker-and-headphones" /> + </path> + </mixer> |