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

Commit 22e4910d authored by Aalique Grahame's avatar Aalique Grahame Committed by Linux Build Service Account
Browse files

audio: unify hal 

Unify audio hal components

CRs-Fixed: 2380934
Change-Id: Iacafdc44d935de5f343240421a1572a0a3241bd0
parent 0870b7f0

hal/Android.mk

+81 −28
Original line number Diff line number Diff line
@@ -9,33 +9,54 @@ LOCAL_ARM_MODE := arm 


AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)



ifneq ($(filter msm8974 msm8226 msm8610 apq8084 msm8994 msm8992 msm8996 msm8998 apq8098_latv sdm845 sdm710 qcs605 msmnile $(MSMSTEPPE),$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter msm8974 msm8226 msm8084 msm8610 apq8084 msm8994 msm8992 msm8996 msm8998 apq8098_latv sdm845 sdm710 qcs605 msmnile $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM = msm8974

  MULTIPLE_HW_VARIANTS_ENABLED := true

ifneq ($(filter msm8974,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_MSM8974

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="2"

endif

ifneq ($(filter msm8610,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_MSM8610

endif

ifneq ($(filter msm8226,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_MSM8x26

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="2"

endif

ifneq ($(filter msm8084,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_MSM8084

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="2"

endif

ifneq ($(filter apq8084,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_APQ8084

endif

ifneq ($(filter msm8994,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_MSM8994

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"

  LOCAL_CFLAGS += -DKPI_OPTIMIZE_ENABLED

endif

ifneq ($(filter msm8992,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_MSM8994

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"

  LOCAL_CFLAGS += -DKPI_OPTIMIZE_ENABLED

endif

ifneq ($(filter msm8996,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_MSM8996

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"

  LOCAL_CFLAGS += -DKPI_OPTIMIZE_ENABLED

  LOCAL_CFLAGS += -DINCALL_MUSIC_ENABLED

endif

ifneq ($(filter msm8998 apq8098_latv,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_MSM8998

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"

  LOCAL_CFLAGS += -DINCALL_MUSIC_ENABLED

endif

ifneq ($(filter sdm845,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_SDM845

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"

  LOCAL_CFLAGS += -DINCALL_MUSIC_ENABLED

  LOCAL_CFLAGS += -DINCALL_STEREO_CAPTURE_ENABLED

endif

ifneq ($(filter sdm710,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_SDM710
@@ -45,6 +66,9 @@ ifneq ($(filter qcs605,$(TARGET_BOARD_PLATFORM)),) 
endif

ifneq ($(filter msmnile,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_MSMNILE

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"

  LOCAL_CFLAGS += -DINCALL_MUSIC_ENABLED

  LOCAL_CFLAGS += -DINCALL_STEREO_CAPTURE_ENABLED

endif

ifneq ($(filter $(MSMSTEPPE) ,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_MSMSTEPPE
@@ -55,6 +79,8 @@ ifneq ($(filter msm8916 msm8909 msm8952 msm8937 thorium msm8953 msmgold sdm660,$ 
  AUDIO_PLATFORM = msm8916

  MULTIPLE_HW_VARIANTS_ENABLED := true

  LOCAL_CFLAGS := -DPLATFORM_MSM8916

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="2"

  LOCAL_CFLAGS += -DKPI_OPTIMIZE_ENABLED

ifneq ($(filter msm8909,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_MSM8909

endif
@@ -80,7 +106,6 @@ LOCAL_SRC_FILES := \ 


LOCAL_SRC_FILES += audio_extn/audio_extn.c \

                   audio_extn/utils.c

LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include

LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
@@ -97,8 +122,8 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_HDMI_EDID)),true) 
    LOCAL_SRC_FILES += edid.c

endif



ifeq ($(strip $(AUDIO_USE_LL_AS_PRIMARY_OUTPUT)),true)

    LOCAL_CFLAGS += -DUSE_LL_AS_PRIMARY_OUTPUT

ifeq ($(strip $(AUDIO_USE_DEEP_AS_PRIMARY_OUTPUT)),true)

    LOCAL_CFLAGS += -DUSE_DEEP_AS_PRIMARY_OUTPUT

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_PCM_OFFLOAD)),true)
@@ -138,11 +163,15 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_FM_POWER_OPT)),true) 
    LOCAL_SRC_FILES += audio_extn/fm.c

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_USB_TUNNEL_AUDIO)),true)

    LOCAL_CFLAGS += -DUSB_HEADSET_ENABLED

ifeq ($(strip $(AUDIO_FEATURE_ENABLED_USB_TUNNEL)),true)

    LOCAL_CFLAGS += -DUSB_TUNNEL_ENABLED

    LOCAL_SRC_FILES += audio_extn/usb.c

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_USB_SIDETONE_VOLUME)),true)

    LOCAL_CFLAGS += -DUSB_SIDETONE_VOLUME

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_HFP)),true)

    LOCAL_CFLAGS += -DHFP_ENABLED

    LOCAL_SRC_FILES += audio_extn/hfp.c
@@ -182,6 +211,10 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_SPKR_PROTECTION)),true) 
  LOCAL_SRC_FILES += audio_extn/spkr_protection.c

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_BG_CAL)),true)

  LOCAL_CFLAGS += -DBG_CODEC_CAL

endif



ifdef MULTIPLE_HW_VARIANTS_ENABLED

  LOCAL_CFLAGS += -DHW_VARIANTS_ENABLED

  LOCAL_SRC_FILES += $(AUDIO_PLATFORM)/hw_info.c
@@ -281,8 +314,8 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_SOURCE_TRACKING)),true) 
    LOCAL_SRC_FILES += audio_extn/source_track.c

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_SPLIT_A2DP)),true)

    LOCAL_CFLAGS += -DSPLIT_A2DP_ENABLED

ifeq ($(strip $(AUDIO_FEATURE_ENABLED_A2DP_OFFLOAD)),true)

    LOCAL_CFLAGS += -DA2DP_OFFLOAD_ENABLED

    LOCAL_SRC_FILES += audio_extn/a2dp.c

endif
@@ -340,10 +373,23 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_LISTEN)),true) 
endif



ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true)

        LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

        LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include

        LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr

endif



ifeq ($(strip $(AUDIO_FEATURE_SUPPORTED_EXTERNAL_BT)),true)

  LOCAL_CFLAGS += -DEXTERNAL_BT_SUPPORTED

endif



ifeq ($(strip $(AUDIO_FEATURE_FLICKER_SENSOR_INPUT)),true)

  LOCAL_CFLAGS += -DFLICKER_SENSOR_INPUT

endif



ifeq ($(strip $(AUDIO_FEATURE_NO_AUDIO_OUT)),true)

  LOCAL_CFLAGS += -DNO_AUDIO_OUT

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_EXT_HDMI)),true)

    LOCAL_CFLAGS += -DAUDIO_EXTERNAL_HDMI_ENABLED

ifeq ($(strip $(AUDIO_FEATURE_ENABLED_HDMI_PASSTHROUGH)),true)
@@ -365,6 +411,9 @@ ifeq ($(ST_FEATURE_ENABLE), true) 
    LOCAL_CFLAGS += -DSOUND_TRIGGER_PLATFORM_NAME=$(TARGET_BOARD_PLATFORM)

    LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/sound_trigger

    LOCAL_SRC_FILES += audio_extn/soundtrigger.c

ifneq ($(filter msm8996,$(TARGET_BOARD_PLATFORM)),)

    LOCAL_HEADER_LIBRARIES += sound_trigger.primary_headers

endif

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_AUXPCM_BT)),true)
@@ -456,6 +505,10 @@ LOCAL_MODULE_RELATIVE_PATH := hw 


LOCAL_MODULE_TAGS := optional



LOCAL_MODULE_OWNER := qti



LOCAL_PROPRIETARY_MODULE := true



LOCAL_VENDOR_MODULE := true



include $(BUILD_SHARED_LIBRARY)

hal/Makefile.am

+9 −9
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ c_sources += audio_extn/fm.c 
endif



if USBAUDIO

AM_CFLAGS += -DUSB_HEADSET_ENABLED

AM_CFLAGS += -DUSB_TUNNEL_ENABLED

c_sources += audio_extn/usb.c

endif
@@ -38,7 +38,7 @@ endif 
if SSR

AM_CFLAGS += -DSSR_ENABLED

c_sources += audio_extn/ssr.c

AM_CFLAGS +=  -I ${WORKSPACE}/audio/mm-audio-noship/surround_sound_3mic/libsurround_3mic_proc/surround_rec_interface/inc/

AM_CFLAGS +=  -I ${WORKSPACE}/audio/mm-audio-external-noship/surround_sound_3mic/libsurround_3mic_proc/surround_rec_interface/inc/

endif



if MULTI_VOICE_SESSIONS
@@ -93,11 +93,11 @@ AM_CFLAGS += -DSOURCE_TRACKING_ENABLED 
c_sources += audio_extn/source_track.c

endif



if LISTEN

AM_CFLAGS += -DAUDIO_LISTEN_ENABLED

AM_CFLAGS += -I ${WORKSPACE}/audio/mm-audio-noship/audio-listen

c_sources += audio_extn/listen.c

endif

#if LISTEN

#AM_CFLAGS += -DAUDIO_LISTEN_ENABLED

#AM_CFLAGS += -I ${WORKSPACE}/audio/mm-audio-external-noship/audio-listen

#c_sources += audio_extn/listen.c

#endif



if SOUND_TRIGGER

AM_CFLAGS += -DSOUND_TRIGGER_ENABLED
@@ -170,8 +170,8 @@ AM_CFLAGS += -DAUDIO_EXTN_ADSP_HDLR_ENABLED 
c_sources += audio_extn/adsp_hdlr.c

endif



if SPLIT_A2DP

AM_CFLAGS += -DSPLIT_A2DP_ENABLED

if A2DP_OFFLOAD

AM_CFLAGS += -DA2DP_OFFLOAD_ENABLED

c_sources += audio_extn/a2dp.c

endif

hal/audio_extn/a2dp.c

+88 −74
Original line number Diff line number Diff line 
/*

* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

* Copyright (c) 2015-2019, 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
@@ -26,12 +26,13 @@ 
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

*/

#define LOG_TAG "split_a2dp"

#define LOG_TAG "a2dp_offload"

/*#define LOG_NDEBUG 0*/

#define LOG_NDDEBUG 0

#include <errno.h>

#include <cutils/log.h>

#include <log/log.h>

#include <dlfcn.h>

#include <pthread.h>

#include "audio_hw.h"

#include "platform.h"

#include "platform_api.h"
@@ -48,7 +49,7 @@ 
#include <log_utils.h>

#endif



#ifdef SPLIT_A2DP_ENABLED

#ifdef A2DP_OFFLOAD_ENABLED

#define AUDIO_PARAMETER_A2DP_STARTED "A2dpStarted"

#define BT_IPC_SOURCE_LIB_NAME  "libbthost_if.so"

#define BT_IPC_SINK_LIB_NAME    "libbthost_if_sink.so"
@@ -93,6 +94,7 @@ 
#define MIXER_ENC_FMT_APTX         "APTX"

#define MIXER_FMT_TWS_CHANNEL_MODE "TWS Channel Mode"

#define MIXER_ENC_FMT_APTXHD       "APTXHD"

#define MIXER_END_FMT_LDAC         "LDAC"

#define MIXER_ENC_FMT_NONE         "NONE"

#define ENCODER_LATENCY_SBC        10

#define ENCODER_LATENCY_APTX       40
@@ -101,6 +103,7 @@ 
//To Do: Fine Tune Encoder CELT/LDAC latency.

#define ENCODER_LATENCY_CELT       40

#define ENCODER_LATENCY_LDAC       40

#define ENCODER_LATENCY_PCM        50

#define DEFAULT_SINK_LATENCY_SBC       140

#define DEFAULT_SINK_LATENCY_APTX      160

#define DEFAULT_SINK_LATENCY_APTX_HD   180
@@ -108,6 +111,17 @@ 
//To Do: Fine Tune Default CELT/LDAC Latency.

#define DEFAULT_SINK_LATENCY_CELT      180

#define DEFAULT_SINK_LATENCY_LDAC      180

#define DEFAULT_SINK_LATENCY_PCM       140



#define SYSPROP_A2DP_OFFLOAD_SUPPORTED "ro.bluetooth.a2dp_offload.supported"

#define SYSPROP_A2DP_OFFLOAD_DISABLED  "persist.bluetooth.a2dp_offload.disabled"

#define SYSPROP_A2DP_CODEC_LATENCIES   "vendor.audio.a2dp.codec.latency"



// Default encoder bit width

#define DEFAULT_ENCODER_BIT_FORMAT 16



// Default encoder latency

#define DEFAULT_ENCODER_LATENCY    200



// Slimbus Tx sample rate for ABR feedback channel

#define ABR_TX_SAMPLE_RATE             "KHZ_8"
@@ -146,6 +160,7 @@ typedef enum { 
    CODEC_TYPE_LDAC = AUDIO_FORMAT_LDAC, // 0x23000000UL

    CODEC_TYPE_CELT = 603979776u, // 0x24000000UL

    CODEC_TYPE_APTX_AD = 620756992u, // 0x25000000UL

    CODEC_TYPE_PCM = AUDIO_FORMAT_PCM_16_BIT, // 0x1u

}codec_t;



/*
@@ -605,6 +620,7 @@ typedef struct { 
    uint32_t sampling_rate;

    uint32_t bitrate;

    uint32_t bits_per_sample;

    struct aac_frame_size_control_t frame_ctl;

} audio_aac_encoder_config;

#endif
@@ -667,60 +683,15 @@ typedef struct { 


/*********** END of DSP configurable structures ********************/



/* API to identify DSP encoder captabilities */

static void a2dp_offload_codec_cap_parser(char *value)

{

    char *tok = NULL,*saveptr;



    tok = strtok_r(value, "-", &saveptr);

    while (tok != NULL) {

        if (strcmp(tok, "sbc") == 0) {

            ALOGD("%s: SBC offload supported\n",__func__);

            a2dp.is_a2dp_offload_supported = true;

            break;

        } else if (strcmp(tok, "aptx") == 0) {

            ALOGD("%s: aptx offload supported\n",__func__);

            a2dp.is_a2dp_offload_supported = true;

            break;

        } else if (strcmp(tok, "aptxtws") == 0) {

            ALOGD("%s: aptx dual mono offload supported\n",__func__);

            a2dp.is_a2dp_offload_supported = true;

            break;

        } else if (strcmp(tok, "aptxhd") == 0) {

            ALOGD("%s: aptx HD offload supported\n",__func__);

            a2dp.is_a2dp_offload_supported = true;

            break;

        } else if (strcmp(tok, "aac") == 0) {

            ALOGD("%s: aac offload supported\n",__func__);

            a2dp.is_a2dp_offload_supported = true;

            break;

        } else if (strcmp(tok, "celt") == 0) {

            ALOGD("%s: celt offload supported\n",__func__);

            a2dp.is_a2dp_offload_supported = true;

            break;

        } else if (strcmp(tok, "ldac") == 0) {

            ALOGD("%s: ldac offload supported\n",__func__);

            a2dp.is_a2dp_offload_supported = true;

            break;

        } else if( strcmp(tok, "aptxadaptive") == 0) {

            ALOGD("%s: aptx adaptive offload supported\n",__func__);

            a2dp.is_a2dp_offload_supported = true;

        }

        tok = strtok_r(NULL, "-", &saveptr);

    };

}



static void update_offload_codec_capabilities()

{

    char value[PROPERTY_VALUE_MAX] = {'\0'};



    property_get("persist.vendor.bt.a2dp_offload_cap", value, "false");

    ALOGD("get_offload_codec_capabilities = %s",value);

    a2dp.is_a2dp_offload_supported =

            property_get_bool("persist.vendor.bt.a2dp_offload_cap", false);

    if (strcmp(value, "false") != 0)

        a2dp_offload_codec_cap_parser(value);

    ALOGD("%s: codec cap = %s",__func__,value);

            property_get_bool(SYSPROP_A2DP_OFFLOAD_SUPPORTED, false) &&

            !property_get_bool(SYSPROP_A2DP_OFFLOAD_DISABLED, false);



    ALOGD("%s: A2DP offload supported = %d",__func__,

          a2dp.is_a2dp_offload_supported);

}



static int stop_abr()
@@ -852,17 +823,17 @@ static void open_a2dp_source() 
            a2dp.audio_source_open = (audio_source_open_t)

                          dlsym(a2dp.bt_lib_source_handle, "audio_stream_open");

            a2dp.audio_source_start = (audio_source_start_t)

                          dlsym(a2dp.bt_lib_source_handle, "audio_start_stream");

                          dlsym(a2dp.bt_lib_source_handle, "audio_stream_start");

            a2dp.audio_get_enc_config = (audio_get_enc_config_t)

                          dlsym(a2dp.bt_lib_source_handle, "audio_get_codec_config");

            a2dp.audio_source_suspend = (audio_source_suspend_t)

                          dlsym(a2dp.bt_lib_source_handle, "audio_suspend_stream");

                          dlsym(a2dp.bt_lib_source_handle, "audio_stream_suspend");

            a2dp.audio_source_handoff_triggered = (audio_source_handoff_triggered_t)

                          dlsym(a2dp.bt_lib_source_handle, "audio_handoff_triggered");

            a2dp.clear_source_a2dpsuspend_flag = (clear_source_a2dpsuspend_flag_t)

                          dlsym(a2dp.bt_lib_source_handle, "clear_a2dpsuspend_flag");

            a2dp.audio_source_stop = (audio_source_stop_t)

                          dlsym(a2dp.bt_lib_source_handle, "audio_stop_stream");

                          dlsym(a2dp.bt_lib_source_handle, "audio_stream_stop");

            a2dp.audio_source_close = (audio_source_close_t)

                          dlsym(a2dp.bt_lib_source_handle, "audio_stream_close");

            a2dp.audio_source_check_a2dp_ready = (audio_source_check_a2dp_ready_t)
@@ -1026,6 +997,11 @@ static bool a2dp_set_backend_cfg(uint8_t direction) 
        sampling_rate = sampling_rate *2;

    }



    // No need to configure backend for PCM format.

    if (a2dp.bt_encoder_format == CODEC_TYPE_PCM) {

        return 0;

    }



    //Configure backend sampling rate

    switch (sampling_rate) {

    case 44100:
@@ -2168,6 +2144,11 @@ bool configure_a2dp_encoder_format() 
                 configure_a2dp_source_decoder_format(MEDIA_FMT_APTX_AD));

            break;

#endif

        case CODEC_TYPE_PCM:

            ALOGD("Received PCM format for BT device");

            a2dp.bt_encoder_format = CODEC_TYPE_PCM;

            is_configured = true;

            break;

        default:

            ALOGD(" Received Unsupported encoder formar");

            is_configured = false;
@@ -2318,7 +2299,7 @@ static void reset_a2dp_enc_config_params() 
{

    int ret =0;



    struct mixer_ctl *ctl_enc_config, *ctrl_bit_format, *ctl_channel_mode;

    struct mixer_ctl *ctl_enc_config, *ctl_channel_mode;

    struct sbc_enc_cfg_t dummy_reset_config;

    char* channel_mode;
@@ -2332,16 +2313,9 @@ static void reset_a2dp_enc_config_params() 
                                        sizeof(struct sbc_enc_cfg_t));

         a2dp.bt_encoder_format = MEDIA_FMT_NONE;

    }

    ctrl_bit_format = mixer_get_ctl_by_name(a2dp.adev->mixer,

                                            MIXER_ENC_BIT_FORMAT);

    if (!ctrl_bit_format) {

        ALOGE(" ERROR  bit format CONFIG data mixer control not identified");

    } else {

        ret = mixer_ctl_set_enum_by_string(ctrl_bit_format, "S16_LE");

        if (ret != 0) {

            ALOGE("%s: Failed to set bit format to encoder", __func__);

        }

    }



    a2dp_set_bit_format(DEFAULT_ENCODER_BIT_FORMAT);



    ctl_channel_mode = mixer_get_ctl_by_name(a2dp.adev->mixer,MIXER_FMT_TWS_CHANNEL_MODE);



    if (!ctl_channel_mode) {
@@ -2420,6 +2394,8 @@ int audio_extn_a2dp_stop_playback() 


    if (a2dp.a2dp_source_total_active_session_requests > 0)

        a2dp.a2dp_source_total_active_session_requests--;

    else

        ALOGE("%s: No active playback session requests on A2DP", __func__);



    if ( a2dp.a2dp_source_started && !a2dp.a2dp_source_total_active_session_requests) {

        ALOGV("calling BT module stream stop");
@@ -2474,16 +2450,17 @@ int audio_extn_a2dp_stop_capture() 
    return 0;

}



void audio_extn_a2dp_set_parameters(struct str_parms *parms)

int audio_extn_a2dp_set_parameters(struct str_parms *parms, bool *reconfig)

{

     int ret, val;

     int ret = 0, val, status = 0;

     char value[32]={0};

     struct audio_usecase *uc_info;

     struct listnode *node;



     if(a2dp.is_a2dp_offload_supported == false) {

        ALOGV("no supported codecs identified,ignoring a2dp setparam");

        return;

        ALOGV("no supported encoders identified,ignoring a2dp setparam");

        status = -EINVAL;

        goto param_handled;

     }



     ret = str_parms_get_str(parms, AUDIO_PARAMETER_DEVICE_CONNECT, value,
@@ -2532,6 +2509,10 @@ void audio_extn_a2dp_set_parameters(struct str_parms *parms) 
     if (ret >= 0) {

         if (a2dp.bt_lib_source_handle) {

             if ((!strncmp(value,"true",sizeof(value)))) {

                if (a2dp.a2dp_source_suspended) {

                    ALOGD("%s: A2DP is already suspended", __func__);

                    goto param_handled;

                }

                ALOGD("Setting a2dp to suspend state");

                a2dp.a2dp_source_suspended = true;

                if (a2dp.bt_state_source == A2DP_STATE_DISCONNECTED)
@@ -2590,8 +2571,20 @@ void audio_extn_a2dp_set_parameters(struct str_parms *parms) 
        }

        goto param_handled;

     }



     ret = str_parms_get_str(parms, AUDIO_PARAMETER_RECONFIG_A2DP, value,

                         sizeof(value));

     if (ret >= 0) {

         if (a2dp.is_a2dp_offload_supported &&

                a2dp.bt_state_source != A2DP_STATE_DISCONNECTED) {

             *reconfig = true;

         }

         goto param_handled;

     }



param_handled:

     ALOGV("end of a2dp setparam");

     return status;

}



void audio_extn_a2dp_set_handoff_mode(bool is_on)
@@ -2688,7 +2681,7 @@ uint32_t audio_extn_a2dp_get_encoder_latency() 
    char value[PROPERTY_VALUE_MAX];



    memset(value, '\0', sizeof(char)*PROPERTY_VALUE_MAX);

    avsync_runtime_prop = property_get("vendor.audio.a2dp.codec.latency", value, NULL);

    avsync_runtime_prop = property_get(SYSPROP_A2DP_CODEC_LATENCIES, value, NULL);

    if (avsync_runtime_prop > 0) {

        if (sscanf(value, "%d/%d/%d/%d/%d%d",

                  &sbc_offset, &aptx_offset, &aptxhd_offset, &aac_offset, &celt_offset, &ldac_offset) != 6) {
@@ -2730,10 +2723,31 @@ uint32_t audio_extn_a2dp_get_encoder_latency() 
        case CODEC_TYPE_APTX_AD: // for aptx adaptive the latency depends on the mode (HQ/LL) and

            latency = slatency;      // BT IPC will take care of accomodating the mode factor and return latency

            break;

        case CODEC_TYPE_PCM:

            latency = ENCODER_LATENCY_PCM;

            latency += DEFAULT_SINK_LATENCY_PCM;

            break;

        default:

            latency = 200;

            break;

    }

    return latency;

}

#endif // SPLIT_A2DP_ENABLED
 


int audio_extn_a2dp_get_parameters(struct str_parms *query,

                                   struct str_parms *reply)

{

    int ret, val = 0;

    char value[32]={0};



    ret = str_parms_get_str(query, AUDIO_PARAMETER_A2DP_RECONFIG_SUPPORTED,

                            value, sizeof(value));

    if (ret >= 0) {

        val = a2dp.is_a2dp_offload_supported;

        str_parms_add_int(reply, AUDIO_PARAMETER_A2DP_RECONFIG_SUPPORTED, val);

        ALOGV("%s: called ... isReconfigA2dpSupported %d", __func__, val);

    }



    return 0;

}

#endif // A2DP_OFFLOAD_ENABLED

hal/audio_extn/audio_extn.c

+81 −4
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.

 * Not a Contribution.

 *

 * Copyright (C) 2013 The Android Open Source Project
@@ -44,7 +44,7 @@ 
#include <dlfcn.h>

#include <fcntl.h>

#include <cutils/properties.h>

#include <cutils/log.h>

#include <log/log.h>

#include <unistd.h>



#include "audio_hw.h"
@@ -67,6 +67,63 @@ 
#define MAX_NUM_CHANNELS 8

#define Q14_GAIN_UNITY 0x4000



struct snd_card_split cur_snd_card_split = {

    .device = {0},

    .snd_card = {0},

    .form_factor = {0},

};



struct snd_card_split *audio_extn_get_snd_card_split()

{

    return &cur_snd_card_split;

}



void audio_extn_set_snd_card_split(const char* in_snd_card_name)

{

    /* sound card name follows below mentioned convention

       <target name>-<sound card name>-<form factor>-snd-card

       parse target name, sound card name and form factor

    */

    char *snd_card_name = strdup(in_snd_card_name);

    char *tmp = NULL;

    char *device = NULL;

    char *snd_card = NULL;

    char *form_factor = NULL;



    if (in_snd_card_name == NULL) {

        ALOGE("%s: snd_card_name passed is NULL", __func__);

        goto on_error;

    }



    device = strtok_r(snd_card_name, "-", &tmp);

    if (device == NULL) {

        ALOGE("%s: called on invalid snd card name", __func__);

        goto on_error;

    }

    strlcpy(cur_snd_card_split.device, device, HW_INFO_ARRAY_MAX_SIZE);



    snd_card = strtok_r(NULL, "-", &tmp);

    if (snd_card == NULL) {

        ALOGE("%s: called on invalid snd card name", __func__);

        goto on_error;

    }

    strlcpy(cur_snd_card_split.snd_card, snd_card, HW_INFO_ARRAY_MAX_SIZE);



    form_factor = strtok_r(NULL, "-", &tmp);

    if (form_factor == NULL) {

        ALOGE("%s: called on invalid snd card name", __func__);

        goto on_error;

    }

    strlcpy(cur_snd_card_split.form_factor, form_factor, HW_INFO_ARRAY_MAX_SIZE);



    ALOGI("%s: snd_card_name(%s) device(%s) snd_card(%s) form_factor(%s)",

               __func__, in_snd_card_name, device, snd_card, form_factor);



on_error:

    if (snd_card_name)

        free(snd_card_name);

}



struct audio_extn_module {

    bool anc_enabled;

    bool aanc_enabled;
@@ -928,6 +985,8 @@ void audio_extn_init(struct audio_device *adev) 
void audio_extn_set_parameters(struct audio_device *adev,

                               struct str_parms *parms)

{

   bool a2dp_reconfig = false;



   audio_extn_set_aanc_noise_level(adev, parms);

   audio_extn_set_anc_parameters(adev, parms);

   audio_extn_set_fluence_parameters(adev, parms);
@@ -938,7 +997,7 @@ void audio_extn_set_parameters(struct audio_device *adev, 
   audio_extn_ssr_set_parameters(adev, parms);

   audio_extn_hfp_set_parameters(adev, parms);

   audio_extn_dts_eagle_set_parameters(adev, parms);

   audio_extn_a2dp_set_parameters(parms);

   audio_extn_a2dp_set_parameters(parms, &a2dp_reconfig);

   audio_extn_ddp_set_parameters(adev, parms);

   audio_extn_ds2_set_parameters(adev, parms);

   audio_extn_customstereo_set_parameters(adev, parms);
@@ -1638,4 +1697,22 @@ int audio_extn_set_device_cfg_params(struct audio_device *adev, 
    return 0;

}



// TODO: remove after ext spkr file added

void *audio_extn_extspk_init(struct audio_device *adev __unused)

{

    return NULL;

}

void audio_extn_extspk_deinit(void *extn __unused)

{

}

void audio_extn_extspk_update(void* extn __unused)

{

}

void audio_extn_extspk_set_mode(void* extn __unused,

                                audio_mode_t mode __unused)

{

}

void audio_extn_extspk_set_voice_vol(void* extn __unused,

                                     float vol __unused)

{

}

hal/audio_extn/audio_extn.h

+90 −7

File changed.

Preview size limit exceeded, changes collapsed.