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

Commit 89ab27d4 authored by sasevs's avatar sasevs
Browse files

configs: msmnile_au: enable mmap for more bus 

Revert the changes for mmap playback for phone bus.
And add in generic way for more buses.
User needs to specify the BUS id, to get selected.

Change-Id: I38c7565d98e05323e2b64930845e1d7d78c2f5f6
parent cbdd8ccf

configs/common_au/audio_policy_configuration.xml

+7 −7
Original line number Diff line number Diff line
@@ -339,21 +339,21 @@ 
            </devicePorts>

            <routes>

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

                       sources="media"/>

                       sources="media,mmap_no_irq_out"/>

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

                       sources="sys_notification,carplay_8k_sys,carplay_16k_sys,carplay_24k_sys,carplay_32k_sys,carplay_48k_sys"/>

                       sources="sys_notification,carplay_8k_sys,carplay_16k_sys,carplay_24k_sys,carplay_32k_sys,carplay_48k_sys,mmap_no_irq_out"/>

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

                       sources="nav_guidance"/>

                       sources="nav_guidance,mmap_no_irq_out"/>

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

                       sources="phone"/>

                       sources="phone,mmap_no_irq_out"/>

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

                       sources="alerts"/>

                <route type="mix" sink="Front Passenger Bus"

                       sources="front_passenger"/>

                       sources="front_passenger,mmap_no_irq_out"/>

                <route type="mix" sink="Rear Seat Bus"

                       sources="rear_seat"/>

                       sources="rear_seat,mmap_no_irq_out"/>

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

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

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

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

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

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

configs/msmnile_au/audio_policy_mmap_configuration.xml

deleted100644 → 0
+0 −415

File deleted.

Preview size limit exceeded, changes collapsed.

configs/msmnile_au/mixer_paths_mmap_adp.xml

deleted100644 → 0
+0 −1161

File deleted.

Preview size limit exceeded, changes collapsed.

configs/msmnile_au/msmnile_au.mk

+2 −10
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ endif 
DEVICE_PACKAGE_OVERLAYS += vendor/qcom/opensource/audio-hal/primary-hal/configs/common_au/overlay



PRODUCT_COPY_FILES += \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/mixer_paths_adp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_adp.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_io_policy.conf \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
@@ -187,6 +188,7 @@ PRODUCT_COPY_FILES += \ 
    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml

endif

PRODUCT_COPY_FILES += \

    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common_au/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \

    $(TOPDIR)frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \

    $(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \

    $(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
@@ -195,16 +197,6 @@ PRODUCT_COPY_FILES += \ 
    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml \

    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common_au/car_audio_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/car_audio_configuration.xml



ifeq ($(AUDIO_FEATURE_MMAP_AAUDIO), true)

PRODUCT_COPY_FILES += \

    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/audio_policy_mmap_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/mixer_paths_mmap_adp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_adp.xml

else

PRODUCT_COPY_FILES += \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/mixer_paths_adp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_adp.xml \

    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common_au/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml

endif



# Listen configuration file

PRODUCT_COPY_FILES += \

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