Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40f2b321 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "configs:lahaina: Add dedicated hearing aid proxy configs"

parents 4cdb6a4e f80dbcc5

configs/lahaina/audio_platform_info.xml

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
        <device name="SND_DEVICE_IN_USB_HEADSET_HEX_MIC_AEC" acdb_id="162"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_USB_HEADSET_HEX_MIC" acdb_id="162"/>

        <device name="SND_DEVICE_IN_VOCE_RECOG_USB_HEADSET_HEX_MIC" acdb_id="162"/>

        <device name="SND_DEVICE_IN_VOICE_HEARING_AID" acdb_id="11"/>

    </acdb_ids>



    <module_ids>
@@ -100,6 +101,7 @@ 
        <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="33"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_AFE_PROXY" type="out" id="5"/>

        <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY" type="in" id="6"/>

        <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY2" type="in" id="42"/>

        <usecase name="USECASE_AUDIO_RECORD_LOW_LATENCY" type="in" id="13" />

        <usecase name="USECASE_AUDIO_PLAYBACK_ULL" type="out" id="13" />

        <usecase name="USECASE_AUDIO_PLAYBACK_SILENCE" type="out" id="23" />
@@ -246,6 +248,7 @@ 
        <device name="SND_DEVICE_IN_SPEAKER_QMIC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_QMIC_AEC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_THREE_MIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_VOICE_HEARING_AID" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC_AEC" interface="TX_CDC_DMA_TX_3"/>

configs/lahaina/audio_platform_info_intcodec.xml

+3 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ 
        <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="33"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_AFE_PROXY" type="out" id="5"/>

        <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY" type="in" id="6"/>

        <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY2" type="in" id="42"/>

        <usecase name="USECASE_AUDIO_RECORD_LOW_LATENCY" type="in" id="13" />

        <usecase name="USECASE_AUDIO_PLAYBACK_ULL" type="out" id="13" />

        <usecase name="USECASE_AUDIO_PLAYBACK_SILENCE" type="out" id="23" />
@@ -138,6 +139,7 @@ 
        <device name="SND_DEVICE_IN_UNPROCESSED_QUAD_MIC" acdb_id="146"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" acdb_id="147"/>

        <device name="SND_DEVICE_IN_HANDSET_GENERIC_QMIC" acdb_id="191"/>

        <device name="SND_DEVICE_IN_VOICE_HEARING_AID" acdb_id="11"/>

    </acdb_ids>

    <backend_names>

        <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
@@ -268,6 +270,7 @@ 
        <device name="SND_DEVICE_IN_SPEAKER_QMIC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_QMIC_AEC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_THREE_MIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_VOICE_HEARING_AID" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC_AEC" interface="TX_CDC_DMA_TX_3"/>

configs/lahaina/audio_platform_info_qrd.xml

+3 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ 
        <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="33"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_AFE_PROXY" type="out" id="5"/>

        <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY" type="in" id="6"/>

        <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY2" type="in" id="42"/>

        <usecase name="USECASE_AUDIO_RECORD_LOW_LATENCY" type="in" id="13" />

        <usecase name="USECASE_AUDIO_PLAYBACK_ULL" type="out" id="13" />

        <usecase name="USECASE_AUDIO_PLAYBACK_SILENCE" type="out" id="23" />
@@ -138,6 +139,7 @@ 
        <device name="SND_DEVICE_IN_UNPROCESSED_QUAD_MIC" acdb_id="146"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" acdb_id="147"/>

        <device name="SND_DEVICE_IN_HANDSET_GENERIC_QMIC" acdb_id="191"/>

        <device name="SND_DEVICE_IN_VOICE_HEARING_AID" acdb_id="11"/>

    </acdb_ids>

    <backend_names>

        <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
@@ -268,6 +270,7 @@ 
        <device name="SND_DEVICE_IN_SPEAKER_QMIC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_QMIC_AEC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_THREE_MIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_VOICE_HEARING_AID" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC_AEC" interface="TX_CDC_DMA_TX_3"/>

configs/lahaina/audio_policy_configuration.xml

+3 −0
Original line number Diff line number Diff line
@@ -428,6 +428,9 @@ 
        <!-- Remote Submix Audio HAL -->

        <xi:include href="/vendor/etc/r_submix_audio_policy_configuration.xml"/>



        <!-- Bluetooth Audio HAL for hearing aid -->

        <xi:include href="/vendor/etc/bluetooth_qti_hearing_aid_audio_policy_configuration.xml"/>



    </modules>

    <!-- End of Modules section -->

configs/lahaina/lahaina.mk

+6 −1
Original line number Diff line number Diff line
@@ -144,7 +144,8 @@ PRODUCT_COPY_FILES += \ 
    $(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \

    $(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \

    $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \

    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml

    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml \

    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_hearing_aid_audio_policy_configuration.xml



# Reduce client buffer size for fast audio output tracks

PRODUCT_PROPERTY_OVERRIDES += \
@@ -352,6 +353,10 @@ persist.vendor.bt.aac_frm_ctl.enabled=true 
PRODUCT_PROPERTY_OVERRIDES += \

persist.vendor.bt.aac_vbr_frm_ctl.enabled=true



#enable dedicated proxy for hearing aid

PRODUCT_PROPERTY_OVERRIDES += \

persist.vendor.audio.ha_proxy.enabled=true



#add dynamic feature flags here

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.feature.a2dp_offload.enable=true \