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

Commit 09e4252d authored by Sanket Agarwal's avatar Sanket Agarwal
Browse files

A2DP Sink:Audio Rendering patch and AutoConnect Functionality 

 -  Add autoconnect functionality for A2DP Sink
 -  Use AudioPatch mechanism for sink playback
 -  AudioFocus approach to manage concurrencies

A2DP Sink: Support for AudioTrack

- add support for audiotrack to render audio data
- add support for AVRCP State to trigger audio
  rendering

AVRCP_CTRL: add support for AVRCP 1.3 Controller

- fill placeholder function for AVRCP 1.3
- add supporting classes to handle AVRCP Commands

AVRCP Controller: Support for retaining volume level and blocking streaming from remote.

- retain volume level on new connection request
- block streaming from remote.

Change-Id: I8c31fd1779b196ced0fb0870855b93263ea331ec
parent 28ca6b2d

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ 
    <uses-permission android:name="android.permission.VIBRATE" />

    <uses-permission android:name="android.permission.DEVICE_POWER" />

    <uses-permission android:name="android.permission.REAL_GET_TASKS" />

    <uses-permission android:name="android.permission.MODIFY_AUDIO_ROUTING" />



    <!-- For PBAP Owner Vcard Info -->

    <uses-permission android:name="android.permission.READ_PROFILE"/>

jni/com_android_bluetooth_a2dp_sink.cpp

+35 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ namespace android { 
static jmethodID method_onConnectionStateChanged;

static jmethodID method_onAudioStateChanged;

static jmethodID method_onAudioConfigChanged;

static jmethodID method_onAudioFocusRequested;



static const btav_interface_t *sBluetoothA2dpInterface = NULL;

static jobject mCallbacksObj = NULL;
@@ -116,11 +117,34 @@ static void bta2dp_audio_config_callback(bt_bdaddr_t *bd_addr, uint32_t sample_r 
    sCallbackEnv->DeleteLocalRef(addr);

}



static void bta2dp_audio_focus_request_callback(bt_bdaddr_t *bd_addr) {

    jbyteArray addr;



    ALOGI("%s", __FUNCTION__);



    if (!checkCallbackThread()) {                                       \

        ALOGE("Callback: '%s' is not called on the correct thread", __FUNCTION__); \

        return;                                                         \

    }

    addr = sCallbackEnv->NewByteArray(sizeof(bt_bdaddr_t));

    if (!addr) {

        ALOGE("Fail to new jbyteArray bd addr for connection state");

        checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);

        return;

    }



    sCallbackEnv->SetByteArrayRegion(addr, 0, sizeof(bt_bdaddr_t), (jbyte*) bd_addr);

    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onAudioFocusRequested, addr);

    checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);

    sCallbackEnv->DeleteLocalRef(addr);

}



static btav_callbacks_t sBluetoothA2dpCallbacks = {

    sizeof(sBluetoothA2dpCallbacks),

    bta2dp_connection_state_callback,

    bta2dp_audio_state_callback,

    bta2dp_audio_config_callback

    bta2dp_audio_config_callback,

    bta2dp_audio_focus_request_callback

};



static void classInitNative(JNIEnv* env, jclass clazz) {
@@ -137,6 +161,9 @@ static void classInitNative(JNIEnv* env, jclass clazz) { 
    method_onAudioConfigChanged =

        env->GetMethodID(clazz, "onAudioConfigChanged", "([BII)V");



    method_onAudioFocusRequested =

        env->GetMethodID(clazz, "onAudioFocusRequested", "([B)V");



    ALOGI("%s: succeeds", __FUNCTION__);

}
@@ -237,12 +264,19 @@ static jboolean disconnectA2dpNative(JNIEnv *env, jobject object, jbyteArray add 
    return (status == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;

}



static void informAudioFocusStateNative(JNIEnv *env, jobject object, jint focus_state) {

    if (!sBluetoothA2dpInterface) return;



    sBluetoothA2dpInterface->audio_focus_state((uint8_t)focus_state);



}

static JNINativeMethod sMethods[] = {

    {"classInitNative", "()V", (void *) classInitNative},

    {"initNative", "()V", (void *) initNative},

    {"cleanupNative", "()V", (void *) cleanupNative},

    {"connectA2dpNative", "([B)Z", (void *) connectA2dpNative},

    {"disconnectA2dpNative", "([B)Z", (void *) disconnectA2dpNative},

    {"informAudioFocusStateNative", "(I)V", (void *) informAudioFocusStateNative},

};



int register_com_android_bluetooth_a2dp_sink(JNIEnv* env)

jni/com_android_bluetooth_avrcp_controller.cpp

+496 −3

File changed.

Preview size limit exceeded, changes collapsed.

src/com/android/bluetooth/a2dp/A2dpSinkService.java

+60 −0

File changed.

Preview size limit exceeded, changes collapsed.

src/com/android/bluetooth/a2dp/A2dpSinkStateMachine.java

+472 −4

File changed.

Preview size limit exceeded, changes collapsed.