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

Commit b4c92fb6 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of audio-userspace.lnx.3.0-00005. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1117352   I8197378c0b8092b6a7724bd2920369e5f8b2f189   qahw: test: Enable USB funtionality
2005890   If21a7b892abef3c4945e67ec05f1e8834c4bcb5a   hal: Add audio platform info support for sdm630 qrd skus
2019181   I8b5ba0b16cf05048418f43cf7995c7a96d9f0f16   hal: Update check to include DISPLAY Port RX backend
2020173   Ib55d1842ffdfee704bfbb4d718978c4a085eaf0e   configs: sdm660: Fix sidetone mute during voice call
2018290   I8ef192dfa1796acb68a7a7774bfd98b1842a475c   hal: Use derived playback snd device during re-routing
2012630   I143d10eed3005bf71740af3bb671994574295baa   configs: update path entry for ULL playback for display
2022910   I4e5ef4e75af11bd3236b1c14e5008fd1a0adf18b   configs: Change app type to resolve conflict with 3D aud
2021181   Ib9be496178b25f96e80fabf95abfaf33d2db4f88   configs: sdm660: Fix loud beep sound at speaker device s
2018123   Ie3fcef9b4a0e703eff6c57c857d31281611e156c   hal: Check A2dp state before bt ipc library calls
2025453   Icbb8562a22d3dbd24b6e7b41d3914510f52feb7a   config: Update mixerpath according to QRD Starhawk DMIC
2012222   I4d2654b8c8938dea60388524ebb43980a3fd8c3d   audio: enable compilation  without flag TARGET_USES_AOSP
2021657   Ie4c07c6a888c1ec66ed032b0d2912633cf15368c   hal: In case of error in in_read don't return zero
2013749   I923d1e39af805c9fccf386fb2930c2819ddf6363   hal: avoid sending audio calibration during voice call
2017725   I610d701bd89ae25acdd8cea63d03d77e9f791af6   hal: Ensure during voice call backend in sample rate is
2025453   Idbc75412f48a1b6402161e2dc19ee95a6e12176b   configs: sdm660/630: Update mixer paths for SDM630 inter
2010691   Ifc23bb837804d9500a1b9c5164f79fa085b20a34   hal: add NULL check for stream in
2012222   I7f5fef656f1d8796872e4d297da3220c3e69951d   audio: make direct output independent of DIRECT_PCM flag
2011146   If966ed1c91317a9e770a793e9dac151e3098baff   configs: sdm660: Fix high voice RX gain in handset mode
2012582   Id02cf720c8e0ad98ef547c6f3ed48cb1f04836ce   hal: fix for snd device mismatch during hph to hph 44.1

Change-Id: I60b8618ade5fa2c6b3dca3967f0de6c5cb133a21
CRs-Fixed: 2022910, 2012222, 2012630, 2019181, 2020173, 2011146, 2021181, 2025453, 2017725, 2018123, 2013749, 2018290, 2005890, 2012582, 1117352, 2010691, 2021657
parents d9f5bfa0 e8ebd830

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ include $(MY_LOCAL_PATH)/post_proc/Android.mk 
include $(MY_LOCAL_PATH)/qahw_api/Android.mk

endif



ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

ifeq ($(USE_LEGACY_AUDIO_DAEMON), true)

include $(MY_LOCAL_PATH)/audiod/Android.mk

endif

configs/msm8937/audio_output_policy.conf

+2 −9
Original line number Diff line number Diff line
@@ -25,22 +25,15 @@ outputs { 
    bit_width 16

    app_type 69936

  }

  direct {

    flags AUDIO_OUTPUT_FLAG_DIRECT

    formats AUDIO_FORMAT_PCM_16_BIT

    sampling_rates 48000

    bit_width 16

    app_type 69936

  }

  direct_pcm_16 {

    flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM

    flags AUDIO_OUTPUT_FLAG_DIRECT

    formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT

    sampling_rates 44100|48000|96000|192000

    bit_width 16

    app_type 69936

  }

  direct_pcm_24 {

    flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM

    flags AUDIO_OUTPUT_FLAG_DIRECT

    formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT

    sampling_rates 44100|48000|96000|192000

    bit_width 24

configs/msm8937/audio_policy.conf

+1 −8
Original line number Diff line number Diff line
@@ -47,19 +47,12 @@ audio_hw_modules { 
         devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY

         flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER

      }

      multichannel {

        sampling_rates 44100|48000

        channel_masks dynamic

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY

        flags AUDIO_OUTPUT_FLAG_DIRECT

      }

      direct_pcm {

        sampling_rates 8000|11025|16000|22050|32000|44100|48000|64000|88200|96000|176400|192000

        channel_masks AUDIO_CHANNEL_OUT_MONO|AUDIO_CHANNEL_OUT_STEREO|AUDIO_CHANNEL_OUT_2POINT1|AUDIO_CHANNEL_OUT_QUAD|AUDIO_CHANNEL_OUT_PENTA|AUDIO_CHANNEL_OUT_5POINT1|AUDIO_CHANNEL_OUT_6POINT1|AUDIO_CHANNEL_OUT_7POINT1

        formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT

        devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_AUX_DIGITAL

        flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM

        flags AUDIO_OUTPUT_FLAG_DIRECT

      }

      compress_offload {

        sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000|64000|88200|96000|176400|192000

configs/msm8937/audio_policy_configuration.xml

+3 −8
Original line number Diff line number Diff line
@@ -73,13 +73,8 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                </mixPort>

                <mixPort name="multichannel" role="source"

                        flags="AUDIO_OUTPUT_FLAG_DIRECT">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                </mixPort>

                <mixPort name="direct_pcm" role="source"

                        flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM">

                        flags="AUDIO_OUTPUT_FLAG_DIRECT">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000"

                             channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
@@ -255,9 +250,9 @@ 
                <route type="mix" sink="Line"

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

                <route type="mix" sink="HDMI"

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

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

                <route type="mix" sink="Proxy"

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

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

                <route type="mix" sink="FM"

                       sources="primary output"/>

                <route type="mix" sink="BT SCO All"

configs/msm8937/msm8937.mk

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ MM_AUDIO_ENABLED_SAFX := true 
AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false

AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true

AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true

DOLBY_ENABLE := false

endif



USE_XML_AUDIO_POLICY_CONF := 1