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

Commit 0ad13fb4 authored by Pavlin Radoslavov's avatar Pavlin Radoslavov
Browse files

Suppress AVDTP delay reporting logs per data packet 

If AVDTP delay reporting is enabled, then several log messages
will be printed by default practically for each audio data packet.
Change the log level for those messages to DEBUG.

Also:
 * Add missing event decoding for A2DP_CTRL_GET_PRESENTATION_POSITION
 * Remove "default" switch statement inside audio_a2dp_hw_dump_ctrl_event()
   to catch missing "case" statements if a new tA2DP_CTRL_CMD event is
   added in the future.

Bug: 32755225
Test: Manual - A2DP streaming, check the logcat output
Change-Id: I3d1b1c2f6532c72af0e1e7aa5566572e13ed1684
parent 4943d63e

system/audio_a2dp_hw/src/audio_a2dp_hw_utils.cc

+2 −3
Original line number Diff line number Diff line
@@ -34,8 +34,7 @@ const char* audio_a2dp_hw_dump_ctrl_event(tA2DP_CTRL_CMD event) { 
    CASE_RETURN_STR(A2DP_CTRL_GET_OUTPUT_AUDIO_CONFIG)

    CASE_RETURN_STR(A2DP_CTRL_SET_OUTPUT_AUDIO_CONFIG)

    CASE_RETURN_STR(A2DP_CTRL_CMD_OFFLOAD_START)

    default:

      break;

    CASE_RETURN_STR(A2DP_CTRL_GET_PRESENTATION_POSITION)

  }



  return "UNKNOWN A2DP_CTRL_CMD";

system/btif/src/btif_a2dp_control.cc

+34 −5
Original line number Diff line number Diff line
@@ -75,10 +75,17 @@ static void btif_a2dp_recv_ctrl_data(void) { 
    return;

  }



  // Don't log A2DP_CTRL_GET_PRESENTATION_POSITION by default, because it

  // could be very chatty when audio is streaming.

  if (cmd == A2DP_CTRL_GET_PRESENTATION_POSITION) {

    APPL_TRACE_DEBUG("%s: a2dp-ctrl-cmd : %s", __func__,

                     audio_a2dp_hw_dump_ctrl_event(cmd));

  } else {

    APPL_TRACE_WARNING("%s: a2dp-ctrl-cmd : %s", __func__,

                       audio_a2dp_hw_dump_ctrl_event(cmd));

  a2dp_cmd_pending = cmd;

  }



  a2dp_cmd_pending = cmd;

  switch (cmd) {

    case A2DP_CTRL_CMD_CHECK_READY:

      if (btif_a2dp_source_media_task_is_shutting_down()) {
@@ -296,14 +303,29 @@ static void btif_a2dp_recv_ctrl_data(void) { 
      btif_a2dp_command_ack(A2DP_CTRL_ACK_FAILURE);

      break;

  }



  // Don't log A2DP_CTRL_GET_PRESENTATION_POSITION by default, because it

  // could be very chatty when audio is streaming.

  if (cmd == A2DP_CTRL_GET_PRESENTATION_POSITION) {

    APPL_TRACE_DEBUG("%s: a2dp-ctrl-cmd : %s DONE", __func__,

                     audio_a2dp_hw_dump_ctrl_event(cmd));

  } else {

    APPL_TRACE_WARNING("%s: a2dp-ctrl-cmd : %s DONE", __func__,

                       audio_a2dp_hw_dump_ctrl_event(cmd));

  }

}



static void btif_a2dp_ctrl_cb(UNUSED_ATTR tUIPC_CH_ID ch_id,

                              tUIPC_EVENT event) {

  // Don't log UIPC_RX_DATA_READY_EVT by default, because it

  // could be very chatty when audio is streaming.

  if (event == UIPC_RX_DATA_READY_EVT) {

    APPL_TRACE_DEBUG("%s: A2DP-CTRL-CHANNEL EVENT %s", __func__,

                     dump_uipc_event(event));

  } else {

    APPL_TRACE_WARNING("%s: A2DP-CTRL-CHANNEL EVENT %s", __func__,

                       dump_uipc_event(event));

  }



  switch (event) {

    case UIPC_OPEN_EVT:
@@ -375,8 +397,15 @@ static void btif_a2dp_data_cb(UNUSED_ATTR tUIPC_CH_ID ch_id, 
void btif_a2dp_command_ack(tA2DP_CTRL_ACK status) {

  uint8_t ack = status;



  // Don't log A2DP_CTRL_GET_PRESENTATION_POSITION by default, because it

  // could be very chatty when audio is streaming.

  if (a2dp_cmd_pending == A2DP_CTRL_GET_PRESENTATION_POSITION) {

    APPL_TRACE_DEBUG("%s: ## a2dp ack : %s, status %d ##", __func__,

                     audio_a2dp_hw_dump_ctrl_event(a2dp_cmd_pending), status);

  } else {

    APPL_TRACE_WARNING("%s: ## a2dp ack : %s, status %d ##", __func__,

                       audio_a2dp_hw_dump_ctrl_event(a2dp_cmd_pending), status);

  }



  /* Sanity check */

  if (a2dp_cmd_pending == A2DP_CTRL_CMD_NONE) {