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

Commit da99a598 authored by Srinu Jella's avatar Srinu Jella Committed by Aniket Kumar Lata
Browse files

Bluetooth: Load BT host ipc lib based on build 

- Changes made to load the BT host IPC library
  based on build type.

- Due to common vendor image, QTI build's IPC
  library got renamed.

CRs-Fixed: 2373792
Change-Id: I2fcc5da9600a0a4b65f70603835a16913aeb0562
parent e859bba7

hal/audio_extn/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -373,7 +373,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    libtinycompress \

    libaudioroute \

    libdl \

    libexpat

    libexpat \

    libqti_vndfwk_detect



LOCAL_C_INCLUDES := \

    $(PRIMARY_HAL_PATH) \

hal/audio_extn/a2dp.c

+43 −32
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <log/log.h>

#include <dlfcn.h>

#include <pthread.h>

#include <vndfwk-detect.h>

#include "audio_hw.h"

#include "platform.h"

#include "platform_api.h"
@@ -51,6 +52,7 @@ 


#define AUDIO_PARAMETER_A2DP_STARTED "A2dpStarted"

#define BT_IPC_SOURCE_LIB_NAME  "libbthost_if.so"

#define BT_IPC_SOURCE_LIB_NAME_QTI "libbthost_if_qti.so"

#define BT_IPC_SINK_LIB_NAME    "libbthost_if_sink.so"

#define MEDIA_FMT_NONE                                     0

#define MEDIA_FMT_AAC                                      0x00010DA6
@@ -815,28 +817,39 @@ static void open_a2dp_source() 


    ALOGD(" Open A2DP source start ");

    if (a2dp.bt_lib_source_handle == NULL) {

        if(!isRunningWithVendorEnhancedFramework()) {

            ALOGD(" Requesting for BT lib handle");

            a2dp.bt_lib_source_handle = dlopen(BT_IPC_SOURCE_LIB_NAME, RTLD_NOW);



            if (a2dp.bt_lib_source_handle == NULL) {

                ALOGE("%s: DLOPEN failed for %s", __func__, BT_IPC_SOURCE_LIB_NAME);

                ret = -ENOSYS;

                goto init_fail;

            }

        } else {

            ALOGD(" Requesting for BT QTI lib handle");

            a2dp.bt_lib_source_handle = dlopen(BT_IPC_SOURCE_LIB_NAME_QTI, RTLD_NOW);

            if (a2dp.bt_lib_source_handle == NULL) {

                ALOGE("%s: DLOPEN failed for %s", __func__, BT_IPC_SOURCE_LIB_NAME_QTI);

                ret = -ENOSYS;

                goto init_fail;

            }

        }

    }



    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_stream_start");

                  dlsym(a2dp.bt_lib_source_handle, "audio_start_stream");

    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_stream_suspend");

                  dlsym(a2dp.bt_lib_source_handle, "audio_suspend_stream");

    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_stream_stop");

                   dlsym(a2dp.bt_lib_source_handle, "audio_stop_stream");

    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)
@@ -847,8 +860,6 @@ static void open_a2dp_source() 
                  dlsym(a2dp.bt_lib_source_handle,"audio_is_scrambling_enabled");

    a2dp.audio_is_tws_mono_mode_enable = (audio_is_tws_mono_mode_enable_t)

                   dlsym(a2dp.bt_lib_source_handle,"isTwsMonomodeEnable");

        }

    }



    if (a2dp.bt_lib_source_handle && a2dp.audio_source_open) {

        if (a2dp.bt_state_source == A2DP_STATE_DISCONNECTED) {