From 07ef0bf215a904573859533356d84146ec4170fb Mon Sep 17 00:00:00 2001 From: Zhao Wei Liew Date: Thu, 10 Nov 2016 11:29:30 +0800 Subject: [PATCH] land: Move audio configs to vendor Change-Id: I5b061be2be2f752c333dd836f9f72964c759a8aa --- audio/audio_effects.conf | 418 --------- audio/audio_output_policy.conf | 56 -- audio/audio_platform_info.xml | 63 -- audio/audio_policy.conf | 173 ---- audio/mixer_paths_qrd_sku1.xml | 1193 ------------------------- audio/sound_trigger_mixer_paths.xml | 83 -- audio/sound_trigger_platform_info.xml | 60 -- product/audio.mk | 20 +- product/qcom-audio.mk | 17 - proprietary-files.txt | 8 + 10 files changed, 19 insertions(+), 2072 deletions(-) delete mode 100644 audio/audio_effects.conf delete mode 100644 audio/audio_output_policy.conf delete mode 100644 audio/audio_platform_info.xml delete mode 100644 audio/audio_policy.conf delete mode 100644 audio/mixer_paths_qrd_sku1.xml delete mode 100644 audio/sound_trigger_mixer_paths.xml delete mode 100644 audio/sound_trigger_platform_info.xml delete mode 100644 product/qcom-audio.mk diff --git a/audio/audio_effects.conf b/audio/audio_effects.conf deleted file mode 100644 index b9f723e..0000000 --- a/audio/audio_effects.conf +++ /dev/null @@ -1,418 +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 { -# { -# path -# } -# } -libraries { - bundle { - path /system/lib/soundfx/libbundlewrapper.so - } - reverb { - path /system/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 /system/lib/soundfx/libvisualizer.so - } - visualizer_hw { - path /system/lib/soundfx/libqcomvisualizer.so - } - downmix { - path /system/lib/soundfx/libdownmix.so - } - loudness_enhancer { - path /system/lib/soundfx/libldnhncr.so - } - proxy { - path /system/lib/soundfx/libeffectproxy.so - } - offload_bundle { - path /system/lib/soundfx/libqcompostprocbundle.so - } - audio_pre_processing { - path /system/lib/soundfx/libqcomvoiceprocessing.so - } -# bug 156482 add dirac effect start - loudness_enhancer { - path /system/lib/soundfx/libldnhncr.so - } - volume_listener { - path /system/lib/soundfx/libvolumelistener.so - } - dirac { - path /system/lib/soundfx/libdirac.so - } -} -# bug 156482 add dirac effect end - -# 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 { -# { -# library -# 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 - } - hw_acc { - library offload_bundle - uuid 7d1580bd-297f-4683-9239-e475b6d1d69f - } - loudness_enhancer { - library loudness_enhancer - uuid fa415329-2034-4bea-b5dc-5b381c8d1e2c - } - aec { - library audio_pre_processing - uuid 0f8d0d2a-59e5-45fe-b6e4-248c8a799109 - } - ns { - library audio_pre_processing - uuid 1d97bb0b-9e2f-4403-9ae3-58c2554306f8 - } -# bug 156482 add dirac effect start - music_helper { - library volume_listener - uuid 08b8b058-0590-11e5-ac71-0025b32654a0 - } - ring_helper { - library volume_listener - uuid 0956df94-0590-11e5-bdbe-0025b32654a0 - } - alarm_helper { - library volume_listener - uuid 09f303e2-0590-11e5-8fdb-0025b32654a0 - } - # voice_helper is called when stream type is voice_call in VoIP usecase - voice_helper { - library volume_listener - uuid 0ace5c08-0590-11e5-ae9e-0025b32654a0 - } - notification_helper { - library volume_listener - uuid 0b776dde-0590-11e5-81ba-0025b32654a0 - } - dirac { - library dirac - uuid e069d9e0-8329-11df-9168-0002a5d5c51b - } -} - -# additional effect from vendor -# UUID generated using version 1 - -output_session_processing { - music { - music_helper { - } - } - ring { - ring_helper { - } - } - alarm { - alarm_helper { - } - } - # stream type voice_call is used for VoIP call - voice_call { - voice_helper { - } - } - notification { - notification_helper { - } - } -} - -# Audio global processor configurations. -# The global processor configuration consists in 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 -# global_processing { -# { -# { -# param { -# int|short|float|bool|string -# [ int|short|float|bool|string ] -# ... -# } -# value { -# int|short|float|bool|string -# [ int|short|float|bool|string ] -# ... -# } -# } -# { } -# ... -# } -# ... -# } -global_processing { - dirac { - bl@lakala { - param { - int 6 - } - value { - string *com.lakala.android - } - } - bl@jawboneup { - param { - int 6 - } - value { - string *com.jawbone.up - } - } - bl@hojyremote { - param { - int 6 - } - value { - string *com.hojy.hremote - } - } - } - } -# bug 156482 add dirac effect end -# 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 bb392ec0-8d4d-11e0-a896-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 { -# { -# { -# { -# param { -# int|short|float|bool|string -# [ int|short|float|bool|string ] -# ... -# } -# value { -# int|short|float|bool|string -# [ int|short|float|bool|string ] -# ... -# } -# } -# { } -# ... -# } -# ... -# } -# ... -# } - -# Added aec, ns effects for voice_commuincation, which are supported by the board - -pre_processing { - voice_communication { - aec { - } - ns { - } - } -} - -# -# TODO: add default audio pre processor configurations after debug and tuning phase -# diff --git a/audio/audio_output_policy.conf b/audio/audio_output_policy.conf deleted file mode 100644 index 313d36c..0000000 --- a/audio/audio_output_policy.conf +++ /dev/null @@ -1,56 +0,0 @@ -# List of profiles for the output device session where stream is routed. -# A stream opened with the inputs attributes which match the "flags" and -# "formats" as specified in the profile is routed to a device at -# sample rate specified under "sampling_rates" and bit width under -# "bit_width" and the topology extracted from the acdb data against -# the "app_type". -# -# the flags and formats are specified using the strings corresponding to -# enums in audio.h and audio_policy.h. They are concatenated with "|" -# without space or "\n". -# the flags and formats should match the ones in "audio_policy.conf" - -outputs { - default { - flags AUDIO_OUTPUT_FLAG_PRIMARY - formats AUDIO_FORMAT_PCM_16_BIT - sampling_rates 48000 - bit_width 16 - app_type 69937 - } - deep_buffer { - flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER - formats AUDIO_FORMAT_PCM_16_BIT - sampling_rates 48000 - bit_width 16 - app_type 69936 - } - direct { - flags AUDIO_OUTPUT_FLAG_DIRECT - formats AUDIO_FORMAT_PCM_16_BIT - sampling_rates 48000 - bit_width 16 - app_type 69936 - } - direct_pcm { - flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM - formats AUDIO_FORMAT_PCM_16_BIT - sampling_rates 44100|48000|96000|192000 - bit_width 16 - app_type 69936 - } - compress_offload_16 { - flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING - formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_AC3|AUDIO_FORMAT_E_AC3|AUDIO_FORMAT_PCM_16_BIT_OFFLOAD|AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_AAC_ADTS_LC|AUDIO_FORMAT_AAC_ADTS_HE_V1|AUDIO_FORMAT_AAC_ADTS_HE_V2 - sampling_rates 44100|48000 - bit_width 16 - app_type 69936 - } - compress_offload_24 { - flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING - formats AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_VORBIS - sampling_rates 44100|48000|96000|192000 - bit_width 24 - app_type 69940 - } -} diff --git a/audio/audio_platform_info.xml b/audio/audio_platform_info.xml deleted file mode 100644 index a23dcfe..0000000 --- a/audio/audio_platform_info.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/audio_policy.conf b/audio/audio_policy.conf deleted file mode 100644 index f69cfa5..0000000 --- a/audio/audio_policy.conf +++ /dev/null @@ -1,173 +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 -# - defines whether the speaker output path uses DRC -# "TRUE" means DRC is enabled, "FALSE" or omission means DRC isn't used. -global_configuration { - attached_output_devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_TELEPHONY_TX - default_output_device AUDIO_DEVICE_OUT_SPEAKER - attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_REMOTE_SUBMIX|AUDIO_DEVICE_IN_FM_TUNER|AUDIO_DEVICE_IN_VOICE_CALL|AUDIO_DEVICE_IN_TELEPHONY_RX - - speaker_drc_enabled TRUE -} - -# 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|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_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_FM - flags AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST - } - raw { - sampling_rates 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_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY - flags AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_RAW - } - deep_buffer { - sampling_rates 44100|48000 - channel_masks AUDIO_CHANNEL_OUT_STEREO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY - flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER - } - multichannel { - sampling_rates 44100|48000 - channel_masks dynamic - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY - flags AUDIO_OUTPUT_FLAG_DIRECT - } - direct_pcm { - sampling_rates 8000|11025|16000|22050|32000|44100|48000|64000|88200|96000|176400|192000 - 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_PCM_16_BIT - devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_AUX_DIGITAL - flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM - } - compress_offload { - sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000|64000|88200|96000|176400|192000 - 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_AC3|AUDIO_FORMAT_E_AC3|AUDIO_FORMAT_PCM_16_BIT_OFFLOAD|AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_AAC_ADTS_LC|AUDIO_FORMAT_AAC_ADTS_HE_V1|AUDIO_FORMAT_AAC_ADTS_HE_V2 - devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY - flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING - } - incall_music { - sampling_rates 8000|16000|48000 - channel_masks AUDIO_CHANNEL_OUT_MONO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO - flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_INCALL_MUSIC - } - voice_tx { - sampling_rates 8000|16000|48000 - channel_masks AUDIO_CHANNEL_OUT_STEREO|AUDIO_CHANNEL_OUT_MONO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_TELEPHONY_TX - } - voip_rx { - sampling_rates 8000|16000 - channel_masks AUDIO_CHANNEL_OUT_MONO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO - flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX - } - } - 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 - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_FM_TUNER|AUDIO_DEVICE_IN_VOICE_CALL - } - surround_sound { - 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_5POINT1 - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC - } - voice_rx { - sampling_rates 8000|16000|48000 - channel_masks AUDIO_CHANNEL_IN_STEREO|AUDIO_CHANNEL_IN_MONO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_IN_TELEPHONY_RX - } - } - } - 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 dynamic - channel_masks dynamic - formats dynamic - devices AUDIO_DEVICE_OUT_USB_DEVICE - } - } - inputs { - usb_device { - sampling_rates dynamic - channel_masks AUDIO_CHANNEL_IN_STEREO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_IN_USB_DEVICE - } - } - } - 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/audio/mixer_paths_qrd_sku1.xml b/audio/mixer_paths_qrd_sku1.xml deleted file mode 100644 index 9ed06de..0000000 --- a/audio/mixer_paths_qrd_sku1.xml +++ /dev/null @@ -1,1193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/sound_trigger_mixer_paths.xml b/audio/sound_trigger_mixer_paths.xml deleted file mode 100644 index bbec875..0000000 --- a/audio/sound_trigger_mixer_paths.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/sound_trigger_platform_info.xml b/audio/sound_trigger_platform_info.xml deleted file mode 100644 index 846ea0e..0000000 --- a/audio/sound_trigger_platform_info.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/product/audio.mk b/product/audio.mk index 134dadb..34f8fbb 100644 --- a/product/audio.mk +++ b/product/audio.mk @@ -1,21 +1,23 @@ -# Audio configs -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/audio/audio_effects.conf:system/vendor/etc/audio_effects.conf \ - $(LOCAL_PATH)/audio/audio_output_policy.conf:system/vendor/etc/audio_output_policy.conf \ - $(LOCAL_PATH)/audio/audio_platform_info.xml:system/etc/audio_platform_info.xml \ - $(LOCAL_PATH)/audio/audio_policy.conf:system/etc/audio_policy.conf \ - $(LOCAL_PATH)/audio/mixer_paths_qrd_sku1.xml:system/etc/mixer_paths_qrd_sku1.xml - # Properties PRODUCT_PROPERTY_OVERRIDES += \ af.fast_track_multiplier=2 \ audio.deep_buffer.media=true \ + audio.dolby.ds2.enabled=true \ audio.offload.buffer.size.kb=64 \ audio.offload.gapless.enabled=true \ audio.offload.min.duration.secs=30 \ audio.offload.pcm.16bit.enable=true \ audio.offload.pcm.24bit.enable=true \ audio.offload.video=true \ + audio.playback.mch.downsample=true \ + audio.safx.pbe.enabled=true \ audio_hal.period_size=192 \ + ro.qc.sdk.audio.fluencetype=fluence \ persist.audio.dirac.speaker=true \ - use.voice.path.for.pcm.voip=true + persist.audio.fluence.voicecall=true \ + use.qti.sw.alac.decoder=true \ + use.qti.sw.ape.decoder=true \ + use.voice.path.for.pcm.voip=true \ + voice.conc.fallbackpath=deep-buffer \ + voice.playback.conc.disabled=true \ + voice.voip.conc.disabled=true diff --git a/product/qcom-audio.mk b/product/qcom-audio.mk deleted file mode 100644 index 46e1c69..0000000 --- a/product/qcom-audio.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Audio -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:system/etc/sound_trigger_mixer_paths.xml \ - $(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:system/etc/sound_trigger_platform_info.xml - -# Properties -PRODUCT_PROPERTY_OVERRIDES += \ - audio.dolby.ds2.enabled=true \ - audio.playback.mch.downsample=true \ - audio.safx.pbe.enabled=true \ - ro.qc.sdk.audio.fluencetype=fluence \ - persist.audio.fluence.voicecall=true \ - use.qti.sw.alac.decoder=true \ - use.qti.sw.ape.decoder=true \ - voice.conc.fallbackpath=deep-buffer \ - voice.playback.conc.disabled=true \ - voice.voip.conc.disabled=true diff --git a/proprietary-files.txt b/proprietary-files.txt index 3ec684a..08dbc29 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -14,8 +14,16 @@ vendor/lib/rfsa/adsp/libfastcvadsp.so vendor/lib/rfsa/adsp/libfastcvadsp_skel.so # Audio +etc/audio_platform_info.xml +etc/audio_policy.conf +etc/mixer_paths_qrd_sku1.xml +etc/sound_trigger_mixer_paths.xml +etc/sound_trigger_platform_info.xml lib/hw/audio.primary.msm8937.so lib/soundfx/libdirac.so +vendor/etc/audio_effects.conf +vendor/etc/audio_output_policy.conf +vendor/etc/diracmobile.config vendor/lib/libacdb-fts.so vendor/lib/libacdbloader.so vendor/lib/libacdbrtac.so