fix audio
This commit is contained in:
Valera1978
parent
2c17c0fd50
commit
a768aa23a9
@ -1,277 +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 {
|
|
||||||
bundle {
|
|
||||||
path /vendor/lib/soundfx/libbundlewrapper.so
|
|
||||||
}
|
|
||||||
reverb {
|
|
||||||
path /vendor/lib/soundfx/libreverbwrapper.so
|
|
||||||
}
|
|
||||||
qcbassboost {
|
|
||||||
path /vendor/lib/soundfx/libqcbassboost.so
|
|
||||||
}
|
|
||||||
qcvirt {
|
|
||||||
path /vendor/lib/soundfx/libqcvirt.so
|
|
||||||
}
|
|
||||||
qcreverb {
|
|
||||||
path /vendor/lib/soundfx/libqcreverb.so
|
|
||||||
}
|
|
||||||
visualizer_sw {
|
|
||||||
path /vendor/lib/soundfx/libvisualizer.so
|
|
||||||
}
|
|
||||||
visualizer_hw {
|
|
||||||
path /vendor/lib/soundfx/libqcomvisualizer.so
|
|
||||||
}
|
|
||||||
downmix {
|
|
||||||
path /vendor/lib/soundfx/libdownmix.so
|
|
||||||
}
|
|
||||||
loudness_enhancer {
|
|
||||||
path /vendor/lib/soundfx/libldnhncr.so
|
|
||||||
}
|
|
||||||
proxy {
|
|
||||||
path /vendor/lib/soundfx/libeffectproxy.so
|
|
||||||
}
|
|
||||||
offload_bundle {
|
|
||||||
path /vendor/lib/soundfx/libqcompostprocbundle.so
|
|
||||||
}
|
|
||||||
audio_pre_processing {
|
|
||||||
path /vendor/lib/soundfx/libqcomvoiceprocessing.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 {
|
|
||||||
|
|
||||||
# additions for the proxy implementation
|
|
||||||
# Proxy implementation
|
|
||||||
#effectname {
|
|
||||||
#library proxy
|
|
||||||
#uuid xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
|
|
||||||
|
|
||||||
# SW implemetation of the effect. Added as a node under the proxy to
|
|
||||||
# indicate this as a sub effect.
|
|
||||||
#libsw {
|
|
||||||
#library libSW
|
|
||||||
#uuid yyyyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy
|
|
||||||
#} End of SW effect
|
|
||||||
|
|
||||||
# HW implementation of the effect. Added as a node under the proxy to
|
|
||||||
# indicate this as a sub effect.
|
|
||||||
#libhw {
|
|
||||||
#library libHW
|
|
||||||
#uuid zzzzzzzz-zzzz-zzzz-zzzz-zzzzzzzzzzzz
|
|
||||||
#}End of HW effect
|
|
||||||
#} End of effect proxy
|
|
||||||
|
|
||||||
bassboost {
|
|
||||||
library proxy
|
|
||||||
uuid 14804144-a5ee-4d24-aa88-0002a5d5c51b
|
|
||||||
|
|
||||||
libsw {
|
|
||||||
library qcbassboost
|
|
||||||
uuid 23aca180-44bd-11e2-bcfd-0800200c9a66
|
|
||||||
}
|
|
||||||
|
|
||||||
libhw {
|
|
||||||
library offload_bundle
|
|
||||||
uuid 2c4a8c24-1581-487f-94f6-0002a5d5c51b
|
|
||||||
}
|
|
||||||
}
|
|
||||||
virtualizer {
|
|
||||||
library proxy
|
|
||||||
uuid d3467faa-acc7-4d34-acaf-0002a5d5c51b
|
|
||||||
|
|
||||||
libsw {
|
|
||||||
library qcvirt
|
|
||||||
uuid e6c98a16-22a3-11e2-b87b-f23c91aec05e
|
|
||||||
}
|
|
||||||
|
|
||||||
libhw {
|
|
||||||
library offload_bundle
|
|
||||||
uuid 509a4498-561a-4bea-b3b1-0002a5d5c51b
|
|
||||||
}
|
|
||||||
}
|
|
||||||
equalizer {
|
|
||||||
library proxy
|
|
||||||
uuid c8e70ecd-48ca-456e-8a4f-0002a5d5c51b
|
|
||||||
|
|
||||||
libsw {
|
|
||||||
library bundle
|
|
||||||
uuid ce772f20-847d-11df-bb17-0002a5d5c51b
|
|
||||||
}
|
|
||||||
|
|
||||||
libhw {
|
|
||||||
library offload_bundle
|
|
||||||
uuid a0dac280-401c-11e3-9379-0002a5d5c51b
|
|
||||||
}
|
|
||||||
}
|
|
||||||
volume {
|
|
||||||
library bundle
|
|
||||||
uuid 119341a0-8469-11df-81f9-0002a5d5c51b
|
|
||||||
}
|
|
||||||
reverb_env_aux {
|
|
||||||
library proxy
|
|
||||||
uuid 48404ac9-d202-4ccc-bf84-0002a5d5c51b
|
|
||||||
|
|
||||||
libsw {
|
|
||||||
library qcreverb
|
|
||||||
uuid a8c1e5f3-293d-43cd-95ec-d5e26c02e217
|
|
||||||
}
|
|
||||||
|
|
||||||
libhw {
|
|
||||||
library offload_bundle
|
|
||||||
uuid 79a18026-18fd-4185-8233-0002a5d5c51b
|
|
||||||
}
|
|
||||||
}
|
|
||||||
reverb_env_ins {
|
|
||||||
library proxy
|
|
||||||
uuid b707403a-a1c1-4291-9573-0002a5d5c51b
|
|
||||||
|
|
||||||
libsw {
|
|
||||||
library qcreverb
|
|
||||||
uuid 791fff8b-8129-4655-83a4-59bc61034c3a
|
|
||||||
}
|
|
||||||
|
|
||||||
libhw {
|
|
||||||
library offload_bundle
|
|
||||||
uuid eb64ea04-973b-43d2-8f5e-0002a5d5c51b
|
|
||||||
}
|
|
||||||
}
|
|
||||||
reverb_pre_aux {
|
|
||||||
library proxy
|
|
||||||
uuid 1b78f587-6d1c-422e-8b84-0002a5d5c51b
|
|
||||||
|
|
||||||
libsw {
|
|
||||||
library qcreverb
|
|
||||||
uuid 53ef1db5-c0c0-445b-b060-e34d20ebb70a
|
|
||||||
}
|
|
||||||
|
|
||||||
libhw {
|
|
||||||
library offload_bundle
|
|
||||||
uuid 6987be09-b142-4b41-9056-0002a5d5c51b
|
|
||||||
}
|
|
||||||
}
|
|
||||||
reverb_pre_ins {
|
|
||||||
library proxy
|
|
||||||
uuid f3e178d2-ebcb-408e-8357-0002a5d5c51b
|
|
||||||
|
|
||||||
libsw {
|
|
||||||
library qcreverb
|
|
||||||
uuid b08a0e38-22a5-11e2-b87b-f23c91aec05e
|
|
||||||
}
|
|
||||||
|
|
||||||
libhw {
|
|
||||||
library offload_bundle
|
|
||||||
uuid aa2bebf6-47cf-4613-9bca-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
|
|
||||||
}
|
|
||||||
loudness_enhancer {
|
|
||||||
library loudness_enhancer
|
|
||||||
uuid fa415329-2034-4bea-b5dc-5b381c8d1e2c
|
|
||||||
}
|
|
||||||
# aec {
|
|
||||||
# library audio_pre_processing
|
|
||||||
# uuid 29dfd020-e88b-11e5-b505-0002a5d5c51b
|
|
||||||
# }
|
|
||||||
# agc {
|
|
||||||
# library audio_pre_processing
|
|
||||||
# uuid e6cdbac0-4a7c-11e4-a018-0002a5d5c51b
|
|
||||||
# }
|
|
||||||
# ns {
|
|
||||||
# library audio_pre_processing
|
|
||||||
# uuid e4eb6b40-e88b-11e5-b6ad-0002a5d5c51b
|
|
||||||
# }
|
|
||||||
}
|
|
||||||
|
|
||||||
# Default pre-processing effects. Add to audio_effect.conf "effects" section if
|
|
||||||
# audio HAL implements support for them.
|
|
||||||
#
|
|
||||||
# aec {
|
|
||||||
# library pre_processing
|
|
||||||
# uuid bb392ec0-8d4d-11e0-a896-0002a5d5c51b
|
|
||||||
# }
|
|
||||||
# agc {
|
|
||||||
# library pre_processing
|
|
||||||
# uuid aa8130e0-66fc-11e0-bad0-0002a5d5c51b
|
|
||||||
# }
|
|
||||||
# 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
|
|
||||||
#
|
|
||||||
54
audio/audio_effects.xml
Executable file
54
audio/audio_effects.xml
Executable file
@ -0,0 +1,54 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<audio_effects_conf version="2.0" xmlns="http://schemas.android.com/audio/audio_effects_conf/v2_0">
|
||||||
|
<libraries>
|
||||||
|
<library name="bundle" path="libbundlewrapper.so"/>
|
||||||
|
<library name="reverb" path="libreverbwrapper.so"/>
|
||||||
|
<library name="qcbassboost" path="libqcbassboost.so"/>
|
||||||
|
<library name="qcvirt" path="libqcvirt.so"/>
|
||||||
|
<library name="qcreverb" path="libqcreverb.so"/>
|
||||||
|
<library name="visualizer_sw" path="libvisualizer.so"/>
|
||||||
|
<library name="visualizer_hw" path="libqcomvisualizer.so"/>
|
||||||
|
<library name="downmix" path="libdownmix.so"/>
|
||||||
|
<library name="loudness_enhancer" path="libldnhncr.so"/>
|
||||||
|
<library name="proxy" path="libeffectproxy.so"/>
|
||||||
|
<library name="offload_bundle" path="libqcompostprocbundle.so"/>
|
||||||
|
<library name="audio_pre_processing" path="libqcomvoiceprocessing.so"/>
|
||||||
|
</libraries>
|
||||||
|
<effects>
|
||||||
|
<effectProxy name="bassboost" library="proxy" uuid="14804144-a5ee-4d24-aa88-0002a5d5c51b">
|
||||||
|
<libsw library="qcbassboost" uuid="23aca180-44bd-11e2-bcfd-0800200c9a66"/>
|
||||||
|
<libhw library="offload_bundle" uuid="2c4a8c24-1581-487f-94f6-0002a5d5c51b"/>
|
||||||
|
</effectProxy>
|
||||||
|
<effectProxy name="virtualizer" library="proxy" uuid="d3467faa-acc7-4d34-acaf-0002a5d5c51b">
|
||||||
|
<libsw library="qcvirt" uuid="e6c98a16-22a3-11e2-b87b-f23c91aec05e"/>
|
||||||
|
<libhw library="offload_bundle" uuid="509a4498-561a-4bea-b3b1-0002a5d5c51b"/>
|
||||||
|
</effectProxy>
|
||||||
|
<effectProxy name="equalizer" library="proxy" uuid="c8e70ecd-48ca-456e-8a4f-0002a5d5c51b">
|
||||||
|
<libsw library="bundle" uuid="ce772f20-847d-11df-bb17-0002a5d5c51b"/>
|
||||||
|
<libhw library="offload_bundle" uuid="a0dac280-401c-11e3-9379-0002a5d5c51b"/>
|
||||||
|
</effectProxy>
|
||||||
|
<effect name="volume" library="bundle" uuid="119341a0-8469-11df-81f9-0002a5d5c51b"/>
|
||||||
|
<effectProxy name="reverb_env_aux" library="proxy" uuid="48404ac9-d202-4ccc-bf84-0002a5d5c51b">
|
||||||
|
<libsw library="qcreverb" uuid="a8c1e5f3-293d-43cd-95ec-d5e26c02e217"/>
|
||||||
|
<libhw library="offload_bundle" uuid="79a18026-18fd-4185-8233-0002a5d5c51b"/>
|
||||||
|
</effectProxy>
|
||||||
|
<effectProxy name="reverb_env_ins" library="proxy" uuid="b707403a-a1c1-4291-9573-0002a5d5c51b">
|
||||||
|
<libsw library="qcreverb" uuid="791fff8b-8129-4655-83a4-59bc61034c3a"/>
|
||||||
|
<libhw library="offload_bundle" uuid="eb64ea04-973b-43d2-8f5e-0002a5d5c51b"/>
|
||||||
|
</effectProxy>
|
||||||
|
<effectProxy name="reverb_pre_aux" library="proxy" uuid="1b78f587-6d1c-422e-8b84-0002a5d5c51b">
|
||||||
|
<libsw library="qcreverb" uuid="53ef1db5-c0c0-445b-b060-e34d20ebb70a"/>
|
||||||
|
<libhw library="offload_bundle" uuid="6987be09-b142-4b41-9056-0002a5d5c51b"/>
|
||||||
|
</effectProxy>
|
||||||
|
<effectProxy name="reverb_pre_ins" library="proxy" uuid="f3e178d2-ebcb-408e-8357-0002a5d5c51b">
|
||||||
|
<libsw library="qcreverb" uuid="b08a0e38-22a5-11e2-b87b-f23c91aec05e"/>
|
||||||
|
<libhw library="offload_bundle" uuid="aa2bebf6-47cf-4613-9bca-0002a5d5c51b"/>
|
||||||
|
</effectProxy>
|
||||||
|
<effectProxy name="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"/>
|
||||||
|
</effectProxy>
|
||||||
|
<effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>
|
||||||
|
<effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>
|
||||||
|
</effects>
|
||||||
|
</audio_effects_conf>
|
||||||
@ -1,134 +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_SPEAKER
|
|
||||||
default_output_device AUDIO_DEVICE_OUT_SPEAKER
|
|
||||||
attached_input_devices AUDIO_DEVICE_IN_BUILTIN_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_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|AUDIO_OUTPUT_FLAG_DEEP_BUFFER
|
|
||||||
}
|
|
||||||
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_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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
inputs {
|
|
||||||
usb_device {
|
|
||||||
sampling_rates dynamic
|
|
||||||
channel_masks AUDIO_CHANNEL_IN_STEREO
|
|
||||||
formats AUDIO_FORMAT_PCM_16_BIT
|
|
||||||
devices AUDIO_DEVICE_IN_USB_DEVICE
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
tms {
|
|
||||||
outputs {
|
|
||||||
tms {
|
|
||||||
sampling_rates 44100
|
|
||||||
channel_masks AUDIO_CHANNEL_OUT_STEREO
|
|
||||||
formats AUDIO_FORMAT_PCM_16_BIT
|
|
||||||
devices AUDIO_DEVICE_OUT_EXTERNAL_TMS
|
|
||||||
}
|
|
||||||
}
|
|
||||||
inputs {
|
|
||||||
tms {
|
|
||||||
sampling_rates 44100
|
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,5 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
<!-- Copyright (C) 2015 The Android Open Source Project
|
<!-- Copyright (c) 2016-2017, The Linux Foundation. All rights reserved
|
||||||
|
Not a Contribution.
|
||||||
|
-->
|
||||||
|
<!-- Copyright (C) 2016 The Android Open Source Project
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
@ -18,7 +21,7 @@
|
|||||||
<!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
|
<!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
|
||||||
|
|
||||||
<!-- Global configuration Decalaration -->
|
<!-- Global configuration Decalaration -->
|
||||||
<globalConfiguration speaker_drc_enabled="false"/>
|
<globalConfiguration speaker_drc_enabled="true"/>
|
||||||
|
|
||||||
|
|
||||||
<!-- Modules section:
|
<!-- Modules section:
|
||||||
@ -47,7 +50,9 @@
|
|||||||
<module name="primary" halVersion="2.0">
|
<module name="primary" halVersion="2.0">
|
||||||
<attachedDevices>
|
<attachedDevices>
|
||||||
<item>Speaker</item>
|
<item>Speaker</item>
|
||||||
|
<item>Telephony Tx</item>
|
||||||
<item>Built-In Mic</item>
|
<item>Built-In Mic</item>
|
||||||
|
<item>Telephony Rx</item>
|
||||||
</attachedDevices>
|
</attachedDevices>
|
||||||
<defaultOutputDevice>Speaker</defaultOutputDevice>
|
<defaultOutputDevice>Speaker</defaultOutputDevice>
|
||||||
<mixPorts>
|
<mixPorts>
|
||||||
@ -55,15 +60,35 @@
|
|||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
</mixPort>
|
</mixPort>
|
||||||
<mixPort name="deep_buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
|
<mixPort name="deep_buffer" role="source"
|
||||||
|
flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
</mixPort>
|
</mixPort>
|
||||||
|
<mixPort name="voice_tx" role="source">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
samplingRates="8000,16000,48000"
|
||||||
|
channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
|
</mixPort>
|
||||||
|
<mixPort name="voip_rx" role="source"
|
||||||
|
flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
samplingRates="8000,16000"
|
||||||
|
channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
|
||||||
|
</mixPort>
|
||||||
|
|
||||||
<mixPort name="primary input" role="sink">
|
<mixPort name="primary input" role="sink">
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
|
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
|
||||||
|
channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
|
||||||
|
</mixPort>
|
||||||
|
<mixPort name="voice_rx" role="sink">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
samplingRates="8000,16000,48000"
|
||||||
|
channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
|
||||||
</mixPort>
|
</mixPort>
|
||||||
</mixPorts>
|
</mixPorts>
|
||||||
|
|
||||||
<devicePorts>
|
<devicePorts>
|
||||||
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
|
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
|
||||||
<devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
|
<devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
|
||||||
@ -78,27 +103,80 @@
|
|||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
</devicePort>
|
</devicePort>
|
||||||
|
<devicePort tagName="Line" type="AUDIO_DEVICE_OUT_LINE" role="sink">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
|
</devicePort>
|
||||||
|
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
|
||||||
|
</devicePort>
|
||||||
|
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
|
||||||
|
</devicePort>
|
||||||
|
<devicePort tagName="BT SCO Car Kit" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT" role="sink">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
|
||||||
|
</devicePort>
|
||||||
|
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
|
</devicePort>
|
||||||
|
<devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>
|
||||||
|
</devicePort>
|
||||||
|
<devicePort tagName="Proxy" type="AUDIO_DEVICE_OUT_PROXY" role="sink">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>
|
||||||
|
</devicePort>
|
||||||
|
|
||||||
<devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
|
<devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
|
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
|
||||||
channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
|
channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
|
||||||
</devicePort>
|
</devicePort>
|
||||||
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
|
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
|
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
|
||||||
channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
|
channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
|
||||||
|
</devicePort>
|
||||||
|
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||||
|
</devicePort>
|
||||||
|
<devicePort tagName="Telephony Rx" type="AUDIO_DEVICE_IN_TELEPHONY_RX" role="source">
|
||||||
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||||
</devicePort>
|
</devicePort>
|
||||||
</devicePorts>
|
</devicePorts>
|
||||||
<!-- route declaration, i.e. list all available sources for a given sink -->
|
<!-- route declaration, i.e. list all available sources for a given sink -->
|
||||||
<routes>
|
<routes>
|
||||||
<route type="mix" sink="Speaker"
|
<route type="mix" sink="Speaker"
|
||||||
sources="primary output,deep_buffer"/>
|
sources="primary output,deep_buffer,voip_rx"/>
|
||||||
<route type="mix" sink="Wired Headset"
|
<route type="mix" sink="Wired Headset"
|
||||||
sources="primary output,deep_buffer"/>
|
sources="primary output,deep_buffer,voip_rx"/>
|
||||||
<route type="mix" sink="Wired Headphones"
|
<route type="mix" sink="Wired Headphones"
|
||||||
|
sources="primary output,deep_buffer,voip_rx"/>
|
||||||
|
<route type="mix" sink="Line"
|
||||||
|
sources="primary output,deep_buffer,voip_rx"/>
|
||||||
|
<route type="mix" sink="HDMI"
|
||||||
sources="primary output,deep_buffer"/>
|
sources="primary output,deep_buffer"/>
|
||||||
|
<route type="mix" sink="Proxy"
|
||||||
|
sources="primary output,deep_buffer"/>
|
||||||
|
<route type="mix" sink="BT SCO"
|
||||||
|
sources="primary output,deep_buffer,voip_rx"/>
|
||||||
|
<route type="mix" sink="BT SCO Headset"
|
||||||
|
sources="primary output,deep_buffer,voip_rx"/>
|
||||||
|
<route type="mix" sink="BT SCO Car Kit"
|
||||||
|
sources="primary output,deep_buffer,voip_rx"/>
|
||||||
|
<route type="mix" sink="Telephony Tx"
|
||||||
|
sources="voice_tx"/>
|
||||||
<route type="mix" sink="primary input"
|
<route type="mix" sink="primary input"
|
||||||
sources="Built-In Mic,Wired Headset Mic"/>
|
sources="Built-In Mic,Wired Headset Mic,BT SCO Headset Mic,Telephony Rx"/>
|
||||||
|
<route type="mix" sink="voice_rx"
|
||||||
|
sources="Telephony Rx"/>
|
||||||
</routes>
|
</routes>
|
||||||
|
|
||||||
</module>
|
</module>
|
||||||
@ -116,10 +194,8 @@
|
|||||||
<!-- End of Modules section -->
|
<!-- End of Modules section -->
|
||||||
|
|
||||||
<!-- Volume section -->
|
<!-- Volume section -->
|
||||||
|
|
||||||
<xi:include href="/vendor/etc/audio_policy_volumes.xml"/>
|
<xi:include href="/vendor/etc/audio_policy_volumes.xml"/>
|
||||||
<xi:include href="/vendor/etc/default_volume_tables.xml"/>
|
<xi:include href="/vendor/etc/default_volume_tables.xml"/>
|
||||||
|
|
||||||
<!-- End of Volume section -->
|
<!-- End of Volume section -->
|
||||||
|
|
||||||
</audioPolicyConfiguration>
|
</audioPolicyConfiguration>
|
||||||
|
|||||||
@ -86,12 +86,9 @@ PRODUCT_PACKAGES += \
|
|||||||
tinymix
|
tinymix
|
||||||
|
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
$(LOCAL_PATH)/audio/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \
|
$(LOCAL_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
|
||||||
$(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml
|
|
||||||
|
|
||||||
PRODUCT_COPY_FILES += \
|
|
||||||
$(LOCAL_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \
|
$(LOCAL_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \
|
||||||
$(LOCAL_PATH)/audio/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf \
|
$(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
|
||||||
$(LOCAL_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml
|
$(LOCAL_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml
|
||||||
|
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user