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

Commit b77ad794 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge ae1f96a9 on remote branch 

Change-Id: I3883411031cf6ddb470ca60f2f751be957fac165
parents f6d26b05 ae1f96a9

configs/atoll/atoll.mk

+0 −4
Original line number Diff line number Diff line
@@ -442,10 +442,6 @@ PRODUCT_PACKAGES += \ 
PRODUCT_PACKAGES += \

    android.hardware.soundtrigger@2.2-impl \



# enable sound trigger hidl hal 2.3

PRODUCT_PACKAGES += \

    android.hardware.soundtrigger@2.3-impl



PRODUCT_PACKAGES_ENG += \

    VoicePrintTest \

    VoicePrintDemo

configs/atoll/sound_trigger_platform_info.xml

+14 −6
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ 
            <param capture_device="HANDSET" />

            <!-- adm_cfg_profile should match with the one defined under adm_config -->

            <!-- Set it to NONE if LSM directly connects to AFE -->

            <param adm_cfg_profile="NONE" />

            <param adm_cfg_profile="DEFAULT" />

            <!-- fluence_type: "FLUENCE_MIC", "FLUENCE_DMIC", "FLUENCE_TMIC"   -->

            <!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->

            <!-- is FFECNS -->
@@ -229,7 +229,7 @@ 
        </lsm_usecase>

        <lsm_usecase>

            <param capture_device="HEADSET" />

            <param adm_cfg_profile="NONE" />

            <param adm_cfg_profile="DEFAULT" />

            <param fluence_type="NONE" />

            <param execution_mode="ADSP" />

            <param app_type="4" /> <!-- app type for MD used in ACDB -->
@@ -263,7 +263,7 @@ 
            <param capture_device="HANDSET" />

            <!-- adm_cfg_profile should match with the one defined under adm_config -->

            <!-- Set it to NONE if LSM directly connects to AFE -->

            <param adm_cfg_profile="NONE" />

            <param adm_cfg_profile="DEFAULT" />

            <!-- fluence_type: "FLUENCE_MIC", "FLUENCE_DMIC", "FLUENCE_TMIC"   -->

            <!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->

            <!-- is FFECNS -->
@@ -280,7 +280,7 @@ 
        </lsm_usecase>

        <lsm_usecase>

            <param capture_device="HEADSET" />

            <param adm_cfg_profile="NONE" />

            <param adm_cfg_profile="DEFAULT" />

            <param fluence_type="NONE" />

            <param execution_mode="ADSP" />

            <param app_type="3" /> <!-- app type used in ACDB -->
@@ -315,7 +315,7 @@ 
            <param capture_device="HANDSET" />

            <!-- adm_cfg_profile should match with the one defined under adm_config -->

            <!-- Set it to NONE if LSM directly connects to AFE -->

            <param adm_cfg_profile="NONE" />

            <param adm_cfg_profile="DEFAULT" />

            <!-- fluence_type: "FLUENCE_MIC", "FLUENCE_DMIC", "FLUENCE_TMIC"   -->

            <!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->

            <!-- is FFECNS -->
@@ -332,7 +332,7 @@ 
        </lsm_usecase>

        <lsm_usecase>

            <param capture_device="HEADSET" />

            <param adm_cfg_profile="NONE" />

            <param adm_cfg_profile="DEFAULT" />

            <param fluence_type="NONE" />

            <param execution_mode="ADSP" />

            <param app_type="3" /> <!-- app type used in ACDB -->
@@ -362,4 +362,12 @@ 
        <param bit_width="16" />

        <param out_channels="3"/>

    </adm_config>



    <adm_config>

        <param adm_cfg_profile="DEFAULT" />

        <param app_type="69938" />

        <param sample_rate="16000" />

        <param bit_width="16" />

        <param out_channels="1"/>

    </adm_config>

</sound_trigger_platform_info>

configs/bengal/audio_platform_info_intcodec.xml

+13 −6
Original line number Diff line number Diff line
@@ -64,6 +64,10 @@ 
        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="in" id="35" />

        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="out" id="35" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="23" />

        <usecase name="USECASE_AUDIO_RECORD_COMPRESS2" type="in" id="36" />

        <usecase name="USECASE_INCALL_REC_UPLINK" type="in" id="23" />

        <usecase name="USECASE_INCALL_REC_DOWNLINK" type="in" id="23" />

        <usecase name="USECASE_INCALL_REC_UPLINK_AND_DOWNLINK" type="in" id="23" />

    </pcm_ids>

    <config_params>

        <!-- In the below value string, the value indicates default mono -->
@@ -129,6 +133,7 @@ 
        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_HANDSET" backend="handset" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_HANDSET_TMUS" backend="handset" interface="RX_CDC_DMA_RX_0"/>

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

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" interface="RX_CDC_DMA_RX_1"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO" interface="RX_CDC_DMA_RX_1"/>
@@ -169,10 +174,12 @@ 
        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC" interface="TX_CDC_DMA_TX_3"/>

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

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

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

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

        <device name="SND_DEVICE_IN_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC_FLUENCE" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

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

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

        <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_VOICE_REC_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC_AEC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_HDMI_MIC" interface="HDMI"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" interface="SLIMBUS_7_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_NREC" interface="SLIMBUS_7_TX"/>
@@ -182,9 +189,9 @@ 
        <device name="SND_DEVICE_IN_VOICE_DMIC" interface="TX_CDC_DMA_TX_3"/>

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

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

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

        <device name="SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

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

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

        <device name="SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

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

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

        <device name="SND_DEVICE_IN_VOICE_REC_DMIC_STEREO" interface="TX_CDC_DMA_TX_3"/>
@@ -217,7 +224,7 @@ 
        <device name="SND_DEVICE_IN_UNPROCESSED_STEREO_MIC" interface="TX_CDC_DMA_TX_3"/>

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

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

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

        <device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES" backend="speaker-and-headphones" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET" backend="speaker-and-headphones" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO" backend="speaker-and-bt-sco" interface="RX_CDC_DMA_RX_1-and-SLIMBUS_7_RX"/>

configs/bengal/bengal.mk

+0 −4
Original line number Diff line number Diff line
@@ -459,10 +459,6 @@ PRODUCT_PACKAGES += \ 
PRODUCT_PACKAGES += \

    android.hardware.soundtrigger@2.2-impl \



# enable sound trigger hidl hal 2.3

PRODUCT_PACKAGES += \

    android.hardware.soundtrigger@2.3-impl



PRODUCT_PACKAGES_ENG += \

    VoicePrintTest \

    VoicePrintDemo

configs/bengal/mixer_paths.xml

+154 −43

File changed.

Preview size limit exceeded, changes collapsed.