update audio config
This commit is contained in:
parent
90ff7946f6
commit
d5a3af49a0
3 changed files with 6 additions and 109 deletions
|
@ -1,63 +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_pcm_16 {
|
|
||||||
flags AUDIO_OUTPUT_FLAG_DIRECT
|
|
||||||
formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT
|
|
||||||
sampling_rates 44100|48000|96000|192000
|
|
||||||
bit_width 16
|
|
||||||
app_type 69936
|
|
||||||
}
|
|
||||||
direct_pcm_24 {
|
|
||||||
flags AUDIO_OUTPUT_FLAG_DIRECT
|
|
||||||
formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT
|
|
||||||
sampling_rates 44100|48000|96000|192000
|
|
||||||
bit_width 24
|
|
||||||
app_type 69940
|
|
||||||
}
|
|
||||||
compress_passthrough {
|
|
||||||
flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING|AUDIO_OUTPUT_FLAG_COMPRESS_PASSTHROUGH
|
|
||||||
formats AUDIO_FORMAT_AC3|AUDIO_FORMAT_E_AC3|AUDIO_FORMAT_E_AC3_JOC|AUDIO_FORMAT_DTS|AUDIO_FORMAT_DTS_HD
|
|
||||||
sampling_rates 32000|44100|48000|88200|96000|176400|192000
|
|
||||||
bit_width 16
|
|
||||||
app_type 69941
|
|
||||||
}
|
|
||||||
compress_offload_16 {
|
|
||||||
flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING
|
|
||||||
formats AUDIO_FORMAT_MP3|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|96000|192000
|
|
||||||
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_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO
|
|
||||||
sampling_rates 44100|48000|96000|192000
|
|
||||||
bit_width 24
|
|
||||||
app_type 69940
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,42 +0,0 @@
|
||||||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
|
||||||
<!--- Copyright (c) 2014, 2016, The Linux Foundation. All rights reserved. -->
|
|
||||||
<!--- -->
|
|
||||||
<!--- Redistribution and use in source and binary forms, with or without -->
|
|
||||||
<!--- modification, are permitted provided that the following conditions are -->
|
|
||||||
<!--- met: -->
|
|
||||||
<!--- * Redistributions of source code must retain the above copyright -->
|
|
||||||
<!--- notice, this list of conditions and the following disclaimer. -->
|
|
||||||
<!--- * Redistributions in binary form must reproduce the above -->
|
|
||||||
<!--- copyright notice, this list of conditions and the following -->
|
|
||||||
<!--- disclaimer in the documentation and/or other materials provided -->
|
|
||||||
<!--- with the distribution. -->
|
|
||||||
<!--- * Neither the name of The Linux Foundation nor the names of its -->
|
|
||||||
<!--- contributors may be used to endorse or promote products derived -->
|
|
||||||
<!--- from this software without specific prior written permission. -->
|
|
||||||
<!--- -->
|
|
||||||
<!--- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -->
|
|
||||||
<!--- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -->
|
|
||||||
<!--- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -->
|
|
||||||
<!--- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -->
|
|
||||||
<!--- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -->
|
|
||||||
<!--- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -->
|
|
||||||
<!--- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -->
|
|
||||||
<!--- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -->
|
|
||||||
<!--- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -->
|
|
||||||
<!--- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->
|
|
||||||
<!--- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -->
|
|
||||||
<listen_platform_info>
|
|
||||||
<device name="DEVICE_HANDSET_APE_ACDB_ID" acdb_id="100" />
|
|
||||||
<device name="DEVICE_HANDSET_CPE_ACDB_ID" acdb_id="128" />
|
|
||||||
<ctrl name="execution_type" value="CPE" /> <!-- value: "CPE" "APE" -->
|
|
||||||
<ctrl name="max_cpe_sessions" value="1" />
|
|
||||||
<ctrl name="max_cpe_keywords" value="6" />
|
|
||||||
<ctrl name="max_cpe_kw_user_pairs" value="6" />
|
|
||||||
<ctrl name="max_ape_sessions" value="8" />
|
|
||||||
<ctrl name="max_ape_keywords" value="10" />
|
|
||||||
<ctrl name="max_ape_kw_user_pairs" value="10" />
|
|
||||||
<ctrl name="dump_lab_data" value="false" /> <!-- value: "true" "false" -->
|
|
||||||
<!-- If value is true, it requires write permissions to /data folder to -->
|
|
||||||
<!-- dump lab data to file under /data/LHAL foloder. Do "chmod 777 /data/" -->
|
|
||||||
</listen_platform_info>
|
|
||||||
|
|
10
device.mk
10
device.mk
|
@ -111,6 +111,7 @@ PRODUCT_PACKAGES += \
|
||||||
android.hardware.audio.effect@2.0-impl \
|
android.hardware.audio.effect@2.0-impl \
|
||||||
android.hardware.audio.effect@5.0 \
|
android.hardware.audio.effect@5.0 \
|
||||||
android.hardware.audio.effect@5.0-impl \
|
android.hardware.audio.effect@5.0-impl \
|
||||||
|
android.hardware.soundtrigger@2.1-impl \
|
||||||
audio.a2dp.default \
|
audio.a2dp.default \
|
||||||
audio.primary.msm8996 \
|
audio.primary.msm8996 \
|
||||||
audio.r_submix.default \
|
audio.r_submix.default \
|
||||||
|
@ -124,17 +125,18 @@ PRODUCT_PACKAGES += \
|
||||||
tinymix
|
tinymix
|
||||||
|
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
$(LOCAL_PATH)/configs/audio/audio_effects.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/audio_effects.conf \
|
$(LOCAL_PATH)/configs/audio/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \
|
||||||
$(LOCAL_PATH)/configs/audio/listen_platform_info.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/listen_platform_info.xml \
|
$(LOCAL_PATH)/configs/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml
|
||||||
$(LOCAL_PATH)/configs/audio/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \
|
|
||||||
|
PRODUCT_COPY_FILES += \
|
||||||
$(LOCAL_PATH)/configs/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \
|
$(LOCAL_PATH)/configs/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \
|
||||||
$(LOCAL_PATH)/configs/audio/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf \
|
$(LOCAL_PATH)/configs/audio/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf \
|
||||||
$(LOCAL_PATH)/configs/audio/mixer_paths_tasha.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tasha.xml
|
$(LOCAL_PATH)/configs/audio/mixer_paths_tasha.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tasha.xml
|
||||||
|
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
$(LOCAL_PATH)/configs/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
|
|
||||||
frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
|
frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
|
||||||
frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
|
frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
|
||||||
|
frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \
|
||||||
frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
|
frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
|
||||||
frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
|
frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
|
||||||
frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
|
frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
|
||||||
|
|
Loading…
Reference in a new issue