gts4lv-common: Bring up OSS audio HAL

* Add SEC <-> QCOM audio routes * Enable all features according to {HAL}/configs/sdm710/sdm710.mk * Use compatible deep_buffer format * Switch to CAF USB audio policy Change-Id: I365f6ee319a0c16ed755e7bc728be623a0c4a41a
2020-06-13 17:49:26 +02:00
parent 5f27260ed4
commit 4dce7ed86d
10 changed files with 308 additions and 21 deletions
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -48,9 +48,60 @@ BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"
 DEXPREOPT_GENERATE_APEX_IMAGE := true

 # Audio
+AUDIO_FEATURE_ENABLED_3D_AUDIO := true
+AUDIO_FEATURE_ENABLED_A2DP_OFFLOAD := true
+AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := true
+AUDIO_FEATURE_ENABLED_ACDB_LICENSE := true
+AUDIO_FEATURE_ENABLED_AHAL_EXT := false
+AUDIO_FEATURE_ENABLED_ALAC_OFFLOAD := true
+AUDIO_FEATURE_ENABLED_ANC_HEADSET := true
+AUDIO_FEATURE_ENABLED_APE_OFFLOAD := true
 AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
-AUDIO_FEATURE_ENABLED_INSTANCE_ID := true
+AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE := false
+AUDIO_FEATURE_ENABLED_COMPRESS_INPUT := true
+AUDIO_FEATURE_ENABLED_COMPRESS_VOIP := false
+AUDIO_FEATURE_ENABLED_CUSTOMSTEREO := true
+AUDIO_FEATURE_ENABLED_DEV_ARBI := false
+AUDIO_FEATURE_ENABLED_DISPLAY_PORT := true
+AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := false
+AUDIO_FEATURE_ENABLED_DTS_EAGLE := false
+AUDIO_FEATURE_ENABLED_DYNAMIC_ECNS := false
+AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true
+AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER := true
+AUDIO_FEATURE_ENABLED_EXTN_FORMATS := true
+AUDIO_FEATURE_ENABLED_EXTN_RESAMPLER := true
+AUDIO_FEATURE_ENABLED_FFV := false
+AUDIO_FEATURE_ENABLED_FLAC_OFFLOAD := true
+AUDIO_FEATURE_ENABLED_FLUENCE := true
+AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true
+AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true
+AUDIO_FEATURE_ENABLED_HDMI_EDID := true
+AUDIO_FEATURE_ENABLED_HDMI_PASSTHROUGH := true
+AUDIO_FEATURE_ENABLED_HDMI_SPK := true
+AUDIO_FEATURE_ENABLED_HFP := true
+AUDIO_FEATURE_ENABLED_HIFI_AUDIO := true
+AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false
+AUDIO_FEATURE_ENABLED_INCALL_MUSIC := false
+AUDIO_FEATURE_ENABLED_KEEP_ALIVE_ARM_FFV := false
+AUDIO_FEATURE_ENABLED_KEEP_ALIVE := false
+AUDIO_FEATURE_ENABLED_KPI_OPTIMIZE := true
+AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true
+AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24 := true
+AUDIO_FEATURE_ENABLED_PCM_OFFLOAD := true
 AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true
+AUDIO_FEATURE_ENABLED_RAS := true
+AUDIO_FEATURE_ENABLED_SND_MONITOR := true
+AUDIO_FEATURE_ENABLED_SOURCE_TRACKING := true
+AUDIO_FEATURE_ENABLED_SPKR_PROTECTION := true
+AUDIO_FEATURE_ENABLED_SSR := true
+AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true
+AUDIO_FEATURE_ENABLED_USB_TUNNEL := true
+AUDIO_FEATURE_ENABLED_VBAT_MONITOR := true
+AUDIO_FEATURE_ENABLED_VOICE_PRINT := false
+AUDIO_FEATURE_ENABLED_VORBIS_OFFLOAD := true
+AUDIO_FEATURE_ENABLED_WMA_OFFLOAD := true
+BOARD_SUPPORTS_SOUND_TRIGGER := true
+BOARD_USES_ALSA_AUDIO := true
 USE_XML_AUDIO_POLICY_CONF := 1

 # AVB
@@ -132,6 +183,8 @@ TARGET_COPY_OUT_VENDOR := vendor
 TARGET_USES_MKE2FS := true

 # Properties
+TARGET_ODM_PROP += $(COMMON_PATH)/odm.prop
+TARGET_SYSTEM_PROP += $(COMMON_PATH)/system.prop
 TARGET_VENDOR_PROP += $(COMMON_PATH)/vendor.prop

 # QCOM
--- a/audio/configs/audio_platform_info.xml
+++ b/audio/configs/audio_platform_info.xml
@@ -112,6 +112,8 @@
        <device name="SND_DEVICE_OUT_WIFI_CALL_SPEAKER_EX_EVS" backend="speaker" interface="SEC_MI2S_RX"/>
        <device name="SND_DEVICE_OUT_WIFI_CALL_DEX_SPEAKER" backend="speaker" interface="SEC_MI2S_RX"/>
        <device name="SND_DEVICE_OUT_WIFI_CALL_DEX_SPEAKER_EVS" backend="speaker" interface="SEC_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" backend="voice-speaker" interface="SEC_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2" backend="voice-speaker-2" interface="SEC_MI2S_RX"/>
        <device name="SND_DEVICE_OUT_VOIP_COMM_SPEAKER" backend="speaker" interface="SEC_MI2S_RX"/>
        <device name="SND_DEVICE_OUT_VOIP_COMM_DEX_SPEAKER" backend="speaker" interface="SEC_MI2S_RX"/>
        <device name="SND_DEVICE_OUT_VOIP_SEC_SPEAKER" backend="speaker" interface="SEC_MI2S_RX"/>
@@ -125,6 +127,7 @@
        <device name="SND_DEVICE_OUT_SPEAKER_KARAOKE" backend="speaker" interface="SEC_MI2S_RX"/>

        <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="INT0_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_HEADPHONES_HIFI_FILTER" backend="headphones" interface="INT0_MI2S_RX"/>
        <device name="SND_DEVICE_OUT_CALL_HEADSET" backend="headphones" interface="INT0_MI2S_RX"/>
        <device name="SND_DEVICE_OUT_CALL_HEADSET_EVS" backend="headphones" interface="INT0_MI2S_RX"/>
        <device name="SND_DEVICE_OUT_WIFI_CALL_HEADSET" backend="headphones" interface="INT0_MI2S_RX"/>
@@ -203,6 +206,7 @@
        <device name="SND_DEVICE_OUT_DISPLAY_PORT" backend="display-port" interface=""/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="SEC_MI2S_RX-and-INT0_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER" backend="speaker-and-headphones" interface="SEC_MI2S_RX-and-INT0_MI2S_RX"/>
        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO" backend="speaker-and-bt-sco" interface="SEC_MI2S_RX-and-SLIMBUS_7_RX"/>
        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="SEC_MI2S_RX-and-SLIMBUS_7_RX"/>
        <device name="SND_DEVICE_OUT_SPEAKER_AND_HDMI" backend="speaker" interface="SEC_MI2S_RX"/>
@@ -444,6 +448,7 @@
        <!-- In the below value string, the value indicates sidetone gain in dB -->
        <param key="usb_sidetone_gain" value="35"/>
        <param key="hfp_pcm_dev_id" value="36"/>
+        <param key="hifi_filter" value="false"/>
    </config_params>
    <gain_db_to_level_mapping>
        <gain_level_map db="-59" level="5"/>
--- a/audio/configs/audio_policy_configuration.xml
+++ b/audio/configs/audio_policy_configuration.xml
@@ -67,7 +67,7 @@
                </mixPort>

                <mixPort name="deep_buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
-                    <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                </mixPort>

@@ -163,6 +163,14 @@
                             samplingRates="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"/>
                </devicePort>
+                <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>
+                </devicePort>
+                <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>
+                </devicePort>

                <!-- Input devices declaration, i.e. Source DEVICE PORT -->
                <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
@@ -200,6 +208,10 @@
                             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_IN_VOICE_UPLINK,AUDIO_CHANNEL_IN_VOICE_DNLINK"/>
                </devicePort>
+                <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">
+                </devicePort>
+                <devicePort tagName="USB Headset In" type="AUDIO_DEVICE_IN_USB_HEADSET" role="source">
+                </devicePort>
            </devicePorts>

            <!-- route declaration, i.e. list all available sources for a given sink -->
@@ -218,11 +230,16 @@
                       sources="primary-out,deep_buffer,fast"/>
                <route type="mix" sink="Aux Device Out"
                       sources="primary-out,deep_buffer,fast,compressed_offload,direct_pcm"/>
+                <route type="mix" sink="USB Device Out"
+                       sources="primary-out,deep_buffer,fast,direct_pcm,compressed_offload,mmap_no_irq_out,hifi_playback"/>
+                <route type="mix" sink="USB Headset Out"
+                       sources="primary-out,deep_buffer,fast,direct_pcm,compressed_offload,mmap_no_irq_out,hifi_playback"/>

                <route type="mix" sink="primary-in"
-                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,Bt Sco Headset Mic,Aux Device In,Voice Call Mic,FM Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,Bt Sco Headset Mic,Aux Device In,USB Device In,USB Headset In,Voice Call Mic,FM Mic"/>
                <route type="mix" sink="mmap_no_irq_in"
-                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,USB Device In,USB Headset In"/>
+                <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
            </routes>
        </module>

@@ -230,7 +247,24 @@
        <xi:include href="a2dp_in_audio_policy_configuration.xml"/>

        <!-- Usb Audio HAL -->
-        <xi:include href="usb_audio_policy_configuration.xml"/>
+        <module name="usb" halVersion="2.0">
+            <mixPorts>
+                <mixPort name="usb_accessory output" role="source">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
+            </mixPorts>
+            <devicePorts>
+                <devicePort tagName="USB Host Out" type="AUDIO_DEVICE_OUT_USB_ACCESSORY" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </devicePort>
+            </devicePorts>
+            <routes>
+                <route type="mix" sink="USB Host Out"
+                       sources="usb_accessory output"/>
+            </routes>
+        </module>

        <!-- Remote Submix Audio HAL -->
        <xi:include href="r_submix_audio_policy_configuration.xml"/>
--- a/audio/configs/mixer_paths.xml
+++ b/audio/configs/mixer_paths.xml
@@ -493,6 +493,10 @@
        <ctl name="AUDIO_REF_EC_UL1 MUX" value="INT0_MI2S_RX" />
    </path>

+    <path name="echo-reference handset">
+        <ctl name="AUDIO_REF_EC_UL1 MUX" value="INT0_MI2S_RX" />
+    </path>
+
    <path name="echo-reference speaker">
        <ctl name="AUDIO_REF_EC_UL1 MUX" value="SEC_TDM_RX_0" />
        <ctl name="EC Reference Channels" value="Four"/>
@@ -506,6 +510,10 @@
        <ctl name="AUDIO_REF_EC_UL1 MUX" value="INT0_MI2S_RX" />
    </path>

+    <path name="echo-reference-voip handset">
+        <ctl name="AUDIO_REF_EC_UL1 MUX" value="INT0_MI2S_RX" />
+    </path>
+
    <path name="echo-reference-voip display-port">
        <ctl name="AUDIO_REF_EC_UL1 MUX" value="DISPLAY_PORT" />
    </path>
@@ -527,6 +535,14 @@
        <path name="deep-buffer-playback speaker" />
    </path>

+    <path name="deep-buffer-playback voice-speaker">
+        <path name="deep-buffer-playback speaker" />
+    </path>
+
+    <path name="deep-buffer-playback voice-speaker-2">
+        <path name="deep-buffer-playback speaker" />
+    </path>
+
    <path name="deep-buffer-playback display-port">
        <ctl name="DISPLAY_PORT Mixer MultiMedia1" value="1" />
    </path>
@@ -675,6 +691,14 @@
        <path name="low-latency-playback speaker" />
    </path>

+    <path name="low-latency-playback voice-speaker">
+        <path name="low-latency-playback speaker" />
+    </path>
+
+    <path name="low-latency-playback voice-speaker-2">
+        <path name="low-latency-playback speaker" />
+    </path>
+
    <path name="low-latency-playback display-port">
        <ctl name="DISPLAY_PORT Mixer MultiMedia5" value="1" />
    </path>
@@ -1720,6 +1744,11 @@
        <ctl name="Voip_Tx Mixer SLIM_7_TX_Voip" value="1" />
    </path>

+    <path name="compress-voip-call speaker">
+        <ctl name="SEC_TDM_RX_0_Voice Mixer Voip" value="1" />
+        <ctl name="Voip_Tx Mixer INT3_MI2S_TX_Voip" value="1" />
+    </path>
+
    <path name="compress-voip-call bt-sco-wb">
        <ctl name="BT SampleRate" value="KHZ_16" />
        <path name="compress-voip-call bt-sco" />
@@ -2033,9 +2062,29 @@
        <ctl name="RX2 Digital Volume" value="78" />
    </path>

+    <path name="headphones">
+        <path name="headset" />
+    </path>
+
+    <path name="headphones-hifi-filter">
+        <path name="headphones" />
+    </path>
+
    <path name="asrc-mode">
    </path>

+    <path name="bt-sco-headset">
+    </path>
+
+    <path name="bt-sco-mic">
+    </path>
+
+    <path name="bt-sco-headset-wb">
+    </path>
+
+    <path name="bt-sco-mic-wb">
+    </path>
+
    <path name="headphones-dsd">
        <path name="ear" />
        <ctl name="RX1 Digital Volume" value="84" />
@@ -2071,6 +2120,11 @@
        <ctl name="RX2 Digital Volume" value="52" />
    </path>

+
+    <path name="speaker-and-headphones-hifi-filter">
+        <path name="speaker-and-headphones" />
+    </path>
+
    <path name="dual-speaker-and-headphones">
        <path name="dual-spk-ear" />
        <ctl name="RX1 Digital Volume" value="84" />
@@ -2215,6 +2269,10 @@
        <ctl name="ADC2 Volume" value="4" />
    </path>

+    <path name="headset-mic">
+        <path name="rec-headset-mic" />
+    </path>
+
    <path name="rec-headset-main-mic">
        <path name="ear-main-mic" />
        <ctl name="ADC1 Volume" value="4" />
@@ -2239,6 +2297,10 @@
        <ctl name="ADC3 Volume" value="2" />
    </path>

+    <path name="camcorder-mic">
+        <path name="camcorder-stereo-mic" />
+    </path>
+
    <path name="echo-main-mic">
        <path name="main-mic" />
        <ctl name="ADC1 Volume" value="3" />
@@ -2405,6 +2467,22 @@
        <ctl name="RX2 Digital Volume" value="84" />
    </path>

+    <path name="voice-headset">
+        <path name="call-headset" />
+    </path>
+
+    <path name="voice-headphones">
+        <path name="call-headset" />
+    </path>
+
+    <path name="voice-speaker">
+        <path name="call-speaker" />
+    </path>
+
+    <path name="voice-speaker-2">
+        <path name="call-speaker" />
+    </path>
+
    <!-- TX part -->
    <path name="call-handset-mic">
        <path name="sub-main-mic" />
@@ -2420,6 +2498,18 @@
        <ctl name="DEC2 Volume" value="92" />
    </path>

+    <path name="handset-mic">
+        <path name="call-handset-mic" />
+    </path>
+
+    <path name="voice-speaker-mic">
+        <path name="rec-sub-mic" />
+    </path>
+
+    <path name="speaker-mic">
+        <path name="rec-sub-mic" />
+    </path>
+
    <path name="call-headphone-mic">
        <path name="main-mic" />
        <ctl name="ADC1 Volume" value="2" />
@@ -2431,6 +2521,10 @@
 		<ctl name="DEC1 Volume" value="101" />
    </path>

+    <path name="voice-headset-mic">
+        <path name="call-speaker-mic" />
+    </path>
+
    <path name="call-usb-headphone-mic">
        <path name="main-mic" />
        <ctl name="ADC1 Volume" value="2" />
@@ -2853,6 +2947,53 @@
        <ctl name="RX2 Digital Volume" value="84" />
    </path>

+    <path name="audio-playback-voip">
+        <ctl name="INT4_MI2S_RX Audio Mixer MultiMedia10" value="1" />
+    </path>
+
+    <path name="audio-playback-voip headphones">
+        <ctl name="INT0_MI2S_RX Audio Mixer MultiMedia10" value="1" />
+    </path>
+
+    <path name="audio-playback-voip bt-sco">
+        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="1" />
+    </path>
+
+    <path name="audio-playback-voip bt-a2dp">
+        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="1" />
+    </path>
+
+    <path name="audio-playback-voip bt-sco-wb">
+        <ctl name="BT SampleRate" value="KHZ_16" />
+        <path name="audio-playback-voip bt-sco" />
+    </path>
+
+    <path name="audio-playback-voip afe-proxy">
+        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="1" />
+    </path>
+
+    <path name="audio-playback-voip usb-headphones">
+        <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
+    </path>
+
+    <path name="audio-playback-voip usb-headset">
+        <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
+    </path>
+
+    <path name="audio-playback-voip display-port">
+        <ctl name="DISPLAY_PORT Audio Mixer MultiMedia10" value="1" />
+    </path>
+
+    <path name="audio-playback-voip speaker-and-display-port">
+        <path name="audio-playback-voip display-port" />
+        <path name="audio-playback-voip" />
+    </path>
+
+    <path name="audio-playback-voip speaker-safe-and-display-port">
+        <path name="audio-playback-voip display-port" />
+        <path name="audio-playback-voip" />
+    </path>
+
    <!-- TX part -->
    <path name="voip-comm-handset-mic">
        <path name="sub-main-mic" />
@@ -3004,6 +3145,23 @@
        <path name="main-mic" />
        <ctl name="ADC1 Volume" value="3" />
    </path>
+
+    <path name="audio-record-voip">
+        <ctl name="MultiMedia10 Mixer INT3_MI2S_TX" value="1" />
+    </path>
+
+    <path name="audio-record-voip usb-headset-mic">
+        <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="1" />
+    </path>
+
+    <path name="audio-record-voip bt-sco">
+        <ctl name="MultiMedia10 Mixer SLIM_7_TX" value="1" />
+    </path>
+
+    <path name="audio-record-voip bt-sco-wb">
+        <ctl name="BT SampleRate" value="KHZ_16" />
+        <path name="audio-record-voip bt-sco" />
+    </path>
    <!-- end of VoIP Scenario -->

    <!-- Factory Scenario -->
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -32,9 +32,6 @@ source "${HELPER}"

 function blob_fixup() {
    case "${1}" in
-    vendor/lib/hw/audio.primary.sdm710.so)
-        patchelf --replace-needed "libcutils.so" "libprocessgroup.so" "${2}"
-        ;;
    vendor/lib/hw/vulkan.sdm710.so)
        sed -i "s/vulkan.sdm845.so/vulkan.sdm710.so/g" "${2}"
        ;;
--- a/gts4lv.mk
+++ b/gts4lv.mk
@@ -62,10 +62,16 @@ PRODUCT_PACKAGES += \
    audio.r_submix.default \
    audio.usb.default \
    cplay \
+    liba2dpoffload \
    libaudioroute \
+    libcirrusspkrprot \
+    libhdmiedid \
+    libhfp \
    libqcompostprocbundle \
    libqcomvisualizer \
    libqcomvoiceprocessing \
+    libsndmonitor \
+    libspkrprot \
    libvolumelistener

 PRODUCT_COPY_FILES += \
@@ -82,8 +88,7 @@ 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/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml

 # Camera
 PRODUCT_PACKAGES += \
--- a/odm.prop
+++ b/odm.prop
@@ -0,0 +1,2 @@
+# Audio
+ro.vendor.qti.va_odm.support=1
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -26,15 +26,7 @@ vendor/lib/libadm.so
 vendor/lib/libaudcal.so
 vendor/lib/libaudioalsa.so
 vendor/lib/libqtigef.so
-vendor/lib/librecordalive.so
-vendor/lib/libSamsungPostProcessConvertor.so
-vendor/lib/lib_SamsungRec_07001.so
-vendor/lib/libsamsungVoipResampler.so
-vendor/lib/libsecaudioinfo.so
 vendor/lib/libsurround_3mic_proc.so
-vendor/lib/libtinycompress_vendor.so
-vendor/lib/lib_soundaliveresampler.so
-vendor/lib/lib_SoundAlive_SRC384_ver320.so
 vendor/lib64/libacdb-fts.so
 vendor/lib64/libacdbloader.so
 vendor/lib64/libacdbrtac.so
@@ -81,9 +73,6 @@ vendor/lib64/soundfx/libqcreverb.so
 vendor/lib64/soundfx/libqcvirt.so
 vendor/lib64/soundfx/libshoebox.so

-# Audio - HALs
-vendor/lib/hw/audio.primary.sdm710.so
-
 # Audio - Speaker Firmware
 vendor/firmware/cs35l41-dsp1-spk-prot.bin
 vendor/firmware/cs35l41-dsp1-spk-prot-calib.bin
--- a/system.prop
+++ b/system.prop
@@ -0,0 +1,2 @@
+# Audio
+ro.vendor.qti.va_aosp.support=1
--- a/vendor.prop
+++ b/vendor.prop
@@ -20,6 +20,48 @@ ro.vendor.audio.sdk.ssr=false
 vendor.audio.apptype.multirec.enabled=false
 vendor.audio.dolby.ds2.enabled=false
 vendor.audio.dolby.ds2.hardbypass=false
+vendor.audio.feature.a2dp_offload.enable=true
+vendor.audio.feature.afe_proxy.enable=true
+vendor.audio.feature.anc_headset.enable=true
+vendor.audio.feature.audiozoom.enable=false
+vendor.audio.feature.battery_listener.enable=false
+vendor.audio.feature.compr_cap.enable=false
+vendor.audio.feature.compr_voip.enable=false
+vendor.audio.feature.compress_in.enable=false
+vendor.audio.feature.compress_meta_data.enable=true
+vendor.audio.feature.concurrent_capture.enable=false
+vendor.audio.feature.custom_stereo.enable=true
+vendor.audio.feature.deepbuffer_as_primary.enable=false
+vendor.audio.feature.display_port.enable=true
+vendor.audio.feature.dsm_feedback.enable=false
+vendor.audio.feature.dynamic_ecns.enable=false
+vendor.audio.feature.ext_hw_plugin.enable=false
+vendor.audio.feature.external_dsp.enable=false
+vendor.audio.feature.external_speaker.enable=false
+vendor.audio.feature.external_speaker_tfa.enable=false
+vendor.audio.feature.fluence.enable=true
+vendor.audio.feature.fm.enable=true
+vendor.audio.feature.hdmi_edid.enable=true
+vendor.audio.feature.hdmi_passthrough.enable=true
+vendor.audio.feature.hfp.enable=true
+vendor.audio.feature.hifi_audio.enable=true
+vendor.audio.feature.hwdep_cal.enable=false
+vendor.audio.feature.incall_music.enable=false
+vendor.audio.feature.keep_alive.enable=false
+vendor.audio.feature.kpi_optimize.enable=true
+vendor.audio.feature.maxx_audio.enable=false
+vendor.audio.feature.multi_voice_session.enable=true
+vendor.audio.feature.ras.enable=true
+vendor.audio.feature.record_play_concurency.enable=false
+vendor.audio.feature.snd_mon.enable=true
+vendor.audio.feature.spkr_prot.enable=true
+vendor.audio.feature.src_trkn.enable=true
+vendor.audio.feature.ssrec.enable=true
+vendor.audio.feature.usb_offload.enable=true
+vendor.audio.feature.usb_offload_burst_mode.enable=false
+vendor.audio.feature.usb_offload_sidetone_volume.enable=false
+vendor.audio.feature.vbat.enable=true
+vendor.audio.feature.wsa.enable=false
 vendor.audio.flac.sw.decoder.24bit=true
 vendor.audio.hw.aac.encoder=true
 vendor.audio.noisy.broadcast.delay=600