applications: nrf_audio: Fix deadlock between MCS and streaming state

- Override MCS state if it doesn't match current streaming state
- Add timeout to CAP procedures to capture disconnects during proc
- OCT-3775

Signed-off-by: Alexander Svensen <alexander.svensen@nordicsemi.no>

Author: alexsven

applications/nrf_audio/src/bluetooth/bt_content_control/bt_content_ctrl.c

@@ -131,6 +131,13 @@ int bt_content_ctrl_uuid_populate(struct net_buf_simple *uuid_buf)
 	return 0;
 }
 
+void bt_content_ctrl_state_override(bool playing)
+{
+	if (IS_ENABLED(CONFIG_BT_MCS)) {
+		bt_content_ctrl_media_state_override(playing);
+	}
+}
+
 int bt_content_ctrl_init(void)
 {
 	int ret;

applications/nrf_audio/src/bluetooth/bt_content_control/bt_content_ctrl.h

@@ -70,6 +70,17 @@ int bt_content_ctrl_uuid_populate(struct net_buf_simple *uuid_buf);
  */
 bool bt_content_ctlr_media_state_playing(void);
 
+/**
+ * @brief	Override the current state of the media player.
+ *
+ * @note	This is needed if the media player state is not in sync with the actual state of
+ *		stream. This can happen if a device disconnects at the same time as a play/pause
+ *		command is sent.
+ *
+ * @param[in]	playing	Indicate whether the content should be in the playing state.
+ */
+void bt_content_ctrl_state_override(bool playing);
+
 /**
  * @brief	Initialize the content control module.
  *

applications/nrf_audio/src/bluetooth/bt_content_control/media/bt_content_ctrl_media.c

@@ -332,6 +332,17 @@ static int mpl_cmd_send(struct bt_conn *conn, struct mpl_cmd *cmd)
 	return 0;
 }
 
+void bt_content_ctrl_media_state_override(bool playing)
+{
+	if (IS_ENABLED(CONFIG_BT_MCS)) {
+		if (playing) {
+			media_player_state = BT_MCS_MEDIA_STATE_PLAYING;
+		} else {
+			media_player_state = BT_MCS_MEDIA_STATE_PAUSED;
+		}
+	}
+}
+
 int bt_content_ctrl_media_discover(struct bt_conn *conn)
 {
 	int ret;

applications/nrf_audio/src/bluetooth/bt_content_control/media/bt_content_ctrl_media_internal.h

@@ -16,6 +16,17 @@
  */
 typedef void (*bt_content_ctrl_media_play_pause_cb)(bool play);
 
+/**
+ * @brief	Override the current state of the media player.
+ *
+ * @note	This is needed if the media player state is not in sync with the actual state of
+ *		stream. This can happen if a device disconnects at the same time as a play/pause
+ *		command is sent.
+ *
+ * @param[in]	playing	Indicate whether the media player should be in the playing state.
+ */
+void bt_content_ctrl_media_state_override(bool playing);
+
 /**
  * @brief	Discover Media Control Service and the included services.
  *

applications/nrf_audio/src/bluetooth/bt_stream/unicast/server_store.c

@@ -1151,6 +1151,7 @@ int srv_store_all_ep_state_count(enum bt_bap_ep_state state, enum bt_audio_dir d
 				srv_idx, count);
 			return count;
 		}
+
 		count_total += count;
 	}