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

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

Merge 57f054fa on remote branch 

Change-Id: I484d6ff6f5fbee99048623943613ae4cf6c2d288
parents 17f3190a 57f054fa

configs/atoll/atoll.mk

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ vendor.audio.flac.sw.decoder.24bit=true 


#timeout crash duration set to 20sec before system is ready.

#timeout duration updates to default timeout of 5sec once the system is ready.

PRODUCT_PRODUCT_PROPERTIES += \

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.hal.boot.timeout.ms=20000



#split a2dp DSP supported encoder list

configs/atoll/audio_platform_info_qrd.xml

+8 −3
Original line number Diff line number Diff line
@@ -178,10 +178,15 @@ 
        <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_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <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_HCO_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_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_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_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"/>

configs/atoll/mixer_paths_qrd.xml

+8 −6
Original line number Diff line number Diff line
@@ -193,6 +193,8 @@ 
    <ctl name="WSA_CDC_DMA_RX_0_Voice Mixer VoiceMMode1" value="0" />

    <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode1" value="0" />

    <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="0" />

    <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_4_MMode1" value="0" />



    <!-- Multimode Voice1 BTSCO -->

    <ctl name="SLIM_7_RX_Voice Mixer VoiceMMode1" value="0" />

    <ctl name="VoiceMMode1_Tx Mixer SLIM_7_TX_MMode1" value="0" />
@@ -1997,7 +1999,7 @@ 
    </path>



    <path name="audio-record headset-mic">

        <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_3" value="1" />

        <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_4" value="1" />

    </path>



    <path name="audio-record usb-headset-mic">
@@ -2337,7 +2339,7 @@ 


    <path name="compress-voip-call headset">

        <ctl name="RX_CDC_DMA_RX_0_Voice Mixer Voip" value="1" />

        <ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_3_Voip" value="1" />

        <ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_4_Voip" value="1" />

    </path>



    <path name="compress-voip-call bt-sco">
@@ -2386,7 +2388,7 @@ 


    <path name="voicemmode1-call headset">

        <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode1" value="1" />

        <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />

        <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_4_MMode1" value="1" />

    </path>



    <path name="voicemmode1-call bt-sco">
@@ -2460,7 +2462,7 @@ 


    <path name="voicemmode2-call headset">

        <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_4_MMode2" value="1" />

    </path>



    <path name="voicemmode2-call bt-sco">
@@ -2592,7 +2594,7 @@ 
    </path>



    <path name="audio-record-voip headset-mic">

        <ctl name="MultiMedia10 Mixer TX_CDC_DMA_TX_3" value="1" />

        <ctl name="MultiMedia10 Mixer TX_CDC_DMA_TX_4" value="1" />

    </path>



    <path name="audio-record-voip usb-headset-mic">
@@ -2897,7 +2899,7 @@ 
    </path>



    <path name="mmap-record headset-mic">

      <ctl name="MultiMedia16 Mixer TX_CDC_DMA_TX_3" value="1" />

      <ctl name="MultiMedia16 Mixer TX_CDC_DMA_TX_4" value="1" />

    </path>



    <path name="mmap-record bt-sco">

configs/bengal/audio_policy_configuration.xml

100644 → 100755
+9 −1
Original line number Diff line number Diff line
@@ -209,6 +209,12 @@ 
                        channelMasks="AUDIO_CHANNEL_INDEX_MASK_4"/>

                </mixPort>

                <mixPort name="hifi_input" role="sink" />

                <mixPort name="fast input" role="sink"

                         flags="AUDIO_INPUT_FLAG_FAST">

                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                              samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                              channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>

                </mixPort>

            </mixPorts>



            <devicePorts>
@@ -371,6 +377,8 @@ 
                <route type="mix" sink="BT A2DP Speaker"

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>

                <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />

                <route type="mix" sink="fast input"

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>

            </routes>



        </module>

configs/bengal/bengal.mk

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ ro.vendor.audio.sdk.ssr=false 


#timeout crash duration set to 20sec before system is ready.

#timeout duration updates to default timeout of 5sec once the system is ready.

PRODUCT_PRODUCT_PROPERTIES += \

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.hal.boot.timeout.ms=20000



#enable dsp gapless mode by default