summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2012-04-06 09:01:39 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-16 14:15:32 -0700
commitee5fe4b6972147753a65f98b2805604486399425 (patch)
tree9c751044e1b5201e7806597ea74f925d6764a719
parente27cf1f3143d1f4490d33fefe3fd1620304d51ed (diff)
downloadwingray-ee5fe4b6972147753a65f98b2805604486399425.tar.gz
audio: added usb audio hw module
Added a descriptor for USB audio HW module in audio_policy.conf. Also fixed misspelled device name for AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET. Change-Id: Ia8f62cf561886b28ff0a36d93b9016ca0298c579
-rw-r--r--libaudio/audio_policy.conf18
1 files changed, 17 insertions, 1 deletions
diff --git a/libaudio/audio_policy.conf b/libaudio/audio_policy.conf
index 81870ff..a75a398 100644
--- a/libaudio/audio_policy.conf
+++ b/libaudio/audio_policy.conf
@@ -26,7 +26,7 @@ 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_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET|DEVICE_OUT_ANLG_DOCK_HEADSET
+ devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET
flags AUDIO_POLICY_OUTPUT_FLAG_PRIMARY
}
}
@@ -49,4 +49,20 @@ audio_hw_modules {
}
}
}
+ 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
+ }
+ }
+ }
}