applications: nrf5340_audio: Use same preset for both unicast_servers

- When configuring QoS we need the same PD for both unicast_servers
 - Old bug overwrote the PD with the one from the preset
- OCT-3398

Signed-off-by: Alexander Svensen <[email protected]>

Author: alexsven

applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_client.c

@@ -447,7 +447,11 @@ static bool sink_parse_cb(struct bt_data *data, void *user_data)
 		switch (CONFIG_BT_AUDIO_PREF_SAMPLE_RATE_VALUE) {
 		case BT_AUDIO_CODEC_CFG_FREQ_48KHZ:
 			if (lc3_freq_bit & BT_AUDIO_CODEC_CAP_FREQ_48KHZ) {
-				lc3_preset_sink = lc3_preset_sink_48_4_1;
+				if (bt_audio_codec_cfg_get_freq(&lc3_preset_sink.codec_cfg) !=
+				    BT_AUDIO_CODEC_CFG_FREQ_48KHZ) {
+					lc3_preset_sink = lc3_preset_sink_48_4_1;
+				}
+
 				*(bool *)user_data = true;
 				/* Found what we were looking for, stop parsing LTV */
 				return false;
@@ -457,7 +461,10 @@ static bool sink_parse_cb(struct bt_data *data, void *user_data)
 
 		case BT_AUDIO_CODEC_CFG_FREQ_24KHZ:
 			if (lc3_freq_bit & BT_AUDIO_CODEC_CAP_FREQ_24KHZ) {
-				lc3_preset_sink = lc3_preset_sink_24_2_1;
+				if (bt_audio_codec_cfg_get_freq(&lc3_preset_sink.codec_cfg) !=
+				    BT_AUDIO_CODEC_CFG_FREQ_24KHZ) {
+					lc3_preset_sink = lc3_preset_sink_24_2_1;
+				}
 				*(bool *)user_data = true;
 				/* Found what we were looking for, stop parsing LTV */
 				return false;
@@ -467,7 +474,10 @@ static bool sink_parse_cb(struct bt_data *data, void *user_data)
 
 		case BT_AUDIO_CODEC_CFG_FREQ_16KHZ:
 			if (lc3_freq_bit & BT_AUDIO_CODEC_CAP_FREQ_16KHZ) {
-				lc3_preset_sink = lc3_preset_sink_16_2_1;
+				if (bt_audio_codec_cfg_get_freq(&lc3_preset_sink.codec_cfg) !=
+				    BT_AUDIO_CODEC_CFG_FREQ_16KHZ) {
+					lc3_preset_sink = lc3_preset_sink_16_2_1;
+				}
 				*(bool *)user_data = true;
 				/* Found what we were looking for, stop parsing LTV */
 				return false;
@@ -478,13 +488,22 @@ static bool sink_parse_cb(struct bt_data *data, void *user_data)
 
 		/* If no match with the preferred, revert to trying highest first */
 		if (lc3_freq_bit & BT_AUDIO_CODEC_CAP_FREQ_48KHZ) {
-			lc3_preset_sink = lc3_preset_sink_48_4_1;
+			if (bt_audio_codec_cfg_get_freq(&lc3_preset_sink.codec_cfg) !=
+			    BT_AUDIO_CODEC_CFG_FREQ_48KHZ) {
+				lc3_preset_sink = lc3_preset_sink_48_4_1;
+			}
 			*(bool *)user_data = true;
 		} else if (lc3_freq_bit & BT_AUDIO_CODEC_CAP_FREQ_24KHZ) {
-			lc3_preset_sink = lc3_preset_sink_24_2_1;
+			if (bt_audio_codec_cfg_get_freq(&lc3_preset_sink.codec_cfg) !=
+			    BT_AUDIO_CODEC_CFG_FREQ_24KHZ) {
+				lc3_preset_sink = lc3_preset_sink_24_2_1;
+			}
 			*(bool *)user_data = true;
 		} else if (lc3_freq_bit & BT_AUDIO_CODEC_CAP_FREQ_16KHZ) {
-			lc3_preset_sink = lc3_preset_sink_16_2_1;
+			if (bt_audio_codec_cfg_get_freq(&lc3_preset_sink.codec_cfg) !=
+			    BT_AUDIO_CODEC_CFG_FREQ_16KHZ) {
+				lc3_preset_sink = lc3_preset_sink_16_2_1;
+			}
 			*(bool *)user_data = true;
 		}