summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMingbo Zhang <quic_mingboz@quicinc.com>2022-11-23 11:43:17 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2023-04-10 19:35:34 -0700
commit6bd6743d16968d45051b82944c93167db71e0582 (patch)
tree47f6120cfbe97df19e564fe639b90940c2fd9488
parentf20503c97e19542e15f2e94b0d4fc21fed70dfa1 (diff)
Add A2DP_CTRL_ACK_SHORT_WAIT_ERR
Add A2DP_CTRL_ACK_SHORT_WAIT_ERR support for qc hal Change-Id: I4fa020db5cd6659a9bc9476ee3151c3c30d1b747 CRs-Fixed: 3345248
-rw-r--r--audio_a2dp_hw/include/audio_a2dp_hw.h3
-rw-r--r--audio_hal_interface/a2dp_encoding.cc2
-rw-r--r--audio_hal_interface/client_interface.cc2
-rw-r--r--audio_hal_interface/client_interface.h5
4 files changed, 10 insertions, 2 deletions
diff --git a/audio_a2dp_hw/include/audio_a2dp_hw.h b/audio_a2dp_hw/include/audio_a2dp_hw.h
index 0d95c1b5b..fd92ee31a 100644
--- a/audio_a2dp_hw/include/audio_a2dp_hw.h
+++ b/audio_a2dp_hw/include/audio_a2dp_hw.h
@@ -139,7 +139,8 @@ typedef enum {
A2DP_CTRL_ACK_PENDING,
A2DP_CTRL_ACK_LONG_WAIT_ERR,
A2DP_CTRL_ACK_UNKNOWN,
- A2DP_CTRL_ACK_STREAM_SUSPENDED
+ A2DP_CTRL_ACK_STREAM_SUSPENDED,
+ A2DP_CTRL_ACK_SHORT_WAIT_ERR,
} tA2DP_CTRL_ACK;
typedef uint32_t tA2DP_SAMPLE_RATE;
diff --git a/audio_hal_interface/a2dp_encoding.cc b/audio_hal_interface/a2dp_encoding.cc
index c4a6692b2..77890a4c0 100644
--- a/audio_hal_interface/a2dp_encoding.cc
+++ b/audio_hal_interface/a2dp_encoding.cc
@@ -407,6 +407,8 @@ BluetoothAudioCtrlAck a2dp_ack_to_bt_audio_ctrl_ack(tA2DP_CTRL_ACK ack) {
return BluetoothAudioCtrlAck::FAILURE;
case A2DP_CTRL_ACK_LONG_WAIT_ERR:
return BluetoothAudioCtrlAck::FAILURE_LONG_WAIT;
+ case A2DP_CTRL_ACK_SHORT_WAIT_ERR:
+ return BluetoothAudioCtrlAck::FAILURE_SHORT_WAIT;
default:
return BluetoothAudioCtrlAck::FAILURE;
}
diff --git a/audio_hal_interface/client_interface.cc b/audio_hal_interface/client_interface.cc
index 480db4d29..0068b4a0e 100644
--- a/audio_hal_interface/client_interface.cc
+++ b/audio_hal_interface/client_interface.cc
@@ -63,6 +63,8 @@ std::ostream& operator<<(std::ostream& os, const BluetoothAudioCtrlAck& ack) {
return os << "FAILURE";
case BluetoothAudioCtrlAck::FAILURE_LONG_WAIT:
return os << "FAILURE_LONG_WAIT";
+ case BluetoothAudioCtrlAck::FAILURE_SHORT_WAIT:
+ return os << "FAILURE_SHORT_WAIT";
default:
return os << "UNDEFINED " << static_cast<int8_t>(ack);
}
diff --git a/audio_hal_interface/client_interface.h b/audio_hal_interface/client_interface.h
index 859ac86cc..981fd37f1 100644
--- a/audio_hal_interface/client_interface.h
+++ b/audio_hal_interface/client_interface.h
@@ -72,7 +72,8 @@ enum class BluetoothAudioCtrlAck : uint8_t {
FAILURE_BUSY,
FAILURE_DISCONNECTING,
FAILURE,
- FAILURE_LONG_WAIT
+ FAILURE_LONG_WAIT,
+ FAILURE_SHORT_WAIT,
};
std::ostream& operator<<(std::ostream& os, const BluetoothAudioCtrlAck& ack);
@@ -92,6 +93,8 @@ inline BluetoothAudioStatus BluetoothAudioCtrlAckToHalStatus(
return BluetoothAudioStatus::FAILURE_DISC_IN_PROGRESS;
case BluetoothAudioCtrlAck::FAILURE_LONG_WAIT:
return BluetoothAudioStatus::LW_ERROR;
+ case BluetoothAudioCtrlAck::FAILURE_SHORT_WAIT:
+ return BluetoothAudioStatus::SW_ERROR;
default:
return BluetoothAudioStatus::FAILURE;
}