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

Commit 8e0b66b6 authored by Rohit Sekhar's avatar Rohit Sekhar
Browse files

Merge branch '1013devices-t-vid_rec_mic' into 'v2.1-t' 

FP4: Force stereo mic in camcorder

See merge request !58
parents 355ded73 0de8bb3b

audio/audio_platform_info_lagoon_fp4.xml

+14 −0
Original line number Diff line number Diff line
@@ -111,6 +111,12 @@ 
        <device name="SND_DEVICE_IN_HANDSET_GENERIC_QMIC" acdb_id="191"/>

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

        <device name="SND_DEVICE_IN_VOICE_DMIC_TMUS" acdb_id="41"/>

        <device name="SND_DEVICE_IN_CAMCORDER_LANDSCAPE" acdb_id="35"/>

        <device name="SND_DEVICE_IN_CAMCORDER_INVERT_LANDSCAPE" acdb_id="34"/>

        <device name="SND_DEVICE_IN_CAMCORDER_PORTRAIT" acdb_id="34"/>

        <device name="SND_DEVICE_IN_CAMCORDER_SELFIE_LANDSCAPE" acdb_id="34"/>

        <device name="SND_DEVICE_IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE" acdb_id="35"/>

        <device name="SND_DEVICE_IN_CAMCORDER_SELFIE_PORTRAIT" acdb_id="34"/>

    </acdb_ids>

    <backend_names>

        <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
@@ -259,6 +265,14 @@ 
        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO" backend="speaker-and-bt-sco" interface="QUIN_MI2S_RX-and-SLIMBUS_7_RX"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="QUIN_MI2S_RX-and-SLIMBUS_7_RX"/>

    </backend_names>

    <device_names>

        <device name="SND_DEVICE_IN_CAMCORDER_LANDSCAPE" alias="speaker-stereo-dmic-ef" />

        <device name="SND_DEVICE_IN_CAMCORDER_INVERT_LANDSCAPE" alias="handset-stereo-dmic-ef" />

        <device name="SND_DEVICE_IN_CAMCORDER_PORTRAIT" alias="handset-stereo-dmic-ef" />

        <device name="SND_DEVICE_IN_CAMCORDER_SELFIE_LANDSCAPE" alias="handset-stereo-dmic-ef" />

        <device name="SND_DEVICE_IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE" alias="speaker-stereo-dmic-ef" />

        <device name="SND_DEVICE_IN_CAMCORDER_SELFIE_PORTRAIT" alias="handset-stereo-dmic-ef" />

    </device_names>

    <!-- below values are for ref purpose to OEM, doesn't contain actual hardware info on MTP -->

    <microphone_characteristics>

        <microphone valid_mask="31" device_id="builtin_mic_1" type="AUDIO_DEVICE_IN_BUILTIN_MIC" address="bottom" location="AUDIO_MICROPHONE_LOCATION_MAINBODY"

audio/mixer_paths_lagoon_fp4.xml

+2 −11
Original line number Diff line number Diff line
@@ -3640,7 +3640,7 @@ 
    </path>



    <path name="camcorder-mic">

        <path name="handset-dmic-endfire" />

        <path name="handset-stereo-dmic-ef" />

    </path>



    <path name="bt-sco-headset">
@@ -3686,16 +3686,7 @@ 
    </path>



    <path name="handset-stereo-dmic-ef">

        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two" />

        <ctl name="TX DEC0 MUX" value="SWR_MIC" />

        <ctl name="TX SMIC MUX1" value="ADC0" />

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="ADC1_MIXER Switch" value="1" />

        <ctl name="TX DEC1 MUX" value="SWR_MIC" />

        <ctl name="TX SMIC MUX0" value="ADC1" />

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

        <ctl name="ADC2_MIXER Switch" value="1" />

        <ctl name="ADC2 MUX" value="INP3" />

        <path name="handset-dmic-endfire" />

    </path>



    <path name="speaker-stereo-dmic-ef">