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

Commit 8b12163c authored by Ramlal Karra's avatar Ramlal Karra
Browse files

audio: Add support to enable split A2DP 

Change-Id: I5d710fda1a8d8fa3b5d85aaa2b3096cff8fd7ce5
parent c0739232

hal/Android.mk

+7 −0
Original line number Diff line number Diff line
@@ -189,6 +189,12 @@ ifneq ($(strip $(DOLBY_DDP)),true) 
endif

endif



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

    LOCAL_CFLAGS += -DSPLIT_A2DP_ENABLED

    LOCAL_SRC_FILES += audio_extn/a2dp.c

endif





LOCAL_SHARED_LIBRARIES := \

	liblog \

	libcutils \
@@ -196,6 +202,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libtinycompress \

	libaudioroute \

	libdl \

	libhardware \

	libexpat



LOCAL_C_INCLUDES += \

hal/audio_extn/a2dp.c

0 → 100644
+201 −0
Original line number Diff line number Diff line 
/*

* Copyright (c) 2015, 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

* met:

*     * Redistributions of source code must retain the above copyright

*       notice, this list of conditions and the following disclaimer.

*     * Redistributions in binary form must reproduce the above

*       copyright notice, this list of conditions and the following

*       disclaimer in the documentation and/or other materials provided

*       with the distribution.

*     * Neither the name of The Linux Foundation nor the names of its

*       contributors may be used to endorse or promote products derived

*       from this software without specific prior written permission.

*

* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

* ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

* 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_NDEBUG 0*/

#define LOG_NDDEBUG 0

#include <errno.h>

#include <cutils/log.h>



#include "audio_hw.h"

#include "platform.h"

#include "platform_api.h"

#include <stdlib.h>

#include <cutils/str_parms.h>

#include <hardware/audio.h>

#include <hardware/hardware.h>



#ifdef SPLIT_A2DP_ENABLED



struct a2dp_data{

    struct audio_stream_out *a2dp_stream;

    struct audio_hw_device *a2dp_device;

    bool a2dp_started;

    bool a2dp_suspended;

};



struct a2dp_data a2dp;



#define AUDIO_PARAMETER_A2DP_STARTED "A2dpStarted"



static int open_a2dp_output()

{

    hw_module_t *mod;

    int      format = AUDIO_FORMAT_PCM_16_BIT;

    int rc=0;

    uint32_t channels = AUDIO_CHANNEL_OUT_STEREO;

    uint32_t sampleRate = DEFAULT_OUTPUT_SAMPLING_RATE;

    struct audio_config config;



    ALOGV("open_a2dp_output");



    config.sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;

    config.channel_mask = AUDIO_CHANNEL_OUT_STEREO;

    config.format = AUDIO_FORMAT_PCM_16_BIT;



    if (a2dp.a2dp_device == NULL){

        rc = hw_get_module_by_class(AUDIO_HARDWARE_MODULE_ID, (const char*)"a2dp",

                                    (const hw_module_t**)&mod);

        if (rc != 0) {

            ALOGE("Could not get a2dp hardware module");

            return rc;

        }

        ALOGV("Opening A2DP device HAL for the first time");

        rc = audio_hw_device_open(mod, &a2dp.a2dp_device);

        if (rc != 0) {

            ALOGE("couldn't open a2dp audio hw device");

            return rc;

        }

    }



    rc = a2dp.a2dp_device->open_output_stream(a2dp.a2dp_device, 0,AUDIO_DEVICE_OUT_BLUETOOTH_A2DP,

                                    (audio_output_flags_t)AUDIO_OUTPUT_FLAG_NONE, &config, &a2dp.a2dp_stream, NULL);



    if( rc != 0 ) {

        ALOGE("Failed to open output stream for a2dp: status %d", rc);

    }



    a2dp.a2dp_suspended = false;

    return rc;

}



static int close_a2dp_output()

{



    ALOGV("close_a2dp_output");

    if(!a2dp.a2dp_device && !a2dp.a2dp_stream){

        ALOGE("No Active A2dp output found");

        return 0;

    }



    a2dp.a2dp_device->close_output_stream(a2dp.a2dp_device, a2dp.a2dp_stream);

    a2dp.a2dp_stream = NULL;

    a2dp.a2dp_started = false;

    a2dp.a2dp_suspended = true;



    return 0;

}



void audio_extn_a2dp_set_parameters(struct str_parms *parms)

{

     int ret, val;

     char value[32]={0};



     ret = str_parms_get_str(parms, AUDIO_PARAMETER_DEVICE_CONNECT, value,

                            sizeof(value));

     if( ret >= 0) {

         val = atoi(value);

         if (val & AUDIO_DEVICE_OUT_ALL_A2DP) {

             ALOGV("Received device connect request for A2DP");

             open_a2dp_output();

         }

     }



     ret = str_parms_get_str(parms, AUDIO_PARAMETER_DEVICE_DISCONNECT, value,

                         sizeof(value));



     if( ret >= 0) {

         val = atoi(value);

         if (val & AUDIO_DEVICE_OUT_ALL_A2DP) {

             ALOGV("Received device dis- connect request");

             close_a2dp_output();

         }

     }



     ret = str_parms_get_str(parms, "A2dpSuspended", value, sizeof(value));

     if (ret >= 0) {

         if (a2dp.a2dp_device && a2dp.a2dp_stream) {

             a2dp.a2dp_device->set_parameters(a2dp.a2dp_device, str_parms_to_str(parms));

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

                 a2dp.a2dp_suspended = true;

             } else {

                 a2dp.a2dp_suspended = false;

             }

         }

     }

}



void audio_extn_a2dp_start_playback()

{

    int ret = 0;

    char buf[20]={0};



    if (!a2dp.a2dp_started && a2dp.a2dp_device && a2dp.a2dp_stream) {



         snprintf(buf,sizeof(buf),"%s=true",AUDIO_PARAMETER_A2DP_STARTED);

        /* This call indicates BT HAL to start playback */

        ret =  a2dp.a2dp_device->set_parameters(a2dp.a2dp_device, buf);

        if (ret < 0 ) {

           ALOGE("BT controller start failed, retry on the next write");

           a2dp.a2dp_started = false;

        } else {

           a2dp.a2dp_started = true;

           ALOGV("Start playback successful to BT HAL");

        }

    }

}



void audio_extn_a2dp_stop_playback()

{

    int ret =0;

    char buf[20]={0};



    if ( a2dp.a2dp_started && a2dp.a2dp_device && a2dp.a2dp_stream) {



       snprintf(buf,sizeof(buf),"%s=false",AUDIO_PARAMETER_A2DP_STARTED);



        ret = a2dp.a2dp_device->set_parameters(a2dp.a2dp_device, buf);



        if (ret < 0)

            ALOGE("out_standby to BT HAL failed");

        else

            ALOGV("out_standby to BT HAL successful");



    }

    a2dp.a2dp_started = false;

    a2dp.a2dp_suspended = true;

}



void audio_extn_a2dp_init ()

{

  a2dp.a2dp_started = false;

  a2dp.a2dp_suspended = true;

  a2dp.a2dp_stream = NULL;

  a2dp.a2dp_device = NULL;

}

#endif // SPLIT_A2DP_ENABLED

hal/audio_extn/audio_extn.c

+1 −0
Original line number Diff line number Diff line
@@ -463,6 +463,7 @@ void audio_extn_set_parameters(struct audio_device *adev, 
   audio_extn_sound_trigger_set_parameters(adev, parms);

   audio_extn_listen_set_parameters(adev, parms);

   audio_extn_hfp_set_parameters(adev, parms);

   audio_extn_a2dp_set_parameters(parms);

   audio_extn_ddp_set_parameters(adev, parms);

   audio_extn_ds2_set_parameters(adev, parms);

   audio_extn_customstereo_set_parameters(adev, parms);

hal/audio_extn/audio_extn.h

+12 −0
Original line number Diff line number Diff line
@@ -143,6 +143,18 @@ void audio_extn_usb_set_proxy_sound_card(uint32_t sndcard_idx); 
bool audio_extn_usb_is_proxy_inuse();

#endif



#ifndef SPLIT_A2DP_ENABLED

#define audio_extn_a2dp_init()                       (0)

#define audio_extn_a2dp_start_playback()             (0)

#define audio_extn_a2dp_stop_playback()              (0)

#define audio_extn_a2dp_set_parameters(parms)      (0)

#else

void audio_extn_a2dp_init();

void audio_extn_a2dp_start_playback();

void audio_extn_a2dp_stop_playback();

void audio_extn_a2dp_set_parameters(struct str_parms *parms);

#endif



#ifndef SSR_ENABLED

#define audio_extn_ssr_init(in)                       (0)

#define audio_extn_ssr_deinit()                       (0)

hal/audio_hw.c

+8 −0
Original line number Diff line number Diff line
@@ -457,6 +457,10 @@ int enable_snd_device(struct audio_device *adev, 
    if(SND_DEVICE_IN_USB_HEADSET_MIC == snd_device)

       audio_extn_usb_start_capture(adev);



    if (SND_DEVICE_OUT_BT_A2DP == snd_device ||

       (SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP) == snd_device)

        audio_extn_a2dp_start_playback();



    if ((snd_device == SND_DEVICE_OUT_SPEAKER ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER) &&

        audio_extn_spkr_prot_is_enabled()) {
@@ -525,6 +529,10 @@ int disable_snd_device(struct audio_device *adev, 
        if(SND_DEVICE_IN_USB_HEADSET_MIC == snd_device)

            audio_extn_usb_stop_capture();



        if (SND_DEVICE_OUT_BT_A2DP == snd_device ||

           (SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP) == snd_device)

            audio_extn_a2dp_stop_playback();



        if ((snd_device == SND_DEVICE_OUT_SPEAKER ||

            snd_device == SND_DEVICE_OUT_VOICE_SPEAKER) &&

            audio_extn_spkr_prot_is_enabled()) {