diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-15 11:54:10 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-15 11:54:10 +0100 |
| commit | 60e5a34630c69e575f157a2babac70048cc3bdb1 (patch) | |
| tree | 9691d92caa5fba82bf307cf2af3374c616053bb8 /configs/audio_policy.conf | |
| parent | 8d57bd027ab7f354e1707510d3ba5654ba16c0aa (diff) | |
| parent | 02a3b7b2c85b056f6172668ac9d2008a941a6df5 (diff) | |
| download | device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.zip device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.tar.gz device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.tar.bz2 | |
Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0
Conflicts:
BoardCommonConfig.mk
camera/Android.mk
common.mk
configs/80cfw
lpm.rc
overlay/frameworks/base/core/res/res/values/config.xml
overlay/packages/apps/Camera2/res/values/config.xml
Diffstat (limited to 'configs/audio_policy.conf')
| -rw-r--r-- | configs/audio_policy.conf | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/configs/audio_policy.conf b/configs/audio_policy.conf index ef45a58..b9f065b 100644 --- a/configs/audio_policy.conf +++ b/configs/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 @@ -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_EARPIECE|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_ANLG_DOCK_HEADSET|AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET + 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_AUX_DIGITAL flags AUDIO_OUTPUT_FLAG_PRIMARY } deep_buffer { @@ -75,7 +75,25 @@ audio_hw_modules { sampling_rates 44100 channel_masks AUDIO_CHANNEL_OUT_STEREO formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_USB_DEVICE + devices AUDIO_DEVICE_OUT_USB_DEVICE|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET|AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET + } + } + } + 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 } } } |