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

Commit 2fa95aa6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check if need codec switching before start streaming" into tm-qpr-dev am: f9001f6c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/19492291



Change-Id: I3b0841372d03c2e0354efdb25699a3f85c49c361
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0235e1c1 f9001f6c

system/audio_hal_interface/aidl/a2dp_encoding_aidl.cc

+2 −1
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ BluetoothAudioCtrlAck A2dpTransport::StartRequest(bool is_low_latency) { 
    return a2dp_ack_to_bt_audio_ctrl_ack(A2DP_CTRL_ACK_SUCCESS);

  }

  if (btif_av_stream_ready()) {

    // check if codec needs to be switched prior to stream start

    invoke_switch_codec_cb(is_low_latency);

    /*

     * Post start event and wait for audio path to open.

     * If we are the source, the ACK will be sent after the start
@@ -96,7 +98,6 @@ BluetoothAudioCtrlAck A2dpTransport::StartRequest(bool is_low_latency) { 
      return a2dp_ack_to_bt_audio_ctrl_ack(A2DP_CTRL_ACK_PENDING);

    }

    a2dp_pending_cmd_ = A2DP_CTRL_CMD_NONE;

    invoke_switch_codec_cb(is_low_latency);

    return a2dp_ack_to_bt_audio_ctrl_ack(A2DP_CTRL_ACK_SUCCESS);

  }

  LOG(ERROR) << __func__ << ": AV stream is not ready to start";