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

Commit 41625a61 authored by Manu Suresh's avatar Manu Suresh
Browse files

Merge branch '9227-a15-FP6' into 'a15' 

FP6: audio: fix video and audio recording only in one channel

See merge request e/devices/android_device_fairphone_FP6!40
parents cc5a4f9f b1f9015b

configs/audio/sku_volcano/mixer_paths_volcano_mtp_fps.xml

+2 −2
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ 
        <ctl name="TX0 MODE" value="ADC_LP" />

        <ctl name="ADC1 MUX" value="CH1_AMIC1" />

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

        <ctl name="TX_DEC1 Volume" value="102" />

        <ctl name="TX_DEC1 Volume" value="84" />

    </path>



    <path name="amic3">
@@ -304,7 +304,7 @@ 
        <ctl name="ADC2_BCS Disable" value="1" />

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

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

        <ctl name="TX_DEC2 Volume" value="102" />

        <ctl name="TX_DEC2 Volume" value="84" />

    </path>



    <path name="amic2">

configs/audio/sku_volcano/resourcemanager_volcano_mtp_fps.xml

+3 −0
Original line number Diff line number Diff line
@@ -175,6 +175,9 @@ 
            <usecase>

                <name>PAL_STREAM_DEEP_BUFFER</name>

                <ec_enable>1</ec_enable>

                <bit_width>24</bit_width>

                <channels>2</channels>

                <snd_device_name>handset-dual-mic-stereo</snd_device_name>

                <custom-config key="unprocessed-hdr-mic-landscape">

                    <channels>4</channels>

                    <snd_device_name>unprocessed-hdr-mic-landscape</snd_device_name>

configs/audio/sku_volcano_qssi/audio_policy_configuration_fps.xml

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ SPDX-License-Identifier: BSD-3-Clause-Clear 
                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </devicePort>

                <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"

                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT">

                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </devicePort>

configs/audio/usecaseKvManager_fps.xml

+3 −3
Original line number Diff line number Diff line
@@ -1363,7 +1363,7 @@ 
                <!-- DEVICEPP_TX - DEVICEPP_TX_VOIP_FLUENCE_NN -->

                <graph_kv key="0xAD000000" value="0xAD000010"/>

            </keys_and_values>

            <keys_and_values StreamType="PAL_STREAM_VOIP_TX" CustomConfig="dual-mic">>

            <keys_and_values StreamType="PAL_STREAM_VOIP_TX" CustomConfig="dual-mic">

                <!-- DEVICETX - SPEAKER_MIC -->

                <graph_kv key="0xA3000000" value="0xA3000001"/>

                <!-- DEVICEPP_TX - DEVICEPP_TX_VOIP_FLUENCE_ENDFIRE -->
@@ -1441,13 +1441,13 @@ 
                <!-- DEVICEPP_TX - DEVICEPP_TX_VOIP_FLUENCE_NN -->

                <graph_kv key="0xAD000000" value="0xAD000010"/>

            </keys_and_values>

            <keys_and_values StreamType="PAL_STREAM_VOIP_TX" CustomConfig="quad-mic">>

            <keys_and_values StreamType="PAL_STREAM_VOIP_TX" CustomConfig="quad-mic">

                <!-- DEVICETX - SPEAKER_MIC -->

                <graph_kv key="0xA3000000" value="0xA3000001"/>

                <!-- DEVICEPP_TX - DEVICEPP_TX_VOIP_FLUENCE_PRO -->

                <graph_kv key="0xAD000000" value="0xAD000005"/>

            </keys_and_values>

            <keys_and_values StreamType="PAL_STREAM_VOIP_TX" CustomConfig="nn-sm">>

            <keys_and_values StreamType="PAL_STREAM_VOIP_TX" CustomConfig="nn-sm">

                <!-- DEVICETX - SPEAKER_MIC -->

                <graph_kv key="0xA3000000" value="0xA3000001"/>

                <!-- DEVICEPP_TX - DEVICEPP_TX_VOIP_FLUENCE_NN_SM -->