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

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

Merge b6dcb0dd on remote branch 

Change-Id: I06c82384ea6896dbbf21b92ed52edd83585bc52a
parents e8c5a957 b6dcb0dd

configs/msm8953/audio_output_policy.conf

+7 −0
Original line number Diff line number Diff line
@@ -18,6 +18,13 @@ outputs { 
    bit_width 16

    app_type 69937

  }

  voip_rx {

    flags AUDIO_OUTPUT_FLAG_VOIP_RX|AUDIO_OUTPUT_FLAG_DIRECT

    formats AUDIO_FORMAT_PCM_16_BIT

    sampling_rates 8000|16000|32000|48000

    bit_width 16

    app_type 69946

  }

  deep_buffer {

    flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER

    formats AUDIO_FORMAT_PCM_16_BIT

configs/msm8953/audio_platform_info_intcodec.xml

+8 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!-- Copyright (c) 2015 - 2016, 2018, 2020, The Linux Foundation. All rights reserved.         -->

<!-- Copyright (c) 2015-2016, 2018, 2020-2021, The Linux Foundation. All rights reserved.         -->

<!--                                                                        -->

<!-- Redistribution and use in source and binary forms, with or without     -->

<!-- modification, are permitted provided that the following conditions are -->
@@ -53,6 +53,8 @@ 
        <usecase name="USECASE_INCALL_REC_UPLINK" type="in" id="14" />

        <usecase name="USECASE_INCALL_REC_DOWNLINK" type="in" id="14" />

        <usecase name="USECASE_INCALL_REC_UPLINK_AND_DOWNLINK" type="in" id="14" />

        <usecase name="USECASE_AUDIO_PLAYBACK_VOIP" type="out" id="27" />

        <usecase name="USECASE_AUDIO_RECORD_VOIP" type="in" id="27" />

    </pcm_ids>

    <config_params>

        <param key="spkr_1_tz_name" value="wsa881x.0f"/>
@@ -64,6 +66,7 @@ 
        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT" acdb_id="136"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT" acdb_id="136"/>

        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK" acdb_id="137"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC_FLUENCE" acdb_id="8"/>

    </acdb_ids>



    <backend_names>
@@ -165,6 +168,10 @@ 
        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="PRI_MI2S_RX-and-INT_BT_SCO_RX"/>

        <device name="SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO" backend="wsa-speaker-and-bt-sco" interface="PRI_MI2S_RX-and-INT_BT_SCO_RX"/>

        <device name="SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO_WB" backend="wsa-speaker-and-bt-sco-wb" interface="PRI_MI2S_RX-and-INT_BT_SCO_RX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_NREC" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB_NREC" interface="INT_BT_SCO_TX"/>

    </backend_names>

    <!-- below values are for ref purpose to OEM, doesn't contain actual hardware info on MTP -->

    <microphone_characteristics>

configs/msm8953/audio_platform_info_sku3_tasha.xml

+10 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!-- Copyright (c) 2015 - 2016, 2018, 2020 The Linux Foundation. All rights reserved.         -->

<!-- Copyright (c) 2015-2016, 2018, 2020-2021, The Linux Foundation. All rights reserved.         -->

<!--                                                                        -->

<!-- Redistribution and use in source and binary forms, with or without     -->

<!-- modification, are permitted provided that the following conditions are -->
@@ -62,6 +62,8 @@ 
        <usecase name="USECASE_INCALL_REC_UPLINK" type="in" id="14" />

        <usecase name="USECASE_INCALL_REC_DOWNLINK" type="in" id="14" />

        <usecase name="USECASE_INCALL_REC_UPLINK_AND_DOWNLINK" type="in" id="14" />

        <usecase name="USECASE_AUDIO_PLAYBACK_VOIP" type="out" id="28" />

        <usecase name="USECASE_AUDIO_RECORD_VOIP" type="in" id="28" />

    </pcm_ids>

    <config_params>

        <param key="native_audio_mode" value="src"/>
@@ -69,6 +71,9 @@ 
        <param key="ffv_split_ec_ref_data" value="false"/>

        <param key="ffv_ec_ref_channel_count" value="1"/>

    </config_params>

    <acdb_ids>

        <device name="SND_DEVICE_IN_HEADSET_MIC_FLUENCE" acdb_id="8"/>

    </acdb_ids>

    <backend_names>

        <device name="SND_DEVICE_OUT_BT_SCO_WB" interface="INT_BT_SCO_RX"/>

        <device name="SND_DEVICE_OUT_BT_SCO" interface="INT_BT_SCO_RX"/>
@@ -87,6 +92,10 @@ 
        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="SLIMBUS_0_RX--and-INT_BT_SCO_RX"/>

        <device name="SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO" backend="wsa-speaker-and-bt-sco" interface="SLIMBUS_0_RX--and-INT_BT_SCO_RX"/>

        <device name="SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO_WB" backend="wsa-speaker-and-bt-sco-wb" interface="SLIMBUS_0_RX--and-INT_BT_SCO_RX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_NREC" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB_NREC" interface="INT_BT_SCO_TX"/>

    </backend_names>

    <!-- below values are for ref purpose to OEM, doesn't contain actual hardware info on MTP -->

    <microphone_characteristics>

configs/msm8953/audio_platform_info_sku4.xml

+8 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!-- Copyright (c) 2015 - 2016, 2018, 2020, The Linux Foundation. All rights reserved.         -->

<!-- Copyright (c) 2015-2016, 2018, 2020-2021, The Linux Foundation. All rights reserved.         -->

<!--                                                                        -->

<!-- Redistribution and use in source and binary forms, with or without     -->

<!-- modification, are permitted provided that the following conditions are -->
@@ -52,6 +52,8 @@ 
        <usecase name="USECASE_INCALL_REC_UPLINK" type="in" id="14" />

        <usecase name="USECASE_INCALL_REC_DOWNLINK" type="in" id="14" />

        <usecase name="USECASE_INCALL_REC_UPLINK_AND_DOWNLINK" type="in" id="14" />

        <usecase name="USECASE_AUDIO_PLAYBACK_VOIP" type="out" id="27" />

        <usecase name="USECASE_AUDIO_RECORD_VOIP" type="in" id="27" />

    </pcm_ids>

    <config_params>

        <param key="spkr_1_tz_name" value="wsa881x.0f"/>
@@ -63,6 +65,7 @@ 
        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT" acdb_id="136"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT" acdb_id="136"/>

        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK" acdb_id="137"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC_FLUENCE" acdb_id="8"/>

    </acdb_ids>



    <backend_names>
@@ -164,6 +167,10 @@ 
        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="PRI_MI2S_RX-and-INT_BT_SCO_RX"/>

        <device name="SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO" backend="wsa-speaker-and-bt-sco" interface="PRI_MI2S_RX-and-INT_BT_SCO_RX"/>

        <device name="SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO_WB" backend="wsa-speaker-and-bt-sco-wb" interface="PRI_MI2S_RX-and-INT_BT_SCO_RX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_NREC" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB_NREC" interface="INT_BT_SCO_TX"/>

    </backend_names>

    <!-- below values are for ref purpose to OEM, doesn't contain actual hardware info on MTP -->

    <microphone_characteristics>

configs/msm8953/audio_platform_info_tasha.xml

+10 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!-- Copyright (c) 2015 - 2016, 2018, 2020, The Linux Foundation. All rights reserved.         -->

<!-- Copyright (c) 2015-2016, 2018, 2020-2021, The Linux Foundation. All rights reserved.         -->

<!--                                                                        -->

<!-- Redistribution and use in source and binary forms, with or without     -->

<!-- modification, are permitted provided that the following conditions are -->
@@ -64,6 +64,8 @@ 
        <usecase name="USECASE_INCALL_REC_UPLINK" type="in" id="14" />

        <usecase name="USECASE_INCALL_REC_DOWNLINK" type="in" id="14" />

        <usecase name="USECASE_INCALL_REC_UPLINK_AND_DOWNLINK" type="in" id="14" />

        <usecase name="USECASE_AUDIO_PLAYBACK_VOIP" type="out" id="28" />

        <usecase name="USECASE_AUDIO_RECORD_VOIP" type="in" id="28" />

    </pcm_ids>

    <config_params>

        <param key="native_audio_mode" value="src"/>
@@ -71,6 +73,9 @@ 
        <param key="ffv_split_ec_ref_data" value="false"/>

        <param key="ffv_ec_ref_channel_count" value="1"/>

    </config_params>

    <acdb_ids>

        <device name="SND_DEVICE_IN_HEADSET_MIC_FLUENCE" acdb_id="8"/>

    </acdb_ids>

    <backend_names>

        <device name="SND_DEVICE_OUT_BT_SCO_WB" interface="INT_BT_SCO_RX"/>

        <device name="SND_DEVICE_OUT_BT_SCO" interface="INT_BT_SCO_RX"/>
@@ -89,6 +94,10 @@ 
        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="SLIMBUS_0_RX--and-INT_BT_SCO_RX"/>

        <device name="SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO" backend="wsa-speaker-and-bt-sco" interface="SLIMBUS_0_RX--and-INT_BT_SCO_RX"/>

        <device name="SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO_WB" backend="wsa-speaker-and-bt-sco-wb" interface="SLIMBUS_0_RX--and-INT_BT_SCO_RX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_NREC" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" interface="INT_BT_SCO_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB_NREC" interface="INT_BT_SCO_TX"/>

    </backend_names>

    <!-- below values are for ref purpose to OEM, doesn't contain actual hardware info on MTP -->

    <microphone_characteristics>