diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index f4b81da..3cc89d3 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -43,16 +43,20 @@ TARGET_2ND_CPU_VARIANT := cortex-a76 # Audio AUDIO_FEATURE_ENABLED_DLKM := true -AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true +#AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true AUDIO_FEATURE_ENABLED_GKI := true AUDIO_FEATURE_ENABLED_INSTANCE_ID := true +AUDIO_FEATURE_ENABLED_AGM_HIDL := true +AUDIO_FEATURE_ENABLED_LSM_HIDL := true +AUDIO_FEATURE_ENABLED_PAL_HIDL := true AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true AUDIO_FEATURE_ENABLED_SSR := true AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true BOARD_SUPPORTS_OPENSOURCE_STHAL := true BOARD_SUPPORTS_SOUND_TRIGGER := true BOARD_USES_ALSA_AUDIO := true +TARGET_USES_QCOM_MM_AUDIO := true # Bootloader TARGET_BOOTLOADER_BOARD_NAME := kalama diff --git a/audio/audio_io_policy.conf b/audio/audio_io_policy.conf deleted file mode 100644 index 5163601..0000000 --- a/audio/audio_io_policy.conf +++ /dev/null @@ -1,200 +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 - } -#ifdef OPLUS_FEATURE_PLAYBACK_24BIT -#Yewenliang@MULTIMEDIA.AUDIODRIVER.HAL, 2021/01/12, add for support playback with 24bits - default_24 { - flags AUDIO_OUTPUT_FLAG_PRIMARY - formats AUDIO_FORMAT_PCM_24_BIT_PACKED - sampling_rates 48000 - bit_width 24 - app_type 69937 - } -#endif /* OPLUS_FEATURE_PLAYBACK_24BIT */ - proaudio { - flags AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_RAW - formats AUDIO_FORMAT_PCM_16_BIT - sampling_rates 48000 - bit_width 16 - app_type 69943 - } - voip_rx { - flags AUDIO_OUTPUT_FLAG_VOIP_RX|AUDIO_OUTPUT_FLAG_DIRECT - formats AUDIO_FORMAT_PCM_16_BIT - sampling_rates 8000|16000|32000|48000 - bit_width 16 - app_type 69946 - } - deep_buffer { - flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER - formats AUDIO_FORMAT_PCM_16_BIT - sampling_rates 48000 - bit_width 16 - app_type 69936 - } -#ifdef OPLUS_FEATURE_PLAYBACK_24BIT -#Yewenliang@MULTIMEDIA.AUDIODRIVER.HAL, 2021/01/12, add for support playback with 24bits - deep_buffer_24 { - flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER - formats AUDIO_FORMAT_PCM_24_BIT_PACKED - sampling_rates 48000 - bit_width 24 - app_type 69936 - } -#endif /* OPLUS_FEATURE_PLAYBACK_24BIT */ - 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|AUDIO_FORMAT_PCM_32_BIT - sampling_rates 44100|48000|88200|96000|176400|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|AUDIO_FORMAT_PCM_32_BIT - sampling_rates 44100|48000|88200|96000|176400|192000|352800|384000 - bit_width 24 - app_type 69940 - } - direct_pcm_32 { - flags AUDIO_OUTPUT_FLAG_DIRECT - formats AUDIO_FORMAT_PCM_32_BIT - sampling_rates 44100|48000|88200|96000|176400|192000|352800|384000 - bit_width 32 - app_type 69942 - } - 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_DTS|AUDIO_FORMAT_DTS_HD|AUDIO_FORMAT_DSD - sampling_rates 32000|44100|48000|88200|96000|176400|192000|352800 - 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_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|AUDIO_FORMAT_AAC_LATM_LC|AUDIO_FORMAT_AAC_LATM_HE_V1|AUDIO_FORMAT_AAC_LATM_HE_V2 - sampling_rates 44100|48000|88200|96000|176400|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_MP3|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_PRO|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_AAC_ADTS_LC|AUDIO_FORMAT_AAC_ADTS_HE_V1|AUDIO_FORMAT_AAC_ADTS_HE_V2|AUDIO_FORMAT_AAC_LATM_LC|AUDIO_FORMAT_AAC_LATM_HE_V1|AUDIO_FORMAT_AAC_LATM_HE_V2 - sampling_rates 44100|48000|88200|96000|176400|192000 - bit_width 24 - app_type 69940 - } -} - -inputs { - record_16bit { - formats AUDIO_FORMAT_PCM_16_BIT -#ifndef OPLUS_BUG_COMPATIBILITY -#//Jianfeng.Qiu@MULTIMEDIA.AUDIODRIVER.HAL.1825796, 2020/04/13, Modify for not support rate -# sampling_rates 8000|16000|32000|44100|48000|88200|96000|176400|192000 -#else - sampling_rates 8000|16000|32000|48000 -#endif /* OPLUS_BUG_COMPATIBILITY */ - bit_width 16 - app_type 69938 - } - record_24bit { -#ifndef OPLUS_FEATURE_OPREC_SUPPORT -#//liuhaituo@MULTIMEDIA.AUDIODRIVER.FEATURE, 2021/07/30, Add for dual dynamic hdr record -# formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_24_BIT -#else - formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT -#endif -#ifndef OPLUS_BUG_COMPATIBILITY -#//Jianfeng.Qiu@MULTIMEDIA.AUDIODRIVER.HAL.1825796, 2020/04/13, Modify for not support rate -# sampling_rates 44100|48000|88200|96000|176400|192000 -#else - sampling_rates 48000 -#endif /* OPLUS_BUG_COMPATIBILITY */ - bit_width 24 - app_type 69948 - } - record_32bit { - formats AUDIO_FORMAT_PCM_32_BIT|AUDIO_FORMAT_PCM_FLOAT -#ifndef OPLUS_BUG_COMPATIBILITY -#//Jianfeng.Qiu@MULTIMEDIA.AUDIODRIVER.HAL.1825796, 2020/04/13, Modify for not support rate -# sampling_rates 44100|48000|88200|96000|176400|192000 -#else - sampling_rates 48000 -#endif /* OPLUS_BUG_COMPATIBILITY */ - bit_width 32 - app_type 69949 - } - record_compress_16 { - flags AUDIO_INPUT_FLAG_COMPRESS - formats AUDIO_FORMAT_PCM_16_BIT -#ifndef OPLUS_BUG_COMPATIBILITY -#//Jianfeng.Qiu@MULTIMEDIA.AUDIODRIVER.HAL.1825796, 2020/04/13, Modify for not support rate -# sampling_rates 8000|16000|32000|44100|48000|88200|96000|176400|192000 -#else - sampling_rates 8000|16000|32000|48000 -#endif /* OPLUS_BUG_COMPATIBILITY */ - bit_width 16 - app_type 69938 - } - record_compress_24 { - flags AUDIO_INPUT_FLAG_COMPRESS -#ifndef OPLUS_FEATURE_OPREC_SUPPORT -#//liuhaituo@MULTIMEDIA.AUDIODRIVER.FEATURE, 2021/07/30, Add for dual dynamic hdr record -# formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_24_BIT -#else - formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT -#endif -#ifndef OPLUS_BUG_COMPATIBILITY -#//Jianfeng.Qiu@MULTIMEDIA.AUDIODRIVER.HAL.1825796, 2020/04/13, Modify for not support rate -# sampling_rates 44100|48000|88200|96000|176400|192000 -#else - sampling_rates 48000 -#endif /* OPLUS_BUG_COMPATIBILITY */ - bit_width 24 - app_type 69948 - } - record_compress_32 { - flags AUDIO_INPUT_FLAG_COMPRESS - formats AUDIO_FORMAT_PCM_32_BIT|AUDIO_FORMAT_PCM_FLOAT -#ifndef OPLUS_BUG_COMPATIBILITY -#//Jianfeng.Qiu@MULTIMEDIA.AUDIODRIVER.HAL.1825796, 2020/04/13, Modify for not support rate -# sampling_rates 44100|48000|88200|96000|176400|192000 -#else - sampling_rates 48000 -#endif /* OPLUS_BUG_COMPATIBILITY */ - bit_width 32 - app_type 69949 - } - voip_tx { - flags AUDIO_INPUT_FLAG_VOIP_TX - formats AUDIO_FORMAT_PCM_16_BIT - sampling_rates 8000|16000|32000|48000 - bit_width 16 - app_type 69946 - } - low_latency_voip_tx { - flags AUDIO_INPUT_FLAG_VOIP_TX|AUDIO_INPUT_FLAG_FAST - formats AUDIO_FORMAT_PCM_16_BIT - sampling_rates 48000 - bit_width 16 - app_type 69946 - } -} diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml index d686a48..5fc4eef 100644 --- a/audio/audio_policy_configuration.xml +++ b/audio/audio_policy_configuration.xml @@ -1,5 +1,5 @@ - - + @@ -92,15 +92,16 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Built-In Back Mic FM Tuner Telephony Rx + Echo Reference Speaker - + - + @@ -112,107 +113,123 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER"> + + + - + + + + - - - - + + + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000 128000 176400 192000" + channelMasks="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"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000 128000 176400 192000 352800 384000" + channelMasks="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"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000 128000 176400 192000 352800 384000" + channelMasks="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"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000 128000 176400 192000 352800 384000" + channelMasks="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"/> - + + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000 128000 176400 192000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000 128000 176400 192000" + channelMasks="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"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000 128000 176400 192000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_2POINT1 AUDIO_CHANNEL_OUT_QUAD AUDIO_CHANNEL_OUT_PENTA AUDIO_CHANNEL_OUT_5POINT1"/> + samplingRates="32000 44100 48000 64000 88200 96000 128000 176400 192000" + channelMasks="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"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" + channelMasks="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"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000" + channelMasks="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"/> + + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 48000" channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO"/> + flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_VOIP_RX"> + samplingRates="8000 16000 32000 48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK"/> + + + + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK"/> + samplingRates="8000 16000 32000 48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 88200 96000 176400 192000" + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK AUDIO_CHANNEL_INDEX_MASK_3 AUDIO_CHANNEL_INDEX_MASK_4 AUDIO_CHANNEL_IN_5POINT1 AUDIO_CHANNEL_INDEX_MASK_6 AUDIO_CHANNEL_INDEX_MASK_8"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 88200 96000 176400 192000" + channelMasks="AUDIO_CHANNEL_IN_5POINT1 AUDIO_CHANNEL_INDEX_MASK_6 AUDIO_CHANNEL_INDEX_MASK_8"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 88200 96000 176400 192000" + channelMasks="AUDIO_CHANNEL_IN_5POINT1 AUDIO_CHANNEL_INDEX_MASK_6 AUDIO_CHANNEL_INDEX_MASK_8"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 96000 192000" + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK AUDIO_CHANNEL_INDEX_MASK_3 AUDIO_CHANNEL_INDEX_MASK_4"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 96000 192000" + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK AUDIO_CHANNEL_INDEX_MASK_3 AUDIO_CHANNEL_INDEX_MASK_4"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 96000 192000" + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK AUDIO_CHANNEL_INDEX_MASK_3 AUDIO_CHANNEL_INDEX_MASK_4"/> + samplingRates="8000 16000 48000" channelMasks="AUDIO_CHANNEL_IN_MONO 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 AUDIO_CHANNEL_INDEX_MASK_3"/> + + + @@ -282,90 +306,122 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + samplingRates="8000 16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000" channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO"/> + samplingRates="8000 11025 16000 22050 32000 44100 48000 64000 88200 96000 128000 176400 192000"/> + samplingRates="8000 11025 16000 22050 32000 44100 48000 64000 88200 96000 128000 176400 192000"/> + samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO"/> + encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP AUDIO_FORMAT_LC3"> + encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP AUDIO_FORMAT_LC3"> + encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP AUDIO_FORMAT_LC3"> + + + + + + + + + + samplingRates="44100 48000 64000 88200 96000 128000 176400 192000"/> + samplingRates="44100 48000 64000 88200 96000 128000 176400 192000"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK"/> + + + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK"/> + channelMasks="AUDIO_CHANNEL_IN_MONO 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"/> + samplingRates="8000 16000" channelMasks="AUDIO_CHANNEL_IN_MONO"/> + samplingRates="8000 16000 48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/> - + + + + + + + + + @@ -374,23 +430,25 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,haptics output"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,haptics output"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output"/> + sources="primary output,deep_buffer,direct_pcm,compressed_offload,haptics output"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output,spatial output"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output,spatial output"/> + + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output,spatial output"/> + sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx,A2DP In,Echo Reference,BLE In"/> + - - + + + sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,A2DP In,BLE In"/> + sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,haptics output,spatial output"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,haptics output,spatial output"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,haptics output"/> + + @@ -447,9 +511,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - diff --git a/audio/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/audio_policy_configuration_a2dp_offload_disabled.xml deleted file mode 100644 index 79336f2..0000000 --- a/audio/audio_policy_configuration_a2dp_offload_disabled.xml +++ /dev/null @@ -1,442 +0,0 @@ - - - - - - - - - - - - - - - - - - - Earpiece - Speaker - Telephony Tx - Built-In Mic - Built-In Back Mic - FM Tuner - Telephony Rx - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/audio_policy_volumes.xml b/audio/audio_policy_volumes.xml new file mode 100644 index 0000000..03686ea --- /dev/null +++ b/audio/audio_policy_volumes.xml @@ -0,0 +1,415 @@ + + + + + + + + 0,-3900 + 33,-2400 + 66,-1100 + 100,0 + + + 0,-4800 + 33,-3200 + 66,-1600 + 100,0 + + + + 0,-3900 + 33,-2400 + 66,-1100 + 100,0 + + + + 0,-3300 + 33,-2200 + 66,-1100 + 100,0 + + + + 0,-3700 + 33,-1800 + 66,-900 + 100,0 + + + + + + 1,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + + 1,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + + 1,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + + + + + + + + + 1,-4000 + 33,-2910 + 66,-1620 + 100,-300 + + + + + + + + + + + + + + + + + + + + + + 1,-4000 + 33,-2910 + 66,-1620 + 100,-300 + + + + + + + + + + + + 1,-4300 + 33,-3210 + 66,-1920 + 100,-600 + + + + + + + + + + + + + + + 0,-2400 + 33,-1600 + 66,-800 + 100,0 + + + + + + + + 1,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + + 1,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + + 1,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + + + 1,-3500 + 33,-3100 + 66,-2700 + 100,-2400 + + + + + + + + 1,-5100 + 33,-4500 + 66,-4100 + 100,-3700 + + + 1,-3600 + 33,-3200 + 66,-2800 + 100,-2400 + + + + 1,-5100 + 33,-4500 + 66,-4100 + 100,-3700 + + + + + 1,-3300 + 33,-3000 + 66,-2700 + 100,-2400 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/bluetooth_hearing_aid_audio_policy_configuration.xml b/audio/bluetooth_hearing_aid_audio_policy_configuration.xml deleted file mode 100644 index eddd371..0000000 --- a/audio/bluetooth_hearing_aid_audio_policy_configuration.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/audio/default_volume_tables.xml b/audio/default_volume_tables.xml new file mode 100644 index 0000000..3d77377 --- /dev/null +++ b/audio/default_volume_tables.xml @@ -0,0 +1,235 @@ + + + + + + + + 0,0 + 100,0 + + + 0,-9600 + 100,-9600 + + + + + 0,-4200 + 33,-2800 + 66,-1400 + 100,0 + + + + + 1,-2400 + 33,-1800 + 66,-1200 + 100,-600 + + + + + 1,-7000 + 10,-6100 + 20,-5600 + 30,-5100 + 40,-4600 + 50,-4000 + 60,-3400 + 70,-3060 + 80,-2760 + 90,-2460 + 100,-2160 + 110,-1850 + 120,-1550 + 130,-1200 + 140,-900 + 150,-550 + 160,-220 + + + + + + 1,-7000 + 10,-6250 + 20,-5750 + 30,-5250 + 40,-4750 + 50,-4200 + 60,-3600 + 70,-3250 + 80,-2950 + 90,-2650 + 100,-2350 + 110,-2050 + 120,-1750 + 130,-1400 + 140,-1050 + 150,-700 + 160,-350 + + + + + + 1,-7000 + 10,-5200 + 20,-4800 + 30,-4500 + 40,-4200 + 50,-3900 + 60,-3600 + 70,-3300 + 80,-3000 + 90,-2700 + 100,-2300 + 110,-2000 + 120,-1600 + 130,-1200 + 140,-900 + 150,-600 + 160,-380 + + + + + 1,-4950 + 33,-3350 + 66,-1700 + 100,0 + + + + + 1,-6000 + 10,-5500 + 20,-4500 + 30,-3950 + 40,-3400 + 50,-3000 + 60,-2600 + 70,-2300 + 80,-2050 + 90,-1880 + 100,-1680 + 110,-1290 + 120,-970 + 130,-750 + 140,-540 + 150,-150 + 160,0 + + + + + 1,-4950 + 33,-3350 + 66,-1700 + 100,0 + + + + 1,-5800 + 20,-4000 + 60,-2100 + 100,-1000 + + + + 1,-12700 + 20,-8000 + 60,-4000 + 100,0 + + + + + + + + + 0,-5800 + 20,-4000 + 60,-1700 + 100,0 + + + + + 0,-4950 + 33,-3350 + 66,-1700 + 100,0 + + + + + 0,-5800 + 20,-4000 + 60,-1700 + 100,0 + + + + + 0,-4950 + 33,-3350 + 66,-1700 + 100,0 + + + + + 0,-5800 + 20,-4000 + 60,-2100 + 100,-1000 + + + + + 0,-12700 + 20,-8000 + 60,-4000 + 100,0 + + diff --git a/common.mk b/common.mk index 6dfa11d..b47da8e 100644 --- a/common.mk +++ b/common.mk @@ -42,49 +42,38 @@ PRODUCT_PACKAGES += \ # Audio PRODUCT_PACKAGES += \ - android.hardware.audio@6.0-impl \ - android.hardware.audio.effect@6.0-impl \ - android.hardware.audio.service \ - android.hardware.bluetooth.audio@2.1-impl \ + android.hardware.audio@7.1-impl \ + android.hardware.audio.effect@7.0-impl \ + android.hardware.audio.service_64 \ + android.hardware.bluetooth.audio-impl \ android.hardware.soundtrigger@2.3-impl \ audio.bluetooth.default \ audio.primary.kalama \ audio.r_submix.default \ audio.usb.default \ audioadsprpcd \ - liba2dpoffload \ libbatterylistener \ - libcomprcapture \ - libexthwplugin \ - libhdmiedid \ - libhfp \ libqcompostprocbundle \ libqcomvisualizer \ libqcomvoiceprocessing \ - libsndmonitor \ - libspkrprot \ - libssrec \ - libstdc++.vendor \ + libsndcardparser \ + libtinycompress \ libvolumelistener \ - sound_trigger.primary.kalama:32 + sound_trigger.primary.kalama AUDIO_HAL_DIR := hardware/qcom-caf/sm8550/audio PRODUCT_COPY_FILES += \ $(AUDIO_HAL_DIR)/configs/common/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - $(AUDIO_HAL_DIR)/configs/kalama/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ - $(AUDIO_HAL_DIR)/configs/kalama/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_kalama/audio_platform_info.xml \ - $(AUDIO_HAL_DIR)/configs/kalama/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \ - $(LOCAL_PATH)/audio/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_kalama/audio_io_policy.conf \ + $(AUDIO_HAL_DIR)/configs/kalama/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_kalama/audio_effects.conf \ + $(AUDIO_HAL_DIR)/configs/kalama/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_kalama/audio_effects.xml \ $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml \ - $(LOCAL_PATH)/audio/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ - $(LOCAL_PATH)/audio/bluetooth_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_hearing_aid_audio_policy_configuration.xml + $(LOCAL_PATH)/audio/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ + $(LOCAL_PATH)/audio/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml PRODUCT_COPY_FILES += \ - 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/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/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml \ frameworks/native/data/etc/android.hardware.audio.pro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.pro.xml \ frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml