Remove common audio configs
diff --git a/audio/audio_effects.conf b/audio/audio_effects.conf
deleted file mode 100644
index 9c641b0..0000000
--- a/audio/audio_effects.conf
+++ /dev/null
@@ -1,274 +0,0 @@
-# List of effect libraries to load. Each library element must contain a "path" element
-# giving the full path of the library .so file.
-# libraries {
-# <lib name> {
-# path <lib path>
-# }
-# }
-libraries {
-# This is a proxy library that will be an abstraction for
-# the HW and SW effects
- proxy {
- path /system/lib/soundfx/libeffectproxy.so
- }
-# This is the HW implementation library for the effect
- offload {
- path /system/lib/soundfx/libaudioeffectoffload.so
- }
- bundle {
- path /system/lib/soundfx/libbundlewrapper.so
- }
- reverb {
- path /system/lib/soundfx/libreverbwrapper.so
- }
- visualizer_sw {
- path /system/lib/soundfx/libvisualizer.so
- }
- visualizer_hw {
- path /system/lib/soundfx/libqcomvisualizer.so
- }
- downmix {
- path /system/lib/soundfx/libdownmix.so
- }
- mysound {
- path /system/lib/libmysound.so
- }
- myspace {
- path /system/lib/soundfx/libmyspace.so
- }
- soundalive {
- path /system/lib/libaudiosa.so
- }
- soundalive_sec {
- path /system/lib/soundfx/libaudiosa_sec.so
- }
- loudness_enhancer {
- path /system/lib/soundfx/libldnhncr.so
- }
- pre_processing {
- path /system/lib/soundfx/libqcomvoiceprocessing.so
- }
- v4a_fx {
- path /system/lib/soundfx/libv4a_fx_ics.so
- }
-}
-
-# Default pre-processing library. Add to audio_effect.conf "libraries" section if
-# audio HAL implements support for default software audio pre-processing effects
-#
-# pre_processing {
-# path /system/lib/soundfx/libaudiopreprocessing.so
-# }
-
-# list of effects to load. Each effect element must contain a "library" and a "uuid" element.
-# The value of the "library" element must correspond to the name of one library element in the
-# "libraries" element.
-# The name of the effect element is indicative, only the value of the "uuid" element
-# designates the effect.
-# The uuid is the implementation specific UUID as specified by the effect vendor. This is not the
-# generic effect type UUID.
-# effects {
-# <fx name> {
-# library <lib name>
-# uuid <effect uuid>
-# }
-# ...
-# }
-
-effects {
- soundalive {
- library proxy
- uuid 05227ea0-50bb-11e3-ac69-0002a5d5c51b
- libsw {
- library soundalive_sec
- uuid cf65eb39-ce2f-48a8-a903-ceb818c06745
- }
- libhw {
- library offload
- uuid 0b2dbc60-50bb-11e3-988b-0002a5d5c51b
- }
- }
- bassboost {
- library proxy
- uuid 10e50dc0-50bb-11e3-a9b0-0002a5d5c51b
- libsw {
- library soundalive
- uuid a926a540-418a-11e1-b2f1-0002a5d5c51b
- }
- libhw {
- library offload
- uuid 16a70d80-50bb-11e3-8959-0002a5d5c51b
- }
- }
- virtualizer {
- library proxy
- uuid 1db5b180-50bb-11e3-888e-0002a5d5c51b
- libsw {
- library soundalive
- uuid c747f6a0-418a-11e1-a621-0002a5d5c51b
- }
- libhw {
- library offload
- uuid 23318080-50bb-11e3-9101-0002a5d5c51b
- }
- }
- equalizer {
- library proxy
- uuid 295b42c0-50bb-11e3-a6ed-0002a5d5c51b
- libsw {
- library soundalive
- uuid c117b70-f97f-11e0-be50-0002a5d5c51b
- }
- libhw {
- library offload
- uuid 2f2afe20-50bb-11e3-bc97-0002a5d5c51b
- }
- }
- volume {
- library bundle
- uuid 119341a0-8469-11df-81f9-0002a5d5c51b
- }
- reverb_env_aux {
- library reverb
- uuid 4a387fc0-8ab3-11df-8bad-0002a5d5c51b
- }
- reverb_env_ins {
- library reverb
- uuid c7a511a0-a3bb-11df-860e-0002a5d5c51b
- }
- reverb_pre_aux {
- library reverb
- uuid f29a1400-a3bb-11df-8ddc-0002a5d5c51b
- }
- reverb_pre_ins {
- library reverb
- uuid 172cdf00-a3bc-11df-a72f-0002a5d5c51b
- }
- visualizer {
- library proxy
- uuid 1d0a1a53-7d5d-48f2-8e71-27fbd10d842c
- libsw {
- library visualizer_sw
- uuid d069d9e0-8329-11df-9168-0002a5d5c51b
- }
- libhw {
- library visualizer_hw
- uuid 7a8044a0-1a71-11e3-a184-0002a5d5c51b
- }
- }
- downmix {
- library downmix
- uuid 93f04452-e4fe-41cc-91f9-e475b6d1d69f
- }
- dha {
- library proxy
- uuid 37155c20-50bb-11e3-9fac-0002a5d5c51b
- libsw {
- library mysound
- uuid 263a88e0-50b1-11e2-bcfd-0800200c9a66
- }
- libhw {
- library offload
- uuid 3ef69260-50bb-11e3-931e-0002a5d5c51b
- }
- }
- sa3d {
- library proxy
- uuid 1c91fca0-664a-11e4-b8c2-0002a5d5c51b
- libsw {
- library myspace
- uuid 3462a6e0-655a-11e4-8b67-0002a5d5c51b
- }
- libhw {
- library offload
- uuid c7a84e61-eebe-4fcc-bc53-efcb841b4625
- }
- }
- loudness_enhancer {
- library loudness_enhancer
- uuid fa415329-2034-4bea-b5dc-5b381c8d1e2c
- }
- aec {
- library pre_processing
- uuid 0f8d0d2a-59e5-45fe-b6e4-248c8a799109
- }
- ns {
- library pre_processing
- uuid 1d97bb0b-9e2f-4403-9ae3-58c2554306f8
- }
- v4a_standard_fx {
- library v4a_fx
- uuid 41d3c987-e6cf-11e3-a88a-11aba5d5c51b
- }
-}
-
-# Default pre-processing effects. Add to audio_effect.conf "effects" section if
-# audio HAL implements support for them.
-#
-# agc {
-# library pre_processing
-# uuid aa8130e0-66fc-11e0-bad0-0002a5d5c51b
-# }
-# aec {
-# library pre_processing
-# uuid 0f8d0d2a-59e5-45fe-b6e4-248c8a799109
-# }
-# ns {
-# library pre_processing
-# uuid c06c8400-8e06-11e0-9cb6-0002a5d5c51b
-# }
-
-# Audio preprocessor configurations.
-# The pre processor configuration consists in a list of elements each describing
-# pre processor settings for a given input source. Valid input source names are:
-# "mic", "camcorder", "voice_recognition", "voice_communication"
-# Each input source element contains a list of effects elements. The name of the effect
-# element must be the name of one of the effects in the "effects" list of the file.
-# Each effect element may optionally contain a list of parameters and their
-# default value to apply when the pre processor effect is created.
-# A parameter is defined by a "param" element and a "value" element. Each of these elements
-# consists in one or more elements specifying a type followed by a value.
-# The types defined are: "int", "short", "float", "bool" and "string"
-# When both "param" and "value" are a single int, a simple form is allowed where just
-# the param and value pair is present in the parameter description
-# pre_processing {
-# <input source name> {
-# <fx name> {
-# <param 1 name> {
-# param {
-# int|short|float|bool|string <value>
-# [ int|short|float|bool|string <value> ]
-# ...
-# }
-# value {
-# int|short|float|bool|string <value>
-# [ int|short|float|bool|string <value> ]
-# ...
-# }
-# }
-# <param 2 name > {<param> <value>}
-# ...
-# }
-# ...
-# }
-# ...
-# }
-
-#
-# TODO: add default audio pre processor configurations after debug and tuning phase
-#
- pre_processing {
- voice_communication {
- aec {}
- }
- }
- output_session_processing {
- music {
- soundalive {}
- dha {}
- sa3d {}
- }
- ring {
- sa3d {}
- }
- }
diff --git a/audio/audio_policy.conf b/audio/audio_policy.conf
deleted file mode 100644
index b7b2336..0000000
--- a/audio/audio_policy.conf
+++ /dev/null
@@ -1,133 +0,0 @@
-# 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_THIRD_MIC|AUDIO_DEVICE_IN_REMOTE_SUBMIX|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.<device>.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|48000
- 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_EXTERNAL_WIFI|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET
- flags AUDIO_OUTPUT_FLAG_PRIMARY
- }
- fast {
- sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000
- 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_EXTERNAL_WIFI|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET
- flags AUDIO_OUTPUT_FLAG_FAST
- }
- hdmi {
- sampling_rates 48000
- channel_masks dynamic
- formats AUDIO_FORMAT_PCM_16_BIT
- devices AUDIO_DEVICE_OUT_AUX_DIGITAL
- flags AUDIO_OUTPUT_FLAG_MULTI_CH
- }
- compress_offload {
- sampling_rates 11025|16000|22050|32000|44100|48000
- channel_masks AUDIO_CHANNEL_OUT_MONO|AUDIO_CHANNEL_OUT_STEREO|AUDIO_CHANNEL_OUT_2POINT1|AUDIO_CHANNEL_OUT_QUAD|AUDIO_CHANNEL_OUT_PENTA|AUDIO_CHANNEL_OUT_5POINT1|AUDIO_CHANNEL_OUT_6POINT1|AUDIO_CHANNEL_OUT_7POINT1
- formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_AC3|AUDIO_FORMAT_E_AC3
- 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_EXTERNAL_WIFI|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET
- flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING
- }
- }
- inputs {
- primary {
- sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000
- channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO|AUDIO_CHANNEL_IN_FRONT_BACK|AUDIO_CHANNEL_IN_VOICE_UPLINK|AUDIO_CHANNEL_IN_VOICE_DNLINK
- 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_WIRED_HEADPHONE|AUDIO_DEVICE_IN_AUX_DIGITAL|AUDIO_DEVICE_IN_VOICE_CALL|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_THIRD_MIC|AUDIO_DEVICE_IN_FM
- }
- }
- }
- a2dp {
- outputs {
- a2dp {
- sampling_rates 44100
- channel_masks AUDIO_CHANNEL_OUT_STEREO
- formats AUDIO_FORMAT_PCM_16_BIT
- devices AUDIO_DEVICE_OUT_ALL_A2DP
- }
- }
- inputs {
- a2dp {
- sampling_rates 44100|48000
- channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO
- formats AUDIO_FORMAT_PCM_16_BIT
- devices AUDIO_DEVICE_IN_BLUETOOTH_A2DP
- }
- }
- }
- 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|48000
- channel_masks dynamic
- formats AUDIO_FORMAT_PCM_16_BIT
- devices AUDIO_DEVICE_OUT_USB_DEVICE|AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET
- }
- }
- }
- tms {
- outputs {
- tms {
- sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000
- channel_masks AUDIO_CHANNEL_OUT_STEREO
- formats AUDIO_FORMAT_PCM_16_BIT
- devices AUDIO_DEVICE_OUT_EXTERNAL_TMS
- }
- }
- inputs {
- tms {
- sampling_rates 8000|11025|12000|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_EXTERNAL_TMS
- }
- }
- }
- 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
- }
- }
- }
-}
diff --git a/device.mk b/device.mk
index 0822511..2360e52 100644
--- a/device.mk
+++ b/device.mk
@@ -21,8 +21,6 @@
$(LOCAL_PATH)/audio/Hdmi_cal.acdb:system/etc/Hdmi_cal.acdb \
$(LOCAL_PATH)/audio/Headset_cal.acdb:system/etc/Headset_cal.acdb \
$(LOCAL_PATH)/audio/Speaker_cal.acdb:system/etc/Speaker_cal.acdb \
- $(LOCAL_PATH)/audio/audio_effects.conf:system/vendor/etc/audio_effects.conf \
- $(LOCAL_PATH)/audio/audio_policy.conf:system/etc/audio_policy.conf \
$(LOCAL_PATH)/audio/mixer_paths.xml:system/etc/mixer_paths.xml
# Media configurations