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

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

Merge d4f92d0d on remote branch 

Change-Id: I42bb8a29d99c2dc3e03c5cd1cfe5e60a57cf236f
parents 8084d79f d4f92d0d

configs/common_au/audio_policy_configuration.xml

+7 −1
Original line number Diff line number Diff line
@@ -165,6 +165,10 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>

                </mixPort>

                <mixPort name="echo_ref" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="16000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>

                </mixPort>

            </mixPorts>

            <devicePorts>

                <devicePort tagName="Media Bus" role="sink" type="AUDIO_DEVICE_OUT_BUS"
@@ -316,7 +320,9 @@ 
                <route type="mix" sink="Telephony Tx"

                       sources="voice_tx,incall_music_uplink"/>

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

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,Primary In Bus,Front Passenger In Bus,Rear Seat In Bus,Echo Reference"/>

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,Primary In Bus,Front Passenger In Bus,Rear Seat In Bus"/>

                <route type="mix" sink="echo_ref"

                       sources="Echo Reference"/>

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

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

                <route type="mix" sink="voice_rx"

configs/lahaina/audio_platform_info_hdk.xml

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ 
        <device name="SND_DEVICE_IN_HANDSET_GENERIC_QMIC" acdb_id="191"/>

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

        <device name="SND_DEVICE_OUT_VOICE_HANDSET_TMUS" acdb_id="7"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_USB_HEADSET_MIC" acdb_id="133"/>

    </acdb_ids>

    <backend_names>

        <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

configs/lahaina/audio_platform_info_intcodec.xml

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ 
        <device name="SND_DEVICE_IN_HANDSET_GENERIC_QMIC" acdb_id="191"/>

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

        <device name="SND_DEVICE_OUT_VOICE_HANDSET_TMUS" acdb_id="7"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_USB_HEADSET_MIC" acdb_id="133"/>

    </acdb_ids>

    <backend_names>

        <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

configs/lahaina/audio_platform_info_qrd.xml

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ 
        <device name="SND_DEVICE_IN_HANDSET_GENERIC_QMIC" acdb_id="191"/>

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

        <device name="SND_DEVICE_OUT_VOICE_HANDSET_TMUS" acdb_id="7"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_USB_HEADSET_MIC" acdb_id="133"/>

    </acdb_ids>

    <backend_names>

        <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

configs/msmnile_au/audio_policy_configuration.xml

+7 −1
Original line number Diff line number Diff line
@@ -239,6 +239,10 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>

                </mixPort>

                <mixPort name="echo_ref" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="16000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>

                </mixPort>

            </mixPorts>



            <devicePorts>
@@ -469,7 +473,9 @@ 
                <route type="mix" sink="voice_rx"

                       sources="Telephony Rx"/>

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

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

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

                <route type="mix" sink="echo_ref"

                       sources="Echo Reference"/>

                <route type="mix" sink="voip_tx"

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

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