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

Unverified Commit c05562e9 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge remote-tracking branch 'caf/LA.BF64.1.2.3_rb1.8' into cm-14.1-caf-8994 

Change-Id: I7ef780cda6a937fa6f4a620e87e98bf2ce5e3748
parents 6f321738 957e36fc

configs/msm8992/audio_policy_configuration.xml

+3 −3
Original line number Diff line number Diff line
@@ -79,13 +79,13 @@ 
                <mixPort name="direct_pcm" role="source"

                        flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,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"/>

                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"

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

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,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"/>

                    <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"

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

                             samplingRates="8000,11025,16000,12000,22050,24000,32000,44100,48000,64000,88200,96000,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"/>

                </mixPort>

                <mixPort name="compressed_offload" role="source"

configs/msm8992/msm8992.mk

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ AUDIO_FEATURE_ENABLED_MULTIPLE_TUNNEL := true 
MM_AUDIO_ENABLED_FTM := true

MM_AUDIO_ENABLED_SAFX := true

TARGET_USES_QCOM_MM_AUDIO := true

#AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true

AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true

### End - AUDIO_FEATURE_FLAGS

configs/msm8994/audio_policy_configuration.xml

+3 −3
Original line number Diff line number Diff line
@@ -79,13 +79,13 @@ 
                <mixPort name="direct_pcm" role="source"

                        flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,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"/>

                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"

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

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,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"/>

                    <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"

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

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,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"/>

                </mixPort>

                <mixPort name="compressed_offload" role="source"

configs/msm8994/msm8994.mk

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ AUDIO_FEATURE_ENABLED_MULTIPLE_TUNNEL := true 
MM_AUDIO_ENABLED_FTM := true

MM_AUDIO_ENABLED_SAFX := true

TARGET_USES_QCOM_MM_AUDIO := true

#AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true

AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true

#AUDIO_FEATURE_FLAGS

hal/audio_extn/dolby.c

+13 −15
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.

 * Copyright (c) 2011-2014, 2016 The Linux Foundation. All rights reserved.

 * Not a Contribution.

 *

 * Copyright (C) 2010 The Android Open Source Project
@@ -359,7 +359,7 @@ void audio_extn_ddp_set_parameters(struct audio_device *adev, 


#if defined(DS1_DOLBY_DDP_ENABLED) || defined(DS2_DOLBY_DAP_ENABLED)

int audio_extn_dolby_get_snd_codec_id(struct audio_device *adev,

                                      struct stream_out *out,

                                      struct stream_out *out __unused,

                                      audio_format_t format)

{

    int id = 0;
@@ -367,10 +367,12 @@ int audio_extn_dolby_get_snd_codec_id(struct audio_device *adev, 
     * Use wfd /hdmi sink channel cap for dolby params if device is wfd

     * or hdmi. Otherwise use stereo configuration

     */

#ifdef DS1_DOLBY_DDP_ENABLED

    int channel_cap = out->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL ?

                      adev->cur_hdmi_channels :

                      out->devices & AUDIO_DEVICE_OUT_PROXY ?

                      adev->cur_wfd_channels : 2;

#endif



    switch (format) {

    case AUDIO_FORMAT_AC3:
@@ -633,9 +635,7 @@ static struct ds2_extn_module ds2extnmod = { 
};



int audio_extn_dap_hal_init(int snd_card) {

    char c_dmid[128] = {0};

    void *handle = NULL;

    int i_dmid, ret = -EINVAL;

    int ret = -EINVAL;

    dap_hal_device_be_id_map_t device_be_id_map;



    ALOGV("%s: opening DAP HAL lib\n", __func__);
@@ -654,7 +654,7 @@ int audio_extn_dap_hal_init(int snd_card) { 
    ds2extnmod.dap_hal_set_hw_info(SND_CARD, (void*)(&snd_card));

    ALOGV("%s Sound card number is:%d",__func__,snd_card);



    platform_get_device_to_be_id_map(&device_be_id_map.device_id_to_be_id, &device_be_id_map.len);

    platform_get_device_to_be_id_map((int **)&device_be_id_map.device_id_to_be_id, &device_be_id_map.len);

    ds2extnmod.dap_hal_set_hw_info(DEVICE_BE_ID_MAP, (void*)(&device_be_id_map));

    ALOGV("%s Set be id map len:%d",__func__,device_be_id_map.len);

    ret = 0;
@@ -680,9 +680,7 @@ int audio_extn_dap_hal_deinit() { 
void audio_extn_dolby_ds2_set_endpoint(struct audio_device *adev) {

    struct listnode *node;

    struct audio_usecase *usecase;

    struct mixer_ctl *ctl;

    const char *mixer_ctl_name = "DS1 DAP Endpoint";

    int endpoint = 0, ret;

    int endpoint = 0;

    bool send = false;



    list_for_each(node, &adev->usecase_list) {
@@ -735,7 +733,7 @@ int audio_extn_ds2_enable(struct audio_device *adev) { 
    return 0;

}



int audio_extn_dolby_set_dap_bypass(struct audio_device *adev, int state) {

int audio_extn_dolby_set_dap_bypass(struct audio_device *adev __unused, int state) {



    ALOGV("%s: state %d", __func__, state);

    if (ds2extnmod.dap_hal_set_hw_info) {
@@ -747,12 +745,12 @@ int audio_extn_dolby_set_dap_bypass(struct audio_device *adev, int state) { 
    return 0;

}



void audio_extn_dolby_set_license(struct audio_device *adev)

void audio_extn_dolby_set_license(struct audio_device *adev __unused)

{

    int i_key;

    char c_key[128] = {0};

    char c_dmid[128] = {0};

    int i_dmid, ret = -EINVAL;

    int i_dmid;

    struct dolby_param_license dolby_license;



#ifdef DOLBY_ACDB_LICENSE
@@ -771,16 +769,16 @@ void audio_extn_dolby_set_license(struct audio_device *adev) 
        ds2extnmod.dap_hal_set_hw_info(DMID, (void*)(&dolby_license.dmid));

    } else {

        ALOGV("%s: dap_hal_set_hw_info is NULL", __func__);

        return ret;

        return;

    }

    return 0;

    return;

}





void audio_extn_ds2_set_parameters(struct audio_device *adev,

                                   struct str_parms *parms)

{

    int val, ret;

    int ret;

    char value[32]={0};



    ret = str_parms_get_str(parms, AUDIO_PARAMETER_KEY_SND_CARD_STATUS, value,