applications: nrf5340_audio: Decode/Encode to use net_bufs + meta data

Improvements to the selection of gateway locations and
removal of unnecessary memset()

Signed-off-by: Graham Wacey <[email protected]>

Author: gWacey

applications/nrf5340_audio/broadcast_source/overlay-broadcast_source.conf

@@ -26,7 +26,3 @@ CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
 CONFIG_LC3_ENC_CHAN_MAX=2
 CONFIG_AUDIO_ENCODE_CHANNELS_MAX=2
 CONFIG_ENTROPY_GENERATOR=y
-
-
-CONFIG_DEVICE_LOCATION_SET_COMPILE_TIME=y
-CONFIG_DEVICE_LOCATION_AT_COMPILE_TIME=3

applications/nrf5340_audio/src/audio/audio_system.c

@@ -101,22 +101,21 @@ static void audio_gateway_configure(void)
 		sw_codec_cfg.decoder.channel_mode = SW_CODEC_MONO;
 	}
 
-	device_location_get(&sw_codec_cfg.encoder.audio_loc);
-
 	if (IS_ENABLED(CONFIG_MONO_TO_ALL_RECEIVERS)) {
-		sw_codec_cfg.encoder.audio_loc = BT_AUDIO_LOCATION_MONO_AUDIO;
-	}
-
-	if (sw_codec_cfg.encoder.audio_loc == BT_AUDIO_LOCATION_MONO_AUDIO ||
-	    (POPCOUNT(sw_codec_cfg.encoder.audio_loc) == 1)) {
 		sw_codec_cfg.encoder.num_ch = 1;
+		sw_codec_cfg.encoder.audio_loc = BT_AUDIO_LOCATION_MONO_AUDIO;
 		sw_codec_cfg.encoder.channel_mode = SW_CODEC_MONO;
-
-		return;
+	} else {
+		/* For multi-channel on the gateway, only left and
+		 * right front are currently supported
+		 */
+		sw_codec_cfg.encoder.num_ch = 2;
+		sw_codec_cfg.encoder.audio_loc =
+			BT_AUDIO_LOCATION_FRONT_LEFT | BT_AUDIO_LOCATION_FRONT_RIGHT;
+		sw_codec_cfg.encoder.channel_mode = SW_CODEC_MULTICHANNEL;
 	}
 
-	sw_codec_cfg.encoder.num_ch = POPCOUNT(sw_codec_cfg.encoder.audio_loc);
-	sw_codec_cfg.encoder.channel_mode = SW_CODEC_MULTICHANNEL;
+	LOG_INF("Gateway configured for %d encoder channels", sw_codec_cfg.encoder.num_ch);
 }
 
 static void audio_headset_configure(void)
@@ -142,7 +141,9 @@ static void audio_headset_configure(void)
 
 	switch ((uint32_t)sw_codec_cfg.decoder.audio_loc) {
 	case BT_AUDIO_LOCATION_MONO_AUDIO:
+	/* Fall through*/
 	case BT_AUDIO_LOCATION_FRONT_LEFT:
+	/* Fall through*/
 	case BT_AUDIO_LOCATION_FRONT_RIGHT:
 		sw_codec_cfg.decoder.channel_mode = SW_CODEC_MONO;
 		break;

applications/nrf5340_audio/src/audio/sw_codec_select.c

@@ -154,9 +154,6 @@ int sw_codec_encode(struct net_buf *audio_frame_in, struct net_buf *audio_frame_
 			return -EINVAL;
 		}
 
-		/* Clear all output locations to ensure any unused locations are zero */
-		memset(audio_frame_out->data, 0, audio_frame_out->size);
-
 		/* Encode only the common channel(s) between the input and output locations. */
 		while (loc_out && loc_in) {
 			if (loc_out & loc_in & 0x01) {

applications/nrf5340_audio/src/utils/fw_info_app.c.in

@@ -31,18 +31,25 @@ int fw_info_app_print(void)
 
 #if (CONFIG_DEBUG)
 	int ret;
-	enum bt_audio_location location;
-
-	device_location_get(&location);
 
 	LOG_INF("------- DEBUG BUILD -------");
 
 #if (CONFIG_AUDIO_DEV == HEADSET)
+	enum bt_audio_location location;
+
+	device_location_get(&location);
+
 	if (location == BT_AUDIO_LOCATION_MONO_AUDIO){
 		LOG_ERR("HEADSET location %s is not supported", bt_audio_location_bit_to_str(location));
 		return -EINVAL;
 	}
 
+	for (int i = 0; i < (CHAR_BIT * sizeof(enum bt_audio_location)); i++) {
+		if (location & BIT(i)) {
+			LOG_INF(COLOR_CYAN "HEADSET location: %s" COLOR_RESET, bt_audio_location_bit_to_str(BIT(i)));
+		}
+	}
+
 	if (location == BT_AUDIO_LOCATION_FRONT_LEFT) {
 		ret = log_set_tag(HS_LOC_L_TAG);
 	} else if (location == BT_AUDIO_LOCATION_FRONT_RIGHT) {
@@ -62,19 +69,9 @@ int fw_info_app_print(void)
 	if (ret) {
 		return ret;
 	}
-#else
-	/* Make sure that we have the correct device */
-	BUILD_ASSERT(0, "Unrecognized audio device");
+	LOG_INF(COLOR_CYAN "GATEWAY device" COLOR_RESET);
 #endif /* (CONFIG_AUDIO_DEV == HEADSET) */
-
-	for (int i = 0; i < (CHAR_BIT * sizeof(enum bt_audio_location)); i++) {
-		if (location & BIT(i)) {
-			LOG_INF(COLOR_CYAN "%s location: %s" COLOR_RESET, CONFIG_AUDIO_DEV == HEADSET ?  "HEADSET" : "GATEWAY", bt_audio_location_bit_to_str(BIT(i)));
-		}
-	}
-
 #endif /* (CONFIG_DEBUG) */
 
-
 	return 0;
 }

applications/nrf5340_audio/tools/buildprog/buildprog.py

@@ -78,8 +78,12 @@ def __print_dev_conf(device_list):
     ]
 
     for device in device_list:
-        loc_names = str([loc.name for loc in device.location])
-        loc_names = loc_names.replace("[", "").replace("]", "").replace("'", "")
+        if device.nrf5340_audio_dk_dev.value == AudioDevice.headset:
+            loc_names = str([loc.name for loc in device.location])
+            loc_names = loc_names.replace("[", "").replace("]", "").replace("'", "")
+        else:
+            loc_names = "NA"
+
         row = []
         row.append(device.nrf5340_audio_dk_snr)
         color = Fore.GREEN if device.snr_connected else Fore.YELLOW
@@ -349,17 +353,28 @@ def __main():
         dev_arr = json.load(f)
     device_list = []
     for dev in dev_arr:
-        if "channel" in dev:
-            print("Using deprecated location format. Convert to using Location enum")
-            if dev["channel"] == "left":
-                location = [Location.FRONT_LEFT]
-            elif dev["channel"] == "right":
-                location = [Location.FRONT_RIGHT]
+        if AudioDevice[dev["nrf5340_audio_dk_dev"]] == AudioDevice.headset:
+            if "channel" in dev:
+                print("Using deprecated location format. Convert to using Location enum")
+                if dev["channel"] == "left":
+                    location = [Location.FRONT_LEFT]
+                elif dev["channel"] == "right":
+                    location = [Location.FRONT_RIGHT]
+                else:
+                    print("Invalid location, setting to MONO_AUDIO")
+                    location = [Location.MONO_AUDIO]
+            elif dev["location"]:
+                try:
+                    location = [Location[name] for name in dev["location"]]
+                except KeyError as e:
+                    raise KeyError(f"Invalid location name {e} for headset in JSON file")
             else:
-                print("Invalid location, setting to MONO_AUDIO")
+                print("No location specified for headset, setting to MONO_AUDIO")
                 location = [Location.MONO_AUDIO]
         else:
-            location = [Location[name] for name in dev["location"]]
+            if dev["location"] != ['NA'] or dev["location"] == []:
+                print("Location field is only valid for headset devices, setting to NA")
+            location = []
 
         device = DeviceConf(
             location=location,

applications/nrf5340_audio/tools/buildprog/nrf5340_audio_dk_devices.py

@@ -78,7 +78,6 @@ class Location(Enum):
     "Kept for compatibility with old code, use the Location enum instead"
     left = FRONT_LEFT
     right = FRONT_RIGHT
-    NA = MONO_AUDIO
 
     def __new__(cls, value, label):
         obj = object.__new__(cls)
@@ -131,11 +130,12 @@ def __post_init__(
 
     def __str__(self):
         result = f"{self.nrf5340_audio_dk_snr} {self.nrf5340_audio_dk_dev.name}"
-        # Print all location labels if multiple
-        if isinstance(self.location, list):
-            result += " " + "+".join([loc.label for loc in self.location])
-        else:
-            result += f" {self.location.name}"
+        if self.nrf5340_audio_dk_dev == AudioDevice.headset:
+            # Print all location labels if multiple
+            if isinstance(self.location, list):
+                result += " " + "+".join([loc.label for loc in self.location])
+            else:
+                result += f" {self.location.name}"
         return result
 
 

applications/nrf5340_audio/tools/buildprog/program.py

@@ -9,7 +9,7 @@
 from threading import Thread
 from os import system, path
 from typing import List
-from nrf5340_audio_dk_devices import DeviceConf, SelectFlags, Location
+from nrf5340_audio_dk_devices import DeviceConf, SelectFlags, AudioDevice, Location
 
 MEM_ADDR_UICR_SNR = 0x00FF80F0
 MEM_ADDR_UICR_CH = 0x00FF80F4
@@ -28,13 +28,15 @@ def locations_to_bitfield(locations: List[Location]) -> int:
 
 def __populate_uicr(dev):
     """Program UICR in device with information from JSON file"""
-    print("Writing UICR " + str(dev.nrf5340_audio_dk_snr) + " with location value: " + str(locations_to_bitfield(dev.location)))
-    cmd = f"nrfutil device write --serial-number {dev.nrf5340_audio_dk_snr} --address {MEM_ADDR_UICR_CH} --value {locations_to_bitfield(dev.location)}"
-    # Write location information to UICR
-    ret_val = system(cmd)
-    if ret_val:
-        return False
+    if dev.nrf5340_audio_dk_dev == AudioDevice.headset:
+        print("Writing UICR with location value: " + str(locations_to_bitfield(dev.location)))
+        cmd = f"nrfutil device write --serial-number {dev.nrf5340_audio_dk_snr} --address {MEM_ADDR_UICR_CH} --value {locations_to_bitfield(dev.location)}"
+        # Write location information to UICR
+        print_location_labels(dev.location)
+        ret_val = system(cmd)
 
+        if ret_val:
+            return False
     cmd = f"nrfutil device write --serial-number {dev.nrf5340_audio_dk_snr} --address {MEM_ADDR_UICR_SNR} --value {dev.nrf5340_audio_dk_snr}"
 
     # Write segger nr to UICR

applications/nrf5340_audio/unicast_client/overlay-unicast_client.conf

@@ -36,6 +36,3 @@ CONFIG_LC3_DEC_CHAN_MAX=1
 CONFIG_AUDIO_ENCODE_CHANNELS_MAX=2
 CONFIG_MBEDTLS_ENABLE_HEAP=y
 CONFIG_MBEDTLS_HEAP_SIZE=2048
-
-CONFIG_DEVICE_LOCATION_SET_COMPILE_TIME=y
-CONFIG_DEVICE_LOCATION_AT_COMPILE_TIME=3