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

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

Merge "hal: Add HDMI-in mixer_paths for RB3gen2"

parents eb4a1d82 6f1702f7

configs/lahaina/audio_policy_configuration.xml

+9 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
                <item>Telephony Tx</item>

                <item>Built-In Mic</item>

                <item>Built-In Back Mic</item>

                <item>HDMI-in</item>

                <item>FM Tuner</item>

                <item>Telephony Rx</item>

            </attachedDevices>
@@ -259,6 +260,10 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/>

                </mixPort>

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

                <mixPort name="HDMI input" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="32000,44100,48000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>

                </mixPort>



            </mixPorts>



            <devicePorts>
@@ -373,6 +378,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                </devicePort>

                <devicePort tagName="HDMI-in" type="AUDIO_DEVICE_IN_HDMI" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>

                </devicePort>



            </devicePorts>

            <!-- route declaration, i.e. list all available sources for a given sink -->
@@ -428,6 +436,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
                <route type="mix" sink="BT A2DP Speaker"

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

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

                <route type="mix" sink="HDMI input" sources="HDMI-in"/>

            </routes>



        </module>

configs/lahaina/yupik_overlay/mixer_paths_yupikidp_overlay.xml

+10 −0
Original line number Diff line number Diff line
@@ -44,7 +44,17 @@ 
    <ctl name="MultiMedia16 Mixer SEC_MI2S_TX" value="0"/>

    <ctl name="SEC MI2S LOOPBACK Volume" value="0"/>

    <ctl name="WSA_CDC_DMA_RX_0 Port Mixer SEC_MI2S_TX" value="0"/>

    <ctl name="MultiMedia1 Mixer PRI_MI2S_TX" value="0" />

    <ctl name="MultiMedia17 Mixer PRI_MI2S_TX" value="0" />



    <path name="audio-record hdmi-in">

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

    </path>

    <path name="hdmi-in">

    </path>

    <path name="audio-record-compress2 hdmi-in">

	<ctl name="MultiMedia17 Mixer PRI_MI2S_TX" value="1" />

    </path>

    <path name="speaker-mic">

        <path name="dmic4"/>

    </path>