by Lucas De Marchi

[permalink] [raw]

Subject: [RFC 02/19] avrcp: implement ChangeSetting() method for TG role

ChangeSetting() is used by an application to communicate with the
bluetooth device in TG role in order to notify the change in a certain
setting.
---
audio/control.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++
doc/control-api.txt | 12 ++--
2 files changed, 159 insertions(+), 5 deletions(-)

diff --git a/audio/control.c b/audio/control.c
index 983c8cd..905f57a 100644
--- a/audio/control.c
+++ b/audio/control.c
@@ -120,6 +120,37 @@

#define QUIRK_NO_RELEASE 1 << 0

+enum player_setting {
+ PLAYER_SETTING_EQUALIZER = 1,
+ PLAYER_SETTING_REPEAT = 2,
+ PLAYER_SETTING_SHUFFLE = 3,
+ PLAYER_SETTING_SCAN = 4,
+};
+
+enum equalizer_mode {
+ EQUALIZER_MODE_OFF = 1,
+ EQUALIZER_MODE_ON = 2,
+};
+
+enum repeat_mode {
+ REPEAT_MODE_OFF = 1,
+ REPEAT_MODE_SINGLE = 2,
+ REPEAT_MODE_ALL = 3,
+ REPEAT_MODE_GROUP = 4,
+};
+
+enum shuffle_mode {
+ SHUFFLE_MODE_OFF = 1,
+ SHUFFLE_MODE_ALL = 2,
+ SHUFFLE_MODE_GROUP = 3,
+};
+
+enum scan_mode {
+ SCAN_MODE_OFF = 1,
+ SCAN_MODE_ALL = 2,
+ SCAN_MODE_GROUP = 3,
+};
+
static DBusConnection *connection = NULL;

static GSList *servers = NULL;
@@ -216,6 +247,8 @@ struct control {
gboolean target;

uint8_t key_quirks[256];
+
+ uint8_t player_setting[PLAYER_SETTING_SCAN + 1];
};

static struct {
@@ -1193,12 +1226,131 @@ static DBusMessage *control_get_properties(DBusConnection *conn,
return reply;
}

+static int setting_string_to_val(uint8_t setting, const char *value) {
+ int ret;
+
+ switch (setting) {
+ case (PLAYER_SETTING_EQUALIZER):
+ if (!strcmp(value, "off"))
+ ret = EQUALIZER_MODE_OFF;
+ else if (!strcmp(value, "on"))
+ ret = EQUALIZER_MODE_ON;
+ else
+ ret = -EINVAL;
+
+ return ret;
+ case(PLAYER_SETTING_REPEAT):
+ if (!strcmp(value, "off"))
+ ret = REPEAT_MODE_OFF;
+ else if (!strcmp(value, "singletrack"))
+ ret = REPEAT_MODE_SINGLE;
+ else if (!strcmp(value, "alltracks"))
+ ret = REPEAT_MODE_ALL;
+ else if (!strcmp(value, "group"))
+ ret = REPEAT_MODE_GROUP;
+ else
+ ret = -EINVAL;
+
+ return ret;
+ case(PLAYER_SETTING_SHUFFLE):
+ if (!strcmp(value, "off"))
+ ret = SHUFFLE_MODE_OFF;
+ else if (!strcmp(value, "alltracks"))
+ ret = SHUFFLE_MODE_ALL;
+ else if (!strcmp(value, "group"))
+ ret = SHUFFLE_MODE_GROUP;
+ else
+ ret = -EINVAL;
+
+ return ret;
+ case(PLAYER_SETTING_SCAN):
+ if (!strcmp(value, "off"))
+ ret = SCAN_MODE_OFF;
+ else if (!strcmp(value, "alltracks"))
+ ret = SCAN_MODE_ALL;
+ else if (!strcmp(value, "group"))
+ ret = SCAN_MODE_GROUP;
+ else
+ ret = -EINVAL;
+
+ return ret;
+ }
+
+ return -EINVAL;
+}
+
+static DBusMessage *setting_set(DBusMessage *msg, struct control *control,
+ const char *settingstr, const char *valstr)
+{
+ int val;
+ uint8_t setting;
+
+ if (!strcmp(settingstr, "Equalizer"))
+ setting = PLAYER_SETTING_EQUALIZER;
+ else if (!strcmp(settingstr, "Repeat"))
+ setting = PLAYER_SETTING_REPEAT;
+ else if (!strcmp(settingstr, "Shuffle"))
+ setting = PLAYER_SETTING_SHUFFLE;
+ else if (!strcmp(settingstr, "Scan"))
+ setting = PLAYER_SETTING_SCAN;
+ else
+ return btd_error_not_supported(msg);
+
+ val = setting_string_to_val(setting, valstr);
+ if (val == -1)
+ return btd_error_invalid_args(msg);
+
+ control->player_setting[setting] = val;
+
+ return dbus_message_new_method_return(msg);
+}
+
+static DBusMessage *control_change_setting(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ struct audio_device *device = data;
+ struct control *control = device->control;
+ DBusMessageIter iter;
+ DBusMessageIter var;
+ const char *setting;
+ const char *value;
+
+ if (control->state != AVCTP_STATE_CONNECTED)
+ return btd_error_not_connected(msg);
+
+ if (control->target) /* Only supported if this device is in TG role */
+ return btd_error_not_supported(msg);
+
+ if (!dbus_message_iter_init(msg, &iter))
+ return btd_error_invalid_args(msg);
+
+ if (!dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
+ return btd_error_invalid_args(msg);
+
+ dbus_message_iter_get_basic(&iter, &setting);
+ dbus_message_iter_next(&iter);
+
+ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT)
+ return btd_error_invalid_args(msg);
+
+ dbus_message_iter_recurse(&iter, &var);
+
+ /* Only string arguments are supported for now */
+ if (dbus_message_iter_get_arg_type(&var) != DBUS_TYPE_STRING)
+ return btd_error_invalid_args(msg);
+
+ dbus_message_iter_get_basic(&var, &value);
+
+ return setting_set(msg, control, setting, value);
+}
+
static GDBusMethodTable control_methods[] = {
{ "IsConnected", "", "b", control_is_connected,
G_DBUS_METHOD_FLAG_DEPRECATED },
{ "GetProperties", "", "a{sv}",control_get_properties },
{ "VolumeUp", "", "", volume_up },
{ "VolumeDown", "", "", volume_down },
+ { "ChangeSetting", "sv", "", control_change_setting },
{ NULL, NULL, NULL, NULL }
};

diff --git a/doc/control-api.txt b/doc/control-api.txt
index 1a42846..931fa10 100644
--- a/doc/control-api.txt
+++ b/doc/control-api.txt
@@ -70,18 +70,20 @@ Methods void Connect()
void ChangeSetting(string setting, variant value)

Called to transmit Application Settings, CT Status
- and the like.
+ and the like. It's ONLY implemented for TG role. In
+ case they're never set, they will not be transmitted to
+ CT as a supported setting.

- Currenet defined settings are represented with the
+ Current defined settings are represented with the
following keys:

Equalizer off, on
Repeat off, singletrack, alltracks, group
Shuffle off, alltracks, group
Scan off, alltracks, group
- Battery normal, warning, critical, external, fullcharge
- System powered, unpowered, unplugged
- Volume uint8
+ Battery normal, warning, critical, external, fullcharge [ Not implemented]
+ System powered, unpowered, unplugged [ Not implemented ]
+ Volume uint8 [ Not implemented ]

Signals Connected()

--
1.7.6

2011-07-19 19:49:12

by Lucas De Marchi

[permalink] [raw]

Subject: [RFC 01/19] avrcp: handle query for company ids

---
audio/control.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 86 insertions(+), 2 deletions(-)

diff --git a/audio/control.c b/audio/control.c
index c3ef737..983c8cd 100644
--- a/audio/control.c
+++ b/audio/control.c
@@ -102,6 +102,22 @@
#define FORWARD_OP 0x4b
#define BACKWARD_OP 0x4c

+/* Company IDs for vendor dependent commands */
+#define IEEEID_BTSIG 0x001958
+
+/* Error codes for metadata transfer */
+#define E_INVALID_COMMAND 0x00
+#define E_INVALID_PARAM 0x01
+#define E_PARAM_NOT_FOUND 0x02
+#define E_INTERNAL 0x03
+
+/* PDU types for metadata transfer */
+#define AVRCP_GET_CAPABILITIES 0x10
+
+/* Capabilities for AVRCP_GET_CAPABILITIES pdu */
+#define CAP_COMPANY_ID 0x02
+#define CAP_EVENTS_SUPPORTED 0x03
+
#define QUIRK_NO_RELEASE 1 << 0

static DBusConnection *connection = NULL;
@@ -217,6 +233,11 @@ static struct {
{ NULL }
};

+/* Company IDs supported by this device */
+static uint32_t company_ids[] = {
+ IEEEID_BTSIG,
+};
+
static GSList *avctp_callbacks = NULL;

static void auth_cb(DBusError *derr, void *user_data);
@@ -424,8 +445,71 @@ static int handle_vendordep_pdu(struct control *control,
struct avrcp_header *avrcp,
int operand_count)
{
- avrcp->code = CTYPE_NOT_IMPLEMENTED;
- return AVRCP_HEADER_LENGTH;
+ struct avrcp_spec_avc_pdu *pdu = (void *) avrcp + AVRCP_HEADER_LENGTH;
+ uint32_t company_id = (pdu->company_id[0] << 16) |
+ (pdu->company_id[1] << 8) |
+ (pdu->company_id[2]);
+ uint16_t len;
+ unsigned int i;
+
+ if (company_id != IEEEID_BTSIG ||
+ pdu->packet_type != AVCTP_PACKET_SINGLE) {
+ avrcp->code = CTYPE_NOT_IMPLEMENTED;
+ return AVRCP_HEADER_LENGTH;
+ }
+
+ pdu->packet_type = 0;
+ pdu->rsvd = 0;
+
+ if (operand_count + 3 < AVRCP_SPECAVCPDU_HEADER_LENGTH) {
+ pdu->params[0] = E_INVALID_COMMAND;
+ goto err_metadata;
+ }
+
+ len = ntohs(pdu->params_len);
+
+ switch (pdu->pdu_id) {
+ case AVRCP_GET_CAPABILITIES:
+ if (len != 1 || avrcp->code != CTYPE_STATUS)
+ break;
+
+ DBG("GET_CAPABILITIES id=%u", pdu->params[0]);
+
+ switch (pdu->params[0]) { /* capability id */
+ case CAP_COMPANY_ID:
+ avrcp->code = CTYPE_STABLE;
+ pdu->params_len = htons(1 +
+ 3 * G_N_ELEMENTS(company_ids));
+ pdu->params[1] = G_N_ELEMENTS(company_ids);
+
+ for (i = 0; i < G_N_ELEMENTS(company_ids); i++) {
+ pdu->params[2 + i * 3] = company_ids[i] >> 16;
+ pdu->params[3 + i * 3] = (company_ids[i] >> 8)
+ & 0xFF;
+ pdu->params[4 + i * 3] = company_ids[i] & 0xFF;
+ }
+
+ return AVRCP_HEADER_LENGTH +
+ AVRCP_SPECAVCPDU_HEADER_LENGTH + 1 +
+ 3 * G_N_ELEMENTS(company_ids);
+ }
+
+ pdu->params[0] = E_INVALID_PARAM;
+ goto err_metadata;
+ }
+
+ /*
+ * If either pdu_id was invalid or message was malformed, respond with
+ * E_INVALID_COMMAND. For other errors, we already jumped into
+ * err_metadata.
+ */
+ pdu->params[0] = E_INVALID_COMMAND;
+
+err_metadata:
+ avrcp->code = CTYPE_REJECTED;
+ pdu->params_len = htons(1);
+
+ return AVRCP_HEADER_LENGTH + AVRCP_SPECAVCPDU_HEADER_LENGTH + 1;
}

static void avctp_disconnected(struct audio_device *dev)
--
1.7.6