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

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

Promotion of av-userspace.lnx.2.0-00018. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1019158   Ie40c286eb9988aeb5093f32c7f81cdb142e88eb6   hal: Add device sidetone support for USB audio ADSP solu
1032603   I476cc16e89438709bdd6ceea371eed6bdb7b62f4   audiopolicy: add log to print XML policy config flag
1015318   Iae65e00b0f4d2f74f303ef03610f8b3a098dc7aa   audio: config audio backend for HDMI playback
1019158   I95a9796d7cad71e09dedd2bcd451183cbd25ca71   hal: Add USB audio via ADSP support
1000024   Id0b67630077e06284b8a396be69ebe0c72747c90   audio : refactoring of compress passthrough changes.
1022145   I310a462ae8efe707658d941e88cb5ea59a9f8550   audio: Fix memory leak
1000024   I33bff4db9e03dbe417b93729d8c310ca4f1c7c53   audio:msmcobalt: Add Compress Passthrough support

Change-Id: I5d2bbf17af3823fd68cb21a13d1dc7bad4cdb482
CRs-Fixed: 1015318, 1000024, 1022145, 1032603, 1019158
parents 3d8827e8 415c0f40

configs/msm8996/audio_output_policy.conf

+9 −2
Original line number Diff line number Diff line
@@ -46,11 +46,18 @@ outputs { 
    bit_width 24

    app_type 69940

  }

  compress_passthrough {

  compress_passthrough_16 {

    flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING|AUDIO_OUTPUT_FLAG_COMPRESS_PASSTHROUGH

    formats AUDIO_FORMAT_AC3|AUDIO_FORMAT_E_AC3|AUDIO_FORMAT_E_AC3_JOC|AUDIO_FORMAT_DTS|AUDIO_FORMAT_DTS_HD

    sampling_rates 32000|44100|48000|88200|96000|176400|192000

    bit_width 16|24

    bit_width 16

    app_type 69941

  }

  compress_passthrough_24 {

    flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING|AUDIO_OUTPUT_FLAG_COMPRESS_PASSTHROUGH

    formats AUDIO_FORMAT_AC3|AUDIO_FORMAT_E_AC3|AUDIO_FORMAT_E_AC3_JOC|AUDIO_FORMAT_DTS|AUDIO_FORMAT_DTS_HD

    sampling_rates 32000|44100|48000|88200|96000|176400|192000

    bit_width 24

    app_type 69941

  }

  compress_offload_16 {

configs/msm8996/mixer_paths_tasha.xml

+5 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ 
    <ctl name="HDMI Mixer MultiMedia4" value="0" />

    <ctl name="HDMI Mixer MultiMedia5" value="0" />

    <ctl name="HDMI Mixer MultiMedia7" value="0" />

    <ctl name="HDMI Mixer MultiMedia9" value="0" />

    <ctl name="HDMI Mixer MultiMedia10" value="0" />

    <ctl name="HDMI Mixer MultiMedia11" value="0" />

    <ctl name="HDMI Mixer MultiMedia12" value="0" />
@@ -755,6 +756,10 @@ 
        <ctl name="HDMI Mixer MultiMedia4" value="1" />

    </path>



    <path name="silence-playback hdmi">

        <ctl name="HDMI Mixer MultiMedia9" value="1" />

    </path>



    <path name="compress-offload-playback bt-sco">

        <ctl name="AUX_PCM_RX Audio Mixer MultiMedia4" value="1" />

    </path>

configs/msm8996/msm8996.mk

+3 −2
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true 
AUDIO_FEATURE_ENABLED_FLUENCE := true

AUDIO_FEATURE_ENABLED_HDMI_SPK := true

AUDIO_FEATURE_ENABLED_HDMI_EDID := true

AUDIO_FEATURE_ENABLED_HDMI_PASSTHROUGH := true

#AUDIO_FEATURE_ENABLED_HDMI_PASSTHROUGH := true

#AUDIO_FEATURE_ENABLED_KEEP_ALIVE := true

AUDIO_FEATURE_ENABLED_HFP := true

AUDIO_FEATURE_ENABLED_INCALL_MUSIC := false

AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true
@@ -45,8 +46,8 @@ MM_AUDIO_ENABLED_FTM := true 
MM_AUDIO_ENABLED_SAFX := true

TARGET_USES_QCOM_MM_AUDIO := true

AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false

DOLBY_DDP := true

#AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true

#DOLBY_DDP := true

AUDIO_FEATURE_ENABLED_SOURCE_TRACKING := true

AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true

##AUDIO_FEATURE_FLAGS

configs/msmcobalt/audio_output_policy.conf

+14 −0
Original line number Diff line number Diff line
@@ -46,6 +46,20 @@ outputs { 
    bit_width 24

    app_type 69940

  }

  compress_passthrough_16 {

    flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING|AUDIO_OUTPUT_FLAG_COMPRESS_PASSTHROUGH

    formats AUDIO_FORMAT_AC3|AUDIO_FORMAT_E_AC3|AUDIO_FORMAT_E_AC3_JOC|AUDIO_FORMAT_DTS|AUDIO_FORMAT_DTS_HD

    sampling_rates 32000|44100|48000|88200|96000|176400|192000

    bit_width 16

    app_type 69941

  }

  compress_passthrough_24 {

    flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING|AUDIO_OUTPUT_FLAG_COMPRESS_PASSTHROUGH

    formats AUDIO_FORMAT_AC3|AUDIO_FORMAT_E_AC3|AUDIO_FORMAT_E_AC3_JOC|AUDIO_FORMAT_DTS|AUDIO_FORMAT_DTS_HD

    sampling_rates 32000|44100|48000|88200|96000|176400|192000

    bit_width 24

    app_type 69941

  }

  compress_offload_16 {

    flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING

    formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_PCM_16_BIT_OFFLOAD|AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_AAC_ADTS_LC|AUDIO_FORMAT_AAC_ADTS_HE_V1|AUDIO_FORMAT_AAC_ADTS_HE_V2

configs/msmcobalt/audio_platform_info.xml

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ 
        <!-- followed by perf lock options                             -->

        <param key="perf_lock_opts" value="4, 0x101, 0x704, 0x20F, 0x1E01"/>

        <param key="input_mic_max_count" value="4"/>

        <!-- In the below value string, the value indicates sidetone gain in dB -->

        <param key="usb_sidetone_gain" value="35"/>

    </config_params>

    <backend_names>

        <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>