Pass A2DP configuration with NAME:CONFIG notation

In all places, the A2DP codec configuration is printed as NAME:CONFIG.
Also, when selecting configuration with ALSA plug-in, the notation is
just like that. However, when selecting codec with our CLI the config
needs to be passed as a separate argument. This might be confusing to
some. This commit unifies the notation of A2DP codec name with the
configuration in all places. However, it slightly breaks command line
syntax with previous releases of bluez-alsa.

Author: arkq

doc/bluealsa-cli.1.rst

@@ -6,7 +6,7 @@ bluealsa-cli
 a simple command line interface for the BlueALSA D-Bus API
 ----------------------------------------------------------
 
-:Date: July 2023
+:Date: January 2024
 :Manual section: 1
 :Manual group: General Commands Manual
 :Version: $VERSION$
@@ -89,7 +89,7 @@ info *PCM_PATH*
     The list of available A2DP codecs requires BlueZ SEP support
     (BlueZ >= 5.52)
 
-codec [--force] *PCM_PATH* [*CODEC* [*CONFIG*]]
+codec [--force] *PCM_PATH* [*CODEC*[:*CONFIG*]]
     Get or set the Bluetooth codec used by the given PCM.
 
     If *CODEC* is given, change the codec to be used by the given PCM. This

src/asound/bluealsa-pcm.c

@@ -1,6 +1,6 @@
 /*
  * bluealsa-pcm.c
- * Copyright (c) 2016-2022 Arkadiusz Bokowy
+ * Copyright (c) 2016-2024 Arkadiusz Bokowy
  *
  * This file is a part of bluez-alsa.
  *
@@ -26,6 +26,7 @@
 #include <strings.h>
 #include <sys/eventfd.h>
 #include <sys/ioctl.h>
+#include <sys/param.h>
 #include <sys/time.h>
 #include <unistd.h>
 
@@ -1260,42 +1261,36 @@ static int bluealsa_set_hw_constraint(struct bluealsa_pcm *pcm) {
 
 static bool bluealsa_select_pcm_codec(struct bluealsa_pcm *pcm, const char *codec, DBusError *err) {
 
-	uint8_t config[64];
+	char name[32] = { 0 };
+	size_t name_len = sizeof(name) - 1;
+	uint8_t config[64] = { 0 };
 	ssize_t config_len = 0;
-	bool ret = false;
 
-	char *codec_name;
-	if ((codec_name = strdup(codec)) == NULL) {
-		dbus_set_error(err, DBUS_ERROR_NO_MEMORY, NULL);
-		return false;
-	}
-
-	char *config_hex;
+	const char *config_hex;
 	/* split the given string into name and configuration components */
-	if ((config_hex = strchr(codec_name, ':')) != NULL) {
-		*config_hex++ = '\0';
+	if ((config_hex = strchr(codec, ':')) != NULL) {
+		name_len = MIN(name_len, config_hex - codec);
+		config_hex++;
 
 		size_t config_hex_len;
 		if ((config_hex_len = strlen(config_hex)) > sizeof(config) * 2) {
 			dbus_set_error(err, DBUS_ERROR_FAILED, "Invalid codec configuration: %s", config_hex);
-			goto fail;
+			return false;
 		}
+
 		if ((config_len = hex2bin(config_hex, config, config_hex_len)) == -1) {
 			dbus_set_error(err, DBUS_ERROR_FAILED, "%s", strerror(errno));
-			goto fail;
+			return false;
 		}
 
 	}
 
+	strncpy(name, codec, name_len);
 	if (!ba_dbus_pcm_select_codec(&pcm->dbus_ctx, pcm->ba_pcm.pcm_path,
-				ba_dbus_pcm_codec_get_canonical_name(codec_name), config, config_len, 0, err))
-		goto fail;
-
-	ret = true;
+				ba_dbus_pcm_codec_get_canonical_name(name), config, config_len, 0, err))
+		return false;
 
-fail:
-	free(codec_name);
-	return ret;
+	return true;
 }
 
 static bool bluealsa_update_pcm_volume(struct bluealsa_pcm *pcm,

test/test-utils-cli.c

@@ -240,7 +240,7 @@ CK_START_TEST(test_codec) {
 	/* check selecting A2DP codec without SEP support (with our mock BlueZ) */
 	ck_assert_int_eq(run_bluealsa_cli(output, sizeof(output),
 				"codec", "-vf", "/org/bluealsa/hci0/dev_12_34_56_78_9A_BC/a2dpsrc/sink",
-				"SBC", "11150255",
+				"SBC:11150255",
 				NULL), EXIT_FAILURE);
 
 	spawn_terminate(&sp_ba_mock, 0);

utils/cli/cmd-codec.c

@@ -24,7 +24,7 @@
 
 static void usage(const char *command) {
 	printf("Get or set the Bluetooth codec used by the given PCM.\n\n");
-	cli_print_usage("%s [OPTION]... PCM-PATH [CODEC [CONFIG]]", command);
+	cli_print_usage("%s [OPTION]... PCM-PATH [CODEC[:CONFIG]]", command);
 	printf("\nOptions:\n"
 			"  -h, --help\t\tShow this message and exit\n"
 			"  -f, --force\t\tForce codec configuration (skip conformance check)\n"
@@ -72,7 +72,7 @@ static int cmd_codec_func(int argc, char *argv[]) {
 		cmd_print_error("Missing BlueALSA PCM path argument");
 		return EXIT_FAILURE;
 	}
-	if (argc - optind > 3) {
+	if (argc - optind > 2) {
 		cmd_print_error("Invalid number of arguments");
 		return EXIT_FAILURE;
 	}
@@ -92,30 +92,35 @@ static int cmd_codec_func(int argc, char *argv[]) {
 		return EXIT_SUCCESS;
 	}
 
-	const char *codec = ba_dbus_pcm_codec_get_canonical_name(argv[optind + 1]);
+	char *codec = argv[optind + 1];
+	uint8_t codec_config[64] = { 0 };
+	ssize_t codec_config_len = 0;
+	unsigned int flags = BA_PCM_SELECT_CODEC_FLAG_NONE;
 	int result = EXIT_FAILURE;
 
-	unsigned int flags = BA_PCM_SELECT_CODEC_FLAG_NONE;
-	uint8_t codec_config[64];
-	ssize_t codec_config_len = 0;
+	char *codec_config_hex;
+	/* split the given string into name and configuration components */
+	if ((codec_config_hex = strchr(codec, ':')) != NULL) {
+		*codec_config_hex++ = '\0';
 
-	if (argc - optind == 3) {
 		size_t codec_config_hex_len;
-		const char *codec_config_hex = argv[optind + 2];
 		if ((codec_config_hex_len = strlen(codec_config_hex)) > sizeof(codec_config) * 2) {
 			dbus_set_error(&err, DBUS_ERROR_FAILED, "Invalid codec configuration: %s", codec_config_hex);
 			goto fail;
 		}
+
 		if ((codec_config_len = hex2bin(codec_config_hex, codec_config, codec_config_hex_len)) == -1) {
 			dbus_set_error(&err, DBUS_ERROR_FAILED, "%s", strerror(errno));
 			goto fail;
 		}
+
 	}
 
 	if (force)
 		flags |= BA_PCM_SELECT_CODEC_FLAG_NON_CONFORMANT;
 
-	if (!ba_dbus_pcm_select_codec(&config.dbus, path, codec,
+	if (!ba_dbus_pcm_select_codec(&config.dbus, path,
+				ba_dbus_pcm_codec_get_canonical_name(codec),
 				codec_config, codec_config_len, flags, &err))
 		goto fail;