From 56156d359af8919b42b64f251e60a2d872620e1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Espen=20Fjellv=C3=A6r=20Olsen?= Date: Wed, 24 Oct 2012 14:43:49 +0200 Subject: [PATCH] Update board config for new audio blobs Change-Id: I82d2a6856d76c1a758c502fd99ad0931ef7f2eed --- BoardCommonConfig.mk | 1 - common.mk | 3 ++- configs/audio_policy.conf | 52 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 configs/audio_policy.conf diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk index e852b31..9aa7e2d 100644 --- a/BoardCommonConfig.mk +++ b/BoardCommonConfig.mk @@ -91,7 +91,6 @@ BOARD_USES_MFC_FPS := true BOARD_USE_YAMAHAPLAYER := true BOARD_USE_SAMSUNG_SEPARATEDSTREAM := true BOARD_HAS_SAMSUNG_VOLUME_BUG := true -COMMON_GLOBAL_CFLAGS += -DICS_AUDIO_BLOB # RIL BOARD_MOBILEDATA_INTERFACE_NAME := "pdp0" diff --git a/common.mk b/common.mk index 941cc78..fbd42ab 100644 --- a/common.mk +++ b/common.mk @@ -24,7 +24,8 @@ PRODUCT_COPY_FILES := \ # Audio PRODUCT_COPY_FILES += \ - device/samsung/galaxys2-common/configs/asound.conf:system/etc/asound.conf + device/samsung/galaxys2-common/configs/asound.conf:system/etc/asound.conf \ + device/samsung/galaxys2-common/configs/audio_policy.conf:system/etc/audio_policy.conf # Vold and Storage PRODUCT_COPY_FILES += \ diff --git a/configs/audio_policy.conf b/configs/audio_policy.conf new file mode 100644 index 0000000..669d2d1 --- /dev/null +++ b/configs/audio_policy.conf @@ -0,0 +1,52 @@ +# Global configuration section: lists input and output devices always present on the device +# as well as the output device selected by default. +# Devices are designated by a string that corresponds to the enum in audio.h + +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|AUDIO_DEVICE_IN_VOICE_CALL +} + +# audio hardware module section: contains descriptors for all audio hw modules present on the +# device. Each hw module node is named after the corresponding hw module library base name. +# For instance, "primary" corresponds to audio.primary..so. +# The "primary" module is mandatory and must include at least one output with +# AUDIO_OUTPUT_FLAG_PRIMARY flag. +# Each module descriptor contains one or more output profile descriptors and zero or more +# input profile descriptors. Each profile lists all the parameters supported by a given output +# or input stream category. +# The "channel_masks", "formats", "devices" and "flags" are specified using strings corresponding +# to enums in audio.h and audio_policy.h. They are concatenated by use of "|" without space or "\n". + +audio_hw_modules { + primary { + outputs { + primary { + 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_ALL_SCO|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET + flags AUDIO_OUTPUT_FLAG_PRIMARY + } + } + inputs { + primary { + 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_BUILTIN_MIC|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_FM|AUDIO_DEVICE_IN_VOICE_CALL + } + } + } + a2dp { + outputs { + a2dp { + sampling_rates 44100 + channel_masks AUDIO_CHANNEL_OUT_STEREO + formats AUDIO_FORMAT_PCM_16_BIT + devices AUDIO_DEVICE_OUT_ALL_A2DP + } + } + } +}