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

Commit cb5b5789 authored by Naresh Tanniru's avatar Naresh Tanniru
Browse files

Merge e1f65e84 on remote branch 

Change-Id: I5cb17e69a3b1e4fa78b7a130cbabc8bc7b11932b
parents 1921622b e1f65e84

configs/apq8098_latv/apq8098_latv.mk

+4 −1
Original line number Diff line number Diff line
@@ -69,7 +69,10 @@ AUDIO_FEATURE_ENABLED_MS12_SECURITY := true 
AUDIO_FEATURE_ENABLED_RAS := true

AUDIO_FEATURE_ENABLED_DYNAMIC_LOG := true

AUDIO_FEATURE_ENABLED_SND_MONITOR := true

AUDIO_FEATURE_ENABLED_MS12_ARM := true



#Disabling the feature AUDIO_FEATURE_ENABLED_MS12_ARM for P compatibility.

#Will revisit if needed for LATV.

AUDIO_FEATURE_ENABLED_MS12_ARM := false

##AUDIO_FEATURE_FLAGS



#Audio Specific device overlays

configs/msm8909/msm8909.mk

+4 −0
Original line number Diff line number Diff line
@@ -165,6 +165,10 @@ vendor.audio.dolby.ds2.enabled=true 
PRODUCT_PROPERTY_OVERRIDES += \

persist.vendor.audio.hw.binder.size_kbyte=1024



#Disable split a2dp

PRODUCT_PROPERTY_OVERRIDES += \

persist.vendor.bt.enable.splita2dp=false



PRODUCT_PACKAGES += \

    android.hardware.audio@2.0-service \

    android.hardware.audio@2.0-impl \

configs/msm8937/mixer_paths_sdm439_pm8953.xml

+83 −0
Original line number Diff line number Diff line
@@ -319,6 +319,10 @@ 
        <path name="deep-buffer-playback" />

    </path>



    <path name="deep-buffer-playback speaker-and-headphones">

        <path name="deep-buffer-playback" />

    </path>



    <path name="deep-buffer-playback transmission-fm">

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

    </path>
@@ -380,6 +384,10 @@ 
        <path name="low-latency-playback" />

    </path>



    <path name="low-latency-playback speaker-and-headphones">

        <path name="low-latency-playback" />

    </path>



    <path name="low-latency-playback transmission-fm">

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

    </path>
@@ -445,6 +453,10 @@ 
        <path name="audio-ull-playback" />

    </path>



    <path name="audio-ull-playback speaker-and-headphones">

        <path name="audio-ull-playback" />

    </path>



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

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

    </path>
@@ -501,6 +513,10 @@ 
        <path name="compress-offload-playback" />

    </path>



    <path name="compress-offload-playback speaker-and-headphones">

        <path name="compress-offload-playback" />

    </path>



    <path name="compress-offload-playback2">

        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia7" value="1" />

    </path>
@@ -536,15 +552,28 @@ 
        <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia7" value="1" />

    </path>



    <path name="compress-offload-playback2 usb-headphones">

        <path name="compress-offload-playback2 afe-proxy" />

    </path>



    <path name="compress-offload-playback2 speaker-and-hdmi">

        <path name="compress-offload-playback2 hdmi" />

        <path name="compress-offload-playback2" />

    </path>



    <path name="compress-offload-playback2 speaker-and-usb-headphones">

        <path name="compress-offload-playback2 usb-headphones" />

        <path name="compress-offload-playback2" />

    </path>



    <path name="compress-offload-playback2 afe-proxy">

        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia7" value="1" />

    </path>



    <path name="compress-offload-playback2 speaker-and-headphones">

        <path name="compress-offload-playback2" />

    </path>



    <path name="compress-offload-playback transmission-fm">

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

    </path>
@@ -589,6 +618,10 @@ 
        <path name="compress-offload-playback3" />

    </path>



    <path name="compress-offload-playback3 speaker-and-headphones">

        <path name="compress-offload-playback3" />

    </path>



    <path name="compress-offload-playback4">

        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia11" value="1" />

    </path>
@@ -629,6 +662,10 @@ 
        <path name="compress-offload-playback4" />

    </path>



    <path name="compress-offload-playback4 speaker-and-headphones">

        <path name="compress-offload-playback4" />

    </path>



    <path name="compress-offload-playback5">

        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia12" value="1" />

    </path>
@@ -669,6 +706,10 @@ 
        <path name="compress-offload-playback5" />

    </path>



    <path name="compress-offload-playback5 speaker-and-headphones">

        <path name="compress-offload-playback5" />

    </path>



    <path name="compress-offload-playback6">

        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia13" value="1" />

    </path>
@@ -709,6 +750,10 @@ 
        <path name="compress-offload-playback6" />

    </path>



    <path name="compress-offload-playback6 speaker-and-headphones">

        <path name="compress-offload-playback6" />

    </path>



    <path name="compress-offload-playback7">

        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia14" value="1" />

    </path>
@@ -749,6 +794,10 @@ 
        <path name="compress-offload-playback7" />

    </path>



    <path name="compress-offload-playback7 speaker-and-headphones">

        <path name="compress-offload-playback7" />

    </path>



    <path name="audio-record">

        <ctl name="MultiMedia1 Mixer TERT_MI2S_TX" value="1" />

    </path>
@@ -886,6 +935,10 @@ 
        <ctl name="VoWLAN_Tx Mixer AFE_PCM_TX_VoWLAN" value="1" />

    </path>



    <path name="vowlan-call speaker-and-headphones">

        <path name="vowlan-call" />

    </path>



    <path name="voicemmode1-call">

        <ctl name="PRI_MI2S_RX_Voice Mixer VoiceMMode1" value="1" />

        <ctl name="VoiceMMode1_Tx Mixer TERT_MI2S_TX_MMode1" value="1" />
@@ -910,6 +963,10 @@ 
       <path name="voicemmode1-call usb-headphones" />

    </path>



    <path name="voicemmode1-call speaker-and-headphones">

        <path name="voicemmode1-call" />

    </path>



    <path name="voicemmode2-call">

        <ctl name="PRI_MI2S_RX_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer TERT_MI2S_TX_MMode2" value="1" />
@@ -934,6 +991,10 @@ 
       <path name="voicemmode2-call usb-headphones" />

    </path>



    <path name="voicemmode2-call speaker-and-headphones">

        <path name="voicemmode2-call" />

    </path>



    <path name="hfp-sco">

        <ctl name="PRI_MI2S_RX Port Mixer INTERNAL_BT_SCO_TX" value="1" />

        <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia6" value="1" />
@@ -1148,6 +1209,10 @@ 
        <ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value='1' />

    </path>



    <path name="compress-voip-call speaker-and-headphones">

        <path name="compress-voip-call" />

    </path>



    <path name="qchat-call">

        <ctl name="PRI_MI2S_RX_Voice Mixer QCHAT" value="1" />

        <ctl name="QCHAT_Tx Mixer TERT_MI2S_TX_QCHAT" value="1" />
@@ -1228,6 +1293,10 @@ 
        <ctl name="SpkrMono VISENSE Switch" value="1" />

    </path>



    <path name="voice-speaker-protected">

        <path name="speaker-protected" />

    </path>



   <path name="speaker-mic">

        <path name="adc1" />

        <ctl name="IIR1 INP1 MUX" value="DEC1" />
@@ -1317,6 +1386,11 @@ 
        <path name="headphones" />

    </path>



    <path name="wsa-speaker-and-headphones">

        <path name="wsa-speaker" />

        <path name="headphones" />

    </path>



    <path name="usb-headphones">

    </path>
@@ -1331,6 +1405,11 @@ 
        <path name="usb-headphones" />

    </path>



    <path name="wsa-speaker-and-usb-headphones">

        <path name="wsa-speaker" />

        <path name="usb-headphones" />

    </path>



    <path name="voice-rec-mic">

        <path name="handset-mic" />

    </path>
@@ -1482,4 +1561,8 @@ 
          <path name="speaker-and-headphones" />

    </path>



    <path name="wsa-speaker-and-line">

          <path name="wsa-speaker-and-headphones" />

    </path>



</mixer>

configs/msm8937/msm8937.mk

+3 −0
Original line number Diff line number Diff line
@@ -238,6 +238,9 @@ ro.af.client_heap_size_kbyte=7168 


PRODUCT_PROPERTY_OVERRIDES += \

persist.vendor.audio.hw.binder.size_kbyte=1024

#Disable split a2dp

PRODUCT_PROPERTY_OVERRIDES += \

persist.vendor.bt.enable.splita2dp=false



# for HIDL related packages

PRODUCT_PACKAGES += \

configs/msm8953/audio_platform_info_extcodec.xml

+12 −1
Original line number Diff line number Diff line
@@ -25,6 +25,13 @@ 
<!-- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->

<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                          -->

<audio_platform_info>

    <acdb_ids>

         <device name="SND_DEVICE_IN_HANDSET_QMIC" acdb_id="140"/>

         <device name="SND_DEVICE_IN_HANDSET_6MIC" acdb_id="140"/>

         <device name="SND_DEVICE_IN_HANDSET_8MIC" acdb_id="140"/>

         <device name="SND_DEVICE_IN_EC_REF_LOOPBACK_MONO" acdb_id="140"/>

         <device name="SND_DEVICE_IN_EC_REF_LOOPBACK_STEREO" acdb_id="140"/>

    </acdb_ids>

    <bit_width_configs>

        <device name="SND_DEVICE_OUT_SPEAKER" bit_width="24"/>

    </bit_width_configs>
@@ -50,12 +57,16 @@ 
        <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="37"/>

        <usecase name="USECASE_QCHAT_CALL" type="in" id="42"/>

        <usecase name="USECASE_QCHAT_CALL" type="out" id="42"/>

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

        <usecase name="USECASE_AUDIO_PLAYBACK_SILENCE" type="out" id="14"/>

    </pcm_ids>

    <config_params>

        <param key="spkr_1_tz_name" value="wsatz.11"/>

        <param key="spkr_2_tz_name" value="wsatz.12"/>

        <param key="native_audio_mode" value="src"/>

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

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

        <param key="ffv_split_ec_ref_data" value="false"/>

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

    </config_params>

    <backend_names>

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