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

Commit 15a2073d authored by Pavlin Radoslavov's avatar Pavlin Radoslavov Committed by android-build-merger
Browse files

Merge "Revert "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)"" 

am: 1024cf42

Change-Id: Icead26b39ebb7d3b0dcc83f22c9406fee8c997e9
parents 2e23c504 1024cf42

system/stack/a2dp/a2dp_sbc_encoder.cc

+14 −7
Original line number Diff line number Diff line
@@ -753,15 +753,22 @@ static uint8_t calculate_max_frames_per_packet(void) { 


  LOG_VERBOSE(LOG_TAG, "%s: original AVDTP MTU size: %d", __func__,

              a2dp_sbc_encoder_cb.TxAaMtuSize);

  if (a2dp_sbc_encoder_cb.is_peer_edr &&

      !a2dp_sbc_encoder_cb.peer_supports_3mbps) {

    // This condition would be satisfied only if the remote device is

    // EDR and supports only 2 Mbps, but the effective AVDTP MTU size

    // exceeds the 2DH5 packet size.

    LOG_VERBOSE(LOG_TAG,

                "%s: The remote device is EDR but does not support 3 Mbps",

                __func__);



  // Restrict the MTU - even though some Sink devices are advertising large

  // MTU, they are not able to handle the packets and are stuttering.

    if (effective_mtu_size > MAX_2MBPS_AVDTP_MTU) {

      LOG_WARN(LOG_TAG, "%s: Restricting AVDTP MTU size to %d", __func__,

               MAX_2MBPS_AVDTP_MTU);

      effective_mtu_size = MAX_2MBPS_AVDTP_MTU;

      a2dp_sbc_encoder_cb.TxAaMtuSize = effective_mtu_size;

    }

  }



  if (!p_encoder_params->s16NumOfSubBands) {

    LOG_ERROR(LOG_TAG, "%s: SubBands are set to 0, resetting to %d", __func__,