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

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

Merge "Reduced the log verbosity level for aptX/aptX-HD data packets" 

am: eab96967

Change-Id: I762b7e65001740fec55515f7121f5217c4dbb455
parents 790370e0 eab96967

system/stack/a2dp/a2dp_sbc_encoder.cc

+1 −1
Original line number Diff line number Diff line
@@ -752,7 +752,7 @@ static uint8_t calculate_max_frames_per_packet(void) { 
    // EDR and supports only 2 Mbps, but the effective AVDTP MTU size

    // exceeds the 2DH5 packet size.

    LOG_VERBOSE(LOG_TAG,

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

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

                __func__);



    if (effective_mtu_size > MAX_2MBPS_AVDTP_MTU) {

system/stack/a2dp/a2dp_vendor_aptx_encoder.cc

+9 −9
Original line number Diff line number Diff line
@@ -353,13 +353,13 @@ static void aptx_update_framing_params(tAPTX_FRAMING_PARAMS* framing_params) { 
    }

  }



  LOG_DEBUG(LOG_TAG,

  LOG_VERBOSE(LOG_TAG,

              "%s: sleep_time_ns = %" PRIu64

              " aptx_bytes = %u "

              "pcm_bytes_per_read = %u pcm_reads = %u frame_size_counter = %u",

            __func__, framing_params->sleep_time_ns, framing_params->aptx_bytes,

            framing_params->pcm_bytes_per_read, framing_params->pcm_reads,

            framing_params->frame_size_counter);

              __func__, framing_params->sleep_time_ns,

              framing_params->aptx_bytes, framing_params->pcm_bytes_per_read,

              framing_params->pcm_reads, framing_params->frame_size_counter);

}



void a2dp_vendor_aptx_feeding_reset(void) {
@@ -423,7 +423,7 @@ void a2dp_vendor_aptx_send_frames(uint64_t timestamp_us) { 
  const int COMPRESSION_RATIO = 4;

  size_t encoded_bytes = pcm_bytes_encoded / COMPRESSION_RATIO;

  p_buf->len += encoded_bytes;

  LOG_DEBUG(LOG_TAG, "%s: encoded %zu PCM bytes to %zu", __func__,

  LOG_VERBOSE(LOG_TAG, "%s: encoded %zu PCM bytes to %zu", __func__,

              pcm_bytes_encoded, encoded_bytes);



  // Update the RTP timestamp

system/stack/a2dp/a2dp_vendor_aptx_hd_encoder.cc

+11 −11
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static void aptx_hd_update_framing_params( 
      framing_params->frame_size_counter = 0;

  }



  LOG_DEBUG(LOG_TAG,

  LOG_VERBOSE(LOG_TAG,

              "%s: sleep_time_ns = %" PRIu64

              " aptx_hd_bytes = %u "

              "pcm_bytes_per_read = %u pcm_reads = %u frame_size_counter = %u",
@@ -376,7 +376,7 @@ void a2dp_vendor_aptx_hd_send_frames(uint64_t timestamp_us) { 
  //

  // Read the PCM data and encode it

  //

  LOG_DEBUG(LOG_TAG, "%s: %u PCM reads of size %u", __func__,

  LOG_VERBOSE(LOG_TAG, "%s: %u PCM reads of size %u", __func__,

              framing_params->pcm_reads, framing_params->pcm_bytes_per_read);

  size_t encoded_ptr_index = 0;

  size_t pcm_bytes_encoded = 0;
@@ -409,7 +409,7 @@ void a2dp_vendor_aptx_hd_send_frames(uint64_t timestamp_us) { 
  const int COMPRESSION_RATIO = 4;

  size_t encoded_bytes = pcm_bytes_encoded / COMPRESSION_RATIO;

  p_buf->len += encoded_bytes;

  LOG_DEBUG(LOG_TAG, "%s: encoded %zu PCM bytes to %zu", __func__,

  LOG_VERBOSE(LOG_TAG, "%s: encoded %zu PCM bytes to %zu", __func__,

              pcm_bytes_encoded, encoded_bytes);



  // Update the RTP timestamp