Identify BAP and a2dp transport to update the transport volume.
Also add properties volume for bap_transport.
---
profiles/audio/media.c | 2 +-
profiles/audio/transport.c | 120 ++++++++++++++++++++++++++++++++++---
profiles/audio/transport.h | 7 ++-
3 files changed, 117 insertions(+), 12 deletions(-)
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index c9328ab9bd6e..0e3c7cbbaf2c 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -523,7 +523,7 @@ static gboolean set_configuration(struct media_endpoint *endpoint,
return FALSE;
init_volume = media_player_get_device_volume(device);
- media_transport_update_volume(transport, init_volume);
+ media_a2dp_transport_update_volume(transport, init_volume);
msg = dbus_message_new_method_call(endpoint->sender, endpoint->path,
MEDIA_ENDPOINT_INTERFACE,
diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
index 41339da51e17..a606d45eb628 100644
--- a/profiles/audio/transport.c
+++ b/profiles/audio/transport.c
@@ -91,6 +91,7 @@ struct bap_transport {
uint8_t rtn;
uint16_t latency;
uint32_t delay;
+ int8_t volume;
};
struct media_transport {
@@ -709,7 +710,8 @@ static gboolean get_delay_reporting(const GDBusPropertyTable *property,
return TRUE;
}
-static gboolean volume_exists(const GDBusPropertyTable *property, void *data)
+static gboolean volume_a2dp_exists(const GDBusPropertyTable *property,
+ void *data)
{
struct media_transport *transport = data;
struct a2dp_transport *a2dp = transport->data;
@@ -717,7 +719,8 @@ static gboolean volume_exists(const GDBusPropertyTable *property, void *data)
return a2dp->volume >= 0;
}
-static gboolean get_volume(const GDBusPropertyTable *property,
+
+static gboolean get_a2dp_volume(const GDBusPropertyTable *property,
DBusMessageIter *iter, void *data)
{
struct media_transport *transport = data;
@@ -729,7 +732,7 @@ static gboolean get_volume(const GDBusPropertyTable *property,
return TRUE;
}
-static void set_volume(const GDBusPropertyTable *property,
+static void set_a2dp_volume(const GDBusPropertyTable *property,
DBusMessageIter *iter, GDBusPendingPropertySet id,
void *data)
{
@@ -769,6 +772,58 @@ error:
"Invalid arguments in method call");
}
+static gboolean volume_bap_exists(const GDBusPropertyTable *property,
+ void *data)
+{
+ struct media_transport *transport = data;
+ struct bap_transport *bap = transport->data;
+
+ return bap->volume >= 0;
+}
+
+static gboolean get_bap_volume(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct media_transport *transport = data;
+ struct bap_transport *bap = transport->data;
+ uint16_t volume = (uint16_t)bap->volume;
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &volume);
+
+ return TRUE;
+}
+
+static void set_bap_volume(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, GDBusPendingPropertySet id,
+ void *data)
+{
+ struct media_transport *transport = data;
+ struct bap_transport *bap = transport->data;
+ uint16_t arg;
+ int8_t volume;
+
+ if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_UINT16)
+ goto error;
+
+ dbus_message_iter_get_basic(iter, &arg);
+ if (arg > INT8_MAX)
+ goto error;
+
+ g_dbus_pending_property_success(id);
+
+ volume = (int8_t)arg;
+ if (bap->volume == volume)
+ return;
+
+ /*TODO vcp_send_volume */
+ return;
+
+error:
+ g_dbus_pending_property_error(id, ERROR_INTERFACE ".InvalidArguments",
+ "Invalid arguments in method call");
+}
+
+
static gboolean endpoint_exists(const GDBusPropertyTable *property, void *data)
{
struct media_transport *transport = data;
@@ -809,7 +864,8 @@ static const GDBusPropertyTable a2dp_properties[] = {
{ "Configuration", "ay", get_configuration },
{ "State", "s", get_state },
{ "Delay", "q", get_delay_reporting, NULL, delay_reporting_exists },
- { "Volume", "q", get_volume, set_volume, volume_exists },
+ { "Volume", "q", get_a2dp_volume, set_a2dp_volume,
+ volume_a2dp_exists },
{ "Endpoint", "o", get_endpoint, NULL, endpoint_exists,
G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
{ }
@@ -970,6 +1026,7 @@ static const GDBusPropertyTable bap_properties[] = {
{ "Retransmissions", "y", get_retransmissions },
{ "Latency", "q", get_latency },
{ "Delay", "u", get_delay },
+ { "Volume", "q", get_bap_volume, set_bap_volume, volume_bap_exists },
{ "Endpoint", "o", get_endpoint, NULL, endpoint_exists },
{ "Location", "u", get_location },
{ "Metadata", "ay", get_metadata },
@@ -1403,6 +1460,7 @@ static int media_transport_init_bap(struct media_transport *transport,
bap->rtn = qos->rtn;
bap->latency = qos->latency;
bap->delay = qos->delay;
+ bap->volume = 127;
bap->state_id = bt_bap_state_register(bt_bap_stream_get_session(stream),
bap_state_changed,
bap_connecting,
@@ -1502,14 +1560,22 @@ struct btd_device *media_transport_get_dev(struct media_transport *transport)
return transport->device;
}
-int8_t media_transport_get_volume(struct media_transport *transport)
+int8_t media_a2dp_transport_get_volume(struct media_transport *transport)
{
struct a2dp_transport *a2dp = transport->data;
+
return a2dp->volume;
}
-void media_transport_update_volume(struct media_transport *transport,
- int8_t volume)
+int8_t media_bap_transport_get_volume(struct media_transport *transport)
+{
+ struct bap_transport *bap = transport->data;
+
+ return bap->volume;
+}
+
+void media_a2dp_transport_update_volume(struct media_transport *transport,
+ int8_t volume)
{
struct a2dp_transport *a2dp = transport->data;
@@ -1527,6 +1593,25 @@ void media_transport_update_volume(struct media_transport *transport,
MEDIA_TRANSPORT_INTERFACE, "Volume");
}
+void media_bap_transport_update_volume(struct media_transport *transport,
+ int8_t volume)
+{
+ struct bap_transport *bap = transport->data;
+
+ if (volume < 0)
+ return;
+
+ /* Check if volume really changed */
+ if (bap->volume == volume)
+ return;
+
+ bap->volume = volume;
+
+ g_dbus_emit_property_changed(btd_get_dbus_connection(),
+ transport->path,
+ MEDIA_TRANSPORT_INTERFACE, "Volume");
+}
+
int8_t media_transport_get_device_volume(struct btd_device *dev)
{
GSList *l;
@@ -1537,12 +1622,21 @@ int8_t media_transport_get_device_volume(struct btd_device *dev)
/* Attempt to locate the transport to get its volume */
for (l = transports; l; l = l->next) {
struct media_transport *transport = l->data;
+ const char *uuid = media_endpoint_get_uuid(transport->endpoint);
+
+ /* Locate BAP Transport */
+ if (!strcasecmp(uuid, PAC_SINK_UUID) &&
+ !strcasecmp(uuid, PAC_SOURCE_UUID)) {
+
+ return media_bap_transport_get_volume(transport);
+ }
+
if (transport->device != dev)
continue;
/* Volume is A2DP only */
if (media_endpoint_get_sep(transport->endpoint))
- return media_transport_get_volume(transport);
+ return media_a2dp_transport_get_volume(transport);
}
/* If transport volume doesn't exists use device_volume */
@@ -1560,12 +1654,20 @@ void media_transport_update_device_volume(struct btd_device *dev,
/* Attempt to locate the transport to set its volume */
for (l = transports; l; l = l->next) {
struct media_transport *transport = l->data;
+ const char *uuid = media_endpoint_get_uuid(transport->endpoint);
+
+ /* Locate BAP Transport */
+ if (!strcasecmp(uuid, PAC_SINK_UUID)) {
+ media_bap_transport_update_volume(transport, volume);
+ return;
+ }
+
if (transport->device != dev)
continue;
/* Volume is A2DP only */
if (media_endpoint_get_sep(transport->endpoint)) {
- media_transport_update_volume(transport, volume);
+ media_a2dp_transport_update_volume(transport, volume);
return;
}
}
diff --git a/profiles/audio/transport.h b/profiles/audio/transport.h
index 102fc3cf1153..3cbefa5d7bee 100644
--- a/profiles/audio/transport.h
+++ b/profiles/audio/transport.h
@@ -20,10 +20,13 @@ struct media_transport *media_transport_create(struct btd_device *device,
void media_transport_destroy(struct media_transport *transport);
const char *media_transport_get_path(struct media_transport *transport);
struct btd_device *media_transport_get_dev(struct media_transport *transport);
-int8_t media_transport_get_volume(struct media_transport *transport);
+int8_t media_a2dp_transport_get_volume(struct media_transport *transport);
+int8_t media_bap_transport_get_volume(struct media_transport *transport);
void media_transport_update_delay(struct media_transport *transport,
uint16_t delay);
-void media_transport_update_volume(struct media_transport *transport,
+void media_a2dp_transport_update_volume(struct media_transport *transport,
+ int8_t volume);
+void media_bap_transport_update_volume(struct media_transport *transport,
int8_t volume);
void transport_get_properties(struct media_transport *transport,
DBusMessageIter *iter);
--
2.25.1
Callback function has to be registered to call
media_transport_update_device_volume to change transport volume.
---
profiles/audio/vcp.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/profiles/audio/vcp.c b/profiles/audio/vcp.c
index b42b0a4f79dd..4b790b03c032 100644
--- a/profiles/audio/vcp.c
+++ b/profiles/audio/vcp.c
@@ -50,6 +50,7 @@
#include "src/service.h"
#include "src/log.h"
#include "src/error.h"
+#include "transport.h"
#define VCS_UUID_STR "00001844-0000-1000-8000-00805f9b34fb"
#define MEDIA_ENDPOINT_INTERFACE "org.bluez.MediaEndpoint1"
@@ -83,6 +84,20 @@ static struct vcp_data *vcp_data_new(struct btd_device *device)
return data;
}
+static void vr_set_volume(struct bt_vcp *vcp, int8_t volume, void *data)
+{
+ struct vcp_data *user_data = data;
+ struct btd_device *device = user_data->device;
+
+ DBG("set volume");
+
+ media_transport_update_device_volume(device, volume);
+}
+
+static struct bt_vcp_vr_ops vcp_vr_ops = {
+ .set_volume = vr_set_volume,
+};
+
static void vcp_data_add(struct vcp_data *data)
{
DBG("data %p", data);
@@ -94,6 +109,7 @@ static void vcp_data_add(struct vcp_data *data)
bt_vcp_set_debug(data->vcp, vcp_debug, NULL, NULL);
+ bt_vcp_vr_set_ops(data->vcp, &vcp_vr_ops, data);
if (!sessions)
sessions = queue_new();
@@ -178,6 +194,7 @@ static void vcp_attached(struct bt_vcp *vcp, void *user_data)
data->vcp = vcp;
vcp_data_add(data);
+
}
static int vcp_probe(struct btd_service *service)
--
2.25.1
Dear Sathish,
Am 30.09.22 um 12:45 schrieb Sathish Narasimman:
[…]
In the summary/title it should be sep*a*rate.
Please add a version to the tags, with `git format-patch --reroll-count
X`, and add a short description after `---`, what changed between the
versions.
Kind regards,
Paul
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=682212
---Test result---
Test Summary:
CheckPatch FAIL 4.94 seconds
GitLint PASS 3.15 seconds
Prep - Setup ELL PASS 26.45 seconds
Build - Prep PASS 0.82 seconds
Build - Configure PASS 8.56 seconds
Build - Make PASS 747.72 seconds
Make Check PASS 11.31 seconds
Make Check w/Valgrind PASS 288.42 seconds
Make Distcheck PASS 238.75 seconds
Build w/ext ELL - Configure PASS 8.37 seconds
Build w/ext ELL - Make PASS 83.78 seconds
Incremental Build w/ patches PASS 297.45 seconds
Scan Build PASS 523.47 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script with rule in .checkpatch.conf
Output:
[1/3] audio/transport: seperate a2dp and bap transport to update volume
WARNING:TYPO_SPELLING: 'seperate' may be misspelled - perhaps 'separate'?
#55:
Subject: [PATCH 1/3] audio/transport: seperate a2dp and bap transport to
^^^^^^^^
/github/workspace/src/12995246.patch total: 0 errors, 1 warnings, 230 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/12995246.patch has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
---
Regards,
Linux Bluetooth