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

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

Merge "configs: msmsteppe_au: add routing for car streams"

parents 467f0898 23eb954b

configs/msmsteppe_au/audio_platform_info.xml

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ 
        <device name="SND_DEVICE_OUT_HANDSET" acdb_id="78"/>

        <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="78"/>

        <device name="SND_DEVICE_OUT_HEADPHONES" acdb_id="78"/>

        <device name="SND_DEVICE_OUT_BUS_MEDIA" acdb_id="78"/>

        <device name="SND_DEVICE_OUT_BUS_SYS" acdb_id="78"/>

        <device name="SND_DEVICE_OUT_BUS_NAV" acdb_id="14"/>

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

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

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

        <device name="SND_DEVICE_OUT_BT_A2DP" acdb_id="78"/>
@@ -37,6 +41,7 @@ 
        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" 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"/>

configs/msmsteppe_au/audio_policy_configuration.xml

+72 −4
Original line number Diff line number Diff line
@@ -33,6 +33,11 @@ 
        “devicePorts”: a list of device descriptors for all input and output devices accessible via this

        module.

        This contains both permanently attached devices and removable devices.

            "gain": constraints applied to the millibel values:

                - maxValueMB >= minValueMB

                - defaultValueMB >= minValueMB && defaultValueMB <= maxValueMB

                - (maxValueMB - minValueMB) % stepValueMB == 0

                - (defaultValueMB - minValueMB) % stepValueMB == 0

        “mixPorts”: listing all output and input streams exposed by the audio HAL

        “routes”: list of possible connections between input and output devices or between stream and

        devices.
@@ -47,18 +52,37 @@ 
    -->

    <modules>

        <!-- Primary Audio HAL -->

        <module name="primary" halVersion="2.0">

        <module name="primary" halVersion="3.0">

            <attachedDevices>

                <item>Earpiece</item>

                <item>Speaker</item>

                <item>Media Bus</item>

                <item>Sys Notification Bus</item>

                <item>Nav Guidance Bus</item>

                <item>Phone Bus</item>

                <item>Telephony Tx</item>

                <item>Built-In Mic</item>

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

                <item>FM Tuner</item>

                <item>Telephony Rx</item>

            </attachedDevices>

            <defaultOutputDevice>Speaker</defaultOutputDevice>

            <defaultOutputDevice>Media Bus</defaultOutputDevice>

            <mixPorts>

                <mixPort name="media" role="source"

                         flags="AUDIO_OUTPUT_FLAG_PRIMARY">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                </mixPort>

                <mixPort name="sys_notification" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                </mixPort>

                <mixPort name="nav_guidance" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                </mixPort>

                <mixPort name="phone" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                </mixPort>

                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_PRIMARY">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -203,6 +227,42 @@ 


            <devicePorts>

                <!-- Output devices declaration, i.e. Sink DEVICE PORT -->

                <devicePort tagName="Media Bus" role="sink" type="AUDIO_DEVICE_OUT_BUS"

                        address="BUS00_MEDIA">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                    <gains>

                        <gain name="" mode="AUDIO_GAIN_MODE_JOINT"

                                minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>

                    </gains>

                </devicePort>

                <devicePort tagName="Sys Notification Bus" role="sink" type="AUDIO_DEVICE_OUT_BUS"

                        address="BUS01_SYS_NOTIFICATION">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                    <gains>

                        <gain name="" mode="AUDIO_GAIN_MODE_JOINT"

                                minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>

                    </gains>

                </devicePort>

                <devicePort tagName="Nav Guidance Bus" role="sink" type="AUDIO_DEVICE_OUT_BUS"

                        address="BUS02_NAV_GUIDANCE">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                    <gains>

                        <gain name="" mode="AUDIO_GAIN_MODE_JOINT"

                                minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>

                    </gains>

                </devicePort>

                <devicePort tagName="Phone Bus" role="sink" type="AUDIO_DEVICE_OUT_BUS"

                        address="BUS03_PHONE">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                    <gains>

                        <gain name="" mode="AUDIO_GAIN_MODE_JOINT"

                                minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>

                    </gains>

                </devicePort>

                <devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">

                   <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                            samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
@@ -301,6 +361,14 @@ 
            </devicePorts>

            <!-- route declaration, i.e. list all available sources for a given sink -->

            <routes>

                <route type="mix" sink="Media Bus"

                       sources="media,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>

                <route type="mix" sink="Sys Notification Bus"

                       sources="sys_notification"/>

                <route type="mix" sink="Nav Guidance Bus"

                       sources="nav_guidance"/>

                <route type="mix" sink="Phone Bus"

                       sources="phone"/>

                <route type="mix" sink="Earpiece"

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

                <route type="mix" sink="Speaker"

configs/msmsteppe_au/mixer_paths_adp.xml

+27 −0
Original line number Diff line number Diff line
@@ -1140,6 +1140,27 @@ 
        <path name="compress-offload-playback9" />

    </path>



    <!-- The following use cases are used for car streams  -->

    <path name="media-playback">

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia1" value="1" />

    </path>



    <path name="sys-notification-playback">

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia5" value="1" />

    </path>



    <path name="nav-guidance-playback">

        <ctl name="TERT_TDM_RX_1 Channels" value="One" />

        <ctl name="TERT_TDM_RX_1 Audio Mixer MultiMedia2" value="1" />

    </path>



    <path name="phone-playback">

        <ctl name="TERT_TDM_RX_2 Channels" value="One" />

        <ctl name="TERT_TDM_RX_2 Audio Mixer MultiMedia10" value="1" />

    </path>



    <path name="audio-record">

        <ctl name="TERT_TDM_TX_0 Channels" value="One" />

        <ctl name="MultiMedia1 Mixer TERT_TDM_TX_0" value="1" />
@@ -1627,9 +1648,15 @@ 
    </path>



    <path name="speaker-adp">

        <!--ctl name="TERT_TDM_RX_0 Channels" value="Six" /-->

    </path>



    <path name="speaker-custom">

        <!--ctl name="TERT_TDM_RX_0 Channels" value="Six" /-->

    </path>



    <path name="bus-speaker">

        <!--ctl name="TERT_TDM_RX_0 Channels" value="Six" /-->

    </path>



   <path name="sidetone-iir">

configs/msmsteppe_au/mixer_paths_custom.xml

+27 −0
Original line number Diff line number Diff line
@@ -1131,6 +1131,27 @@ 
        <path name="compress-offload-playback9" />

    </path>



    <!-- The following use cases are used for car streams  -->

    <path name="media-playback">

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia1" value="1" />

    </path>



    <path name="sys-notification-playback">

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia5" value="1" />

    </path>



    <path name="nav-guidance-playback">

        <ctl name="TERT_TDM_RX_1 Channels" value="One" />

        <ctl name="TERT_TDM_RX_1 Audio Mixer MultiMedia2" value="1" />

    </path>



    <path name="phone-playback">

        <ctl name="TERT_TDM_RX_2 Channels" value="One" />

        <ctl name="TERT_TDM_RX_2 Audio Mixer MultiMedia10" value="1" />

    </path>



    <path name="audio-record">

        <ctl name="TERT_TDM_TX_0 Channels" value="One" />

        <ctl name="MultiMedia1 Mixer TERT_TDM_TX_0" value="1" />
@@ -1618,9 +1639,15 @@ 
    </path>



    <path name="speaker-adp">

        <!--ctl name="TERT_TDM_RX_0 Channels" value="Six" /-->

    </path>



    <path name="speaker-custom">

        <!--ctl name="TERT_TDM_RX_0 Channels" value="Six" /-->

    </path>



    <path name="bus-speaker">

        <!--ctl name="TERT_TDM_RX_0 Channels" value="Six" /-->

    </path>



   <path name="sidetone-iir">

configs/msmsteppe_au/msmsteppe_au.mk

+26 −10
Original line number Diff line number Diff line
@@ -69,6 +69,11 @@ AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := false 
AUDIO_FEATURE_ENABLED_BATTERY_LISTENER := false

##AUDIO_FEATURE_FLAGS



AUDIO_FEATURE_ENABLED_AUTO_HAL := true

AUDIO_FEATURE_ENABLED_EXT_HW_PLUGIN := true

AUDIO_FEATURE_ENABLED_AUDIO_CONTROL_HAL := true

##AUTOMOTIVE_AUDIO_FEATURE_FLAGS



ifneq ($(strip $(TARGET_USES_RRO)), true)

#Audio Specific device overlays

DEVICE_PACKAGE_OVERLAYS += vendor/qcom/opensource/audio-hal/primary-hal/configs/common/overlay
@@ -109,6 +114,10 @@ PRODUCT_COPY_FILES += \ 
PRODUCT_COPY_FILES += \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/msmsteppe_au/listen_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/listen_platform_info.xml



#Audio HAL version

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.hal.maj.version=3



# Reduce client buffer size for fast audio output tracks

PRODUCT_PROPERTY_OVERRIDES += \

    af.fast_track_multiplier=1
@@ -261,13 +270,20 @@ PRODUCT_PACKAGES += \ 
    android.hardware.audio.effect@4.0 \

    android.hardware.audio.effect@4.0-impl



PRODUCT_PROPERTY_OVERRIDES += \

persist.audio.calfile0=/vendor/etc/acdbdata/adsp_avs_config.acdb\

persist.audio.calfile1=/vendor/etc/acdbdata/ADP/Bluetooth_cal.acdb\

persist.audio.calfile2=/vendor/etc/acdbdata/ADP/Codec_cal.acdb\

persist.audio.calfile3=/vendor/etc/acdbdata/ADP/General_cal.acdb\

persist.audio.calfile4=/vendor/etc/acdbdata/ADP/Global_cal.acdb\

persist.audio.calfile5=/vendor/etc/acdbdata/ADP/Handset_cal.acdb\

persist.audio.calfile6=/vendor/etc/acdbdata/ADP/Hdmi_cal.acdb\

persist.audio.calfile7=/vendor/etc/acdbdata/ADP/Headset_cal.acdb\

persist.audio.calfile8=/vendor/etc/acdbdata/ADP/Speaker_cal.acdb
 
# for HIDL related audiocontrol packages

PRODUCT_PACKAGES += \

    vendor.qti.hardware.automotive.audiocontrol@1.0-service \

    android.hardware.automotive.audiocontrol@1.0



ifeq ($(ENABLE_HYP),true)

PRODUCT_PROPERTY_OVERRIDES += \

persist.vendor.audio.calfile0=/vendor/etc/acdbdata/adsp_avs_config.acdb\

persist.vendor.audio.calfile1=/vendor/etc/acdbdata/ADP/Bluetooth_cal.acdb\

persist.vendor.audio.calfile2=/vendor/etc/acdbdata/ADP/Codec_cal.acdb\

persist.vendor.audio.calfile3=/vendor/etc/acdbdata/ADP/General_cal.acdb\

persist.vendor.audio.calfile4=/vendor/etc/acdbdata/ADP/Global_cal.acdb\

persist.vendor.audio.calfile5=/vendor/etc/acdbdata/ADP/Handset_cal.acdb\

persist.vendor.audio.calfile6=/vendor/etc/acdbdata/ADP/Hdmi_cal.acdb\

persist.vendor.audio.calfile7=/vendor/etc/acdbdata/ADP/Headset_cal.acdb\

persist.vendor.audio.calfile8=/vendor/etc/acdbdata/ADP/Speaker_cal.acdb

endif