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

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

Merge "config: add pcm and backend id for voice spkr hfp"

parents 704a9484 b3d758b4

configs/msmnile_au/audio_platform_info.xml

+8 −2
Original line number Diff line number Diff line
@@ -39,12 +39,15 @@ 
        <device name="SND_DEVICE_OUT_BT_A2DP" acdb_id="60"/>

        <device name="SND_DEVICE_OUT_VOICE_HANDSET" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_HFP" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO" acdb_id="94"/>

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

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

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

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

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" acdb_id="95"/>

        <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" acdb_id="95"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" acdb_id="95"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP" acdb_id="95"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" acdb_id="95"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" acdb_id="95"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC" acdb_id="80"/>
@@ -141,11 +144,14 @@ 
        <device name="SND_DEVICE_OUT_BT_A2DP" interface="TERT_TDM_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_HANDSET" interface="TERT_TDM_RX_2"/>

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

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_HFP" interface="TERT_TDM_RX_2"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO" interface="TERT_TDM_RX_2"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC" interface="TERT_TDM_TX_0"/>

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

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

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

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

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP" interface="TERT_TDM_TX_0"/>

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

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC" interface="TERT_TDM_TX_0"/>

configs/msmnile_au/audio_policy_configuration.xml

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ 
                <route type="mix" sink="voice_rx"

                       sources="Telephony Rx"/>

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

                       sources="Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx"/>

                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx"/>

                <route type="mix" sink="surround_sound"

                       sources="Built-In Mic,Built-In Back Mic"/>

                <route type="mix" sink="record_24"

configs/msmsteppe_au/audio_platform_info.xml

+8 −2
Original line number Diff line number Diff line
@@ -39,12 +39,15 @@ 
        <device name="SND_DEVICE_OUT_BT_A2DP" acdb_id="60"/>

        <device name="SND_DEVICE_OUT_VOICE_HANDSET" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_HFP" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO" acdb_id="94"/>

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

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

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

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

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" acdb_id="95"/>

        <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" acdb_id="95"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" acdb_id="95"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP" acdb_id="95"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" acdb_id="95"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" acdb_id="95"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC" acdb_id="80"/>
@@ -141,11 +144,14 @@ 
        <device name="SND_DEVICE_OUT_BT_A2DP" interface="TERT_TDM_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_HANDSET" interface="TERT_TDM_RX_2"/>

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

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_HFP" interface="TERT_TDM_RX_2"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO" interface="TERT_TDM_RX_2"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC" interface="TERT_TDM_TX_0"/>

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

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

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

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

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP" interface="TERT_TDM_TX_0"/>

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

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC" interface="TERT_TDM_TX_0"/>

configs/msmsteppe_au/audio_policy_configuration.xml

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ 
                <route type="mix" sink="voice_rx"

                       sources="Telephony Rx"/>

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

                       sources="Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx"/>

                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx"/>

                <route type="mix" sink="surround_sound"

                       sources="Built-In Mic,Built-In Back Mic"/>

                <route type="mix" sink="record_24"