Add BIP for AVRCP covert art OBEX client
Subsystems (2)
v3 cover Add BIP for AVRCP covert art OBEX client
If AVRCP Target supports Cover Art download its SDP record contains an additional access protocol for OBEX with an LCAP PSM on which the OBEX client session should connect to, with the specific OBEX target header 7163DD54-4A7E-11E2-B47C-0050C2490048.
Once the OBEX session is connected, the AVRCP track metadata will contain an Image Handle which can be used to get the associated image using GetImageThumbnail or GetImage with one of the description property found with GetImageProperties.
This has been tested with iPhone 14, iPhone 15 Pro and Samsung S23.
v1 -> v2: Parse integer properties as integer instead of string
Return GetImageProperties values as aa{sv} instead of aa{ss}
Get properties for GetImage as a{sv} instead of a{ss}
Set new properties and interface as experimentalv2 -> v3: Rename obexd/client/bip-avrcp.[ch] to obexd/client/bip.[ch]
Update the AVRCP Controller version in SDP to 1.6 Add commit to support for specific headers in obex transfer Fix memory leaks
Frédéric Danis (9):
obexd: Add PSM support to session create
player: Add OBEX PSM port for cover art support
player: Add image handle support property
obexd: Add support for specific headers in obex transfer
obexd: Add BIP client for AVRCP cover art download
obexd: Add GetImageProperties to bip-avrcp
obexd: Add GetImage to bip-avrcp
avrcp: Update controller SDP record with cover art support
doc: Add description of org.bluez.obex.BipAvrcp
Makefile.am | 9 +- Makefile.obexd | 2 + doc/org.bluez.MediaPlayer.rst | 11 + doc/org.bluez.obex.BipAvrcp.rst | 72 +++ doc/org.bluez.obex.Client.rst | 5 + doc/org.bluez.obex.Session.rst | 5 + monitor/avctp.c | 3 + obexd/client/bip-common.c | 800 ++++++++++++++++++++++++++++++++ obexd/client/bip-common.h | 24 + obexd/client/bip.c | 440 ++++++++++++++++++ obexd/client/bip.h | 12 + obexd/client/manager.c | 16 +- obexd/client/session.c | 27 +- obexd/client/session.h | 1 + obexd/client/transfer.c | 19 + obexd/client/transfer.h | 2 + profiles/audio/avrcp.c | 66 ++- profiles/audio/avrcp.h | 3 +- profiles/audio/player.c | 30 ++ profiles/audio/player.h | 1 + tools/parser/avrcp.c | 3 + 21 files changed, 1531 insertions(+), 20 deletions(-) create mode 100644 doc/org.bluez.obex.BipAvrcp.rst create mode 100644 obexd/client/bip-common.c create mode 100644 obexd/client/bip-common.h create mode 100644 obexd/client/bip.c create mode 100644 obexd/client/bip.h
Signature · 1 line
2.34.1
PATCH v3 1/9 obexd: Add PSM support to session create
An OBEX session can be connected to a RFCOMM channel or a L2CAP PSM.
--- doc/org.bluez.obex.Client.rst | 4 ++++ doc/org.bluez.obex.Session.rst | 5 +++++ obexd/client/manager.c | 14 ++++++++++---- obexd/client/session.c | 27 ++++++++++++++++++++++++--- obexd/client/session.h | 1 + 5 files changed, 44 insertions(+), 7 deletions(-)
doc/org.bluez.obex.Client.rst +4 -0
@@ -52,6 +52,10 @@ object CreateSession(string destination, dict args) Channel to be used. + :uint16 PSM: + + L2CAP PSM to be used. + Possible errors: :org.bluez.obex.Error.InvalidArguments:
doc/org.bluez.obex.Session.rst +5 -0
@@ -50,6 +50,11 @@ byte Channel [readonly] Bluetooth channel +uint16 PSM [readonly] +``````````````````````` + + Bluetooth L2CAP PSM + string Target [readonly] ````````````````````````
obexd/client/manager.c +10 -4
@@ -107,7 +107,8 @@ done: }static int parse_device_dict (DBusMessageIter *iter, -const char **source,const char **target,uint8_t *channel) +const char **source,const char **target,uint8_t *channel, +uint16_t *psm) {while (dbus_message_iter_get_arg_type (iter) ==DBUS_TYPE_DICT_ENTRY ) {DBusMessageIter entry, value;
@@ -130,6 +131,10 @@ static int parse_device_dict(DBusMessageIter *iter,if (g_str_equal (key,"Channel" ) == TRUE)dbus_message_iter_get_basic (&value, channel);break ; +case DBUS_TYPE_UINT16 : +if (g_str_equal (key,"PSM" ) == TRUE) +dbus_message_iter_get_basic (&value, psm); +break ; }dbus_message_iter_next (iter);
@@ -160,6 +165,7 @@ static DBusMessage *create_session(DBusConnection *connection,struct send_data *data;const char *source =NULL , *dest =NULL , *target =NULL ;uint8_t channel =0 ; +uint16_t psm =0 ;dbus_message_iter_init (message, &iter);if (dbus_message_iter_get_arg_type (&iter) !=DBUS_TYPE_STRING )
@@ -175,8 +181,8 @@ static DBusMessage *create_session(DBusConnection *connection,dbus_message_iter_recurse (&iter, &dict); -parse_device_dict (&dict, &source, &target, &channel); -if (dest ==NULL || target ==NULL ) +parse_device_dict (&dict, &source, &target, &channel, &psm); +if (dest ==NULL || target ==NULL || (channel && psm))return g_dbus_create_error (message,ERROR_INTERFACE ".InvalidArguments" ,NULL );
@@ -188,7 +194,7 @@ static DBusMessage *create_session(DBusConnection *connection, data->connection =dbus_connection_ref (connection); data->message =dbus_message_ref (message); - session =obc_session_create (source, dest, target, channel, + session =obc_session_create (source, dest, target, channel, psm,dbus_message_get_sender (message), create_callback, data);if (session !=NULL ) {
obexd/client/session.c +24 -3
@@ -88,6 +88,7 @@ struct obc_session {char *source;char *destination;uint8_t channel; +uint16_t psm;struct obc_transport *transport;struct obc_driver *driver;char *path;/* Session path */
@@ -471,6 +472,7 @@ static struct obc_session *session_find(const char *source,const char *destination, const char *service, uint8_t channel, + uint16_t psm, const char *owner) { GSList *l;
@@ -490,6 +492,9 @@ static struct obc_session *session_find(const char *source,if (channel && session->channel != channel)continue ; +if (psm && session->psm != psm) +continue ; +if (g_strcmp0 (owner, session->owner))continue ;
@@ -541,8 +546,9 @@ static int session_connect(struct obc_session *session, } session->id = transport->connect (session->source, session->destination, - driver->uuid, session->channel, - transport_func, callback); + driver->uuid, + session->channel ? session->channel : session->psm, + transport_func, callback);if (session->id ==0 ) {obc_session_unref (callback->session);g_free (callback);
@@ -558,6 +564,7 @@ struct obc_session *obc_session_create(const char *source,const char *destination, const char *service, uint8_t channel, + uint16_t psm, const char *owner, session_callback_t function, void *user_data)
@@ -570,7 +577,8 @@ struct obc_session *obc_session_create(const char *source,if (destination ==NULL )return NULL ; - session =session_find (source, destination, service, channel, owner); + session =session_find (source, destination, service, channel, psm, + owner);if (session !=NULL ) goto proceed;
@@ -598,6 +606,7 @@ struct obc_session *obc_session_create(const char *source, session->source =g_strdup (source); session->destination =g_strdup (destination); session->channel = channel; + session->psm = psm; session->queue =g_queue_new (); session->folder =g_strdup ("/" );
@@ -762,6 +771,17 @@ static gboolean get_channel(const GDBusPropertyTable *property,return TRUE; } +static gboolean get_psm (const GDBusPropertyTable *property, +DBusMessageIter *iter,void *data) +{ +struct obc_session *session = data; + +dbus_message_iter_append_basic (iter,DBUS_TYPE_UINT16 , + &session->psm); + +return TRUE; +} +static const GDBusMethodTable session_methods[] = { { GDBUS_ASYNC_METHOD("GetCapabilities", NULL, GDBUS_ARGS({ "capabilities", "s" }),
@@ -794,6 +814,7 @@ static const GDBusPropertyTable session_properties[] = { { "Source", "s", get_source, NULL, source_exists }, { "Destination", "s", get_destination }, { "Channel", "y", get_channel }, + { "PSM", "q", get_psm }, { "Target", "s", get_target, NULL, target_exists }, { } };
obexd/client/session.h +1 -0
@@ -22,6 +22,7 @@ struct obc_session *obc_session_create(const char *source,const char *destination, const char *service, uint8_t channel, + uint16_t psm, const char *owner, session_callback_t function, void *user_data);
Signature · 1 line
2.34.1
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=890683
---Test result---
Test Summary:
CheckPatch FAIL 5.53 seconds GitLint FAIL 6.65 seconds BuildEll PASS 24.81 seconds BluezMake PASS 1677.20 seconds MakeCheck PASS 13.28 seconds MakeDistcheck PASS 186.25 seconds CheckValgrind PASS 259.07 seconds CheckSmatch PASS 365.98 seconds bluezmakeextell PASS 123.65 seconds IncrementalBuild PASS 14622.47 seconds ScanBuild WARNING 1022.75 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[BlueZ,v3,6/9] obexd: Add GetImageProperties to bip-avrcp
WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #78:
[2] https://github.com/enkait/Basic-Imaging-Profile-in-obexd/blob/gsoc_final/plugins/bip_util.c
/github/workspace/src/src/13805437.patch total: 0 errors, 1 warnings, 926 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/src/13805437.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.
##############################
Test: GitLint - FAIL
Desc: Run gitlint
Output:
[BlueZ,v3,6/9] obexd: Add GetImageProperties to bip-avrcp
WARNING: I3 - ignore-body-lines: gitlint will be switching from using Python regex 'match' (match beginning) to 'search' (match anywhere) semantics. Please review your ignore-body-lines.regex option accordingly. To remove this warning, set general.regex-style-search=True. More details: https://jorisroovers.github.io/gitlint/configuration/#regex-style-search
10: B1 Line exceeds max length (95>80): "[2] https://github.com/enkait/Basic-Imaging-Profile-in-obexd/blob/gsoc_final/plugins/bip_util.c"
##############################
Test: ScanBuild - WARNING
Desc: Run Scan Build
Output:profiles/audio/avrcp.c:1942:2: warning: Value stored to 'operands' is never read
operands += sizeof(*pdu);
^ ~~~~~~~~~~~~1 warning generated.
---
Regards,
Linux Bluetooth
PATCH v3 2/9 player: Add OBEX PSM port for cover art support
In reply to Frédéric DanisThis parse the AVRCP Target SDP record for the L2CAP PSM to use with the OBEX session to get the cover art.
--- doc/org.bluez.MediaPlayer.rst | 6 +++++ profiles/audio/avrcp.c | 51 +++++++++++++++++++++++++++++++---- profiles/audio/player.c | 30 +++++++++++++++++++++ profiles/audio/player.h | 1 + 4 files changed, 83 insertions(+), 5 deletions(-)
doc/org.bluez.MediaPlayer.rst +6 -0
@@ -313,3 +313,9 @@ object Playlist ``````````````` Playlist object path. + +uint16 ObexPort [readonly, experimental] +```````````````````````````````````````` + + If present indicates the player can get cover art using BIP over OBEX + on this PSM port.
profiles/audio/avrcp.c +46 -5
100 lines not on this page · raw message
profiles/audio/player.c +30 -0
@@ -88,6 +88,7 @@ struct media_player {struct player_callback *cb;GSList *pending;GSList *folders; +uint16_t obex_port; };static void append_track (void *key,void *value,void *user_data)
@@ -437,6 +438,28 @@ static gboolean get_playlist(const GDBusPropertyTable *property,return TRUE; } +static gboolean obexport_exists (const GDBusPropertyTable *property, +void *data) +{ +struct media_player *mp = data; + +return mp->obex_port !=0 ; +} + +static gboolean get_obexport (const GDBusPropertyTable *property, +DBusMessageIter *iter,void *data) +{ +struct media_player *mp = data; + +if (mp->obex_port ==0 ) +return FALSE; + +dbus_message_iter_append_basic (iter,DBUS_TYPE_UINT16 , + &mp->obex_port); + +return TRUE; +} +static DBusMessage *media_player_play (DBusConnection *conn,DBusMessage *msg,void *data) {
@@ -778,6 +801,8 @@ static const GDBusPropertyTable media_player_properties[] = { { "Browsable", "b", get_browsable, NULL, browsable_exists }, { "Searchable", "b", get_searchable, NULL, searchable_exists }, { "Playlist", "o", get_playlist, NULL, playlist_exists }, + { "ObexPort", "q", get_obexport, NULL, obexport_exists, + G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, { } };
@@ -1997,3 +2022,8 @@ struct media_item *media_player_set_playlist_item(struct media_player *mp,return item; } + +void media_player_set_obex_port (struct media_player *mp,uint16_t port) +{ + mp->obex_port = port; +}
profiles/audio/player.h +1 -0
@@ -86,6 +86,7 @@ void media_player_set_folder(struct media_player *mp, const char *path,void media_player_set_playlist (struct media_player *mp,const char *name);struct media_item *media_player_set_playlist_item (struct media_player *mp,uint64_t uid); +void media_player_set_obex_port (struct media_player *mp,uint16_t port); struct media_item *media_player_create_folder(struct media_player *mp, const char *name,
Signature · 1 line
2.34.1
PATCH v3 3/9 player: Add image handle support property
In reply to Frédéric DanisThis is part of the metadata when the AVRCP target supports covert art download and a OBEX BIP session is connected.
The image handle references the cover art associated to the track, and is valid only during OBEX BIP session.
--- doc/org.bluez.MediaPlayer.rst | 5 +++++ monitor/avctp.c | 3 +++ profiles/audio/avrcp.c | 7 ++++++- profiles/audio/avrcp.h | 3 ++- tools/parser/avrcp.c | 3 +++ 5 files changed, 19 insertions(+), 2 deletions(-)
doc/org.bluez.MediaPlayer.rst +5 -0
@@ -237,6 +237,11 @@ dict Track [readonly] Track duration in milliseconds + :string ImgHandle: [experimental] + + Track image handle, available and valid only during the lifetime of an + OBEX BIP connection to the ObexPort. + object Device [readonly] ````````````````````````
monitor/avctp.c +3 -0
@@ -156,6 +156,7 @@#define AVRCP_MEDIA_ATTRIBUTE_TOTAL 0x05#define AVRCP_MEDIA_ATTRIBUTE_GENRE 0x06#define AVRCP_MEDIA_ATTRIBUTE_DURATION 0x07 +#define AVRCP_MEDIA_ATTRIBUTE_IMG_HANDLE 0x08/* play status */ #define AVRCP_PLAY_STATUS_STOPPED 0x00
@@ -582,6 +583,8 @@ static const char *mediattr2str(uint32_t attr)return "Genre" ;case AVRCP_MEDIA_ATTRIBUTE_DURATION :return "Track duration" ; +case AVRCP_MEDIA_ATTRIBUTE_IMG_HANDLE : +return "Imaging handle" ;default :return "Reserved" ; }
profiles/audio/avrcp.c +6 -1
@@ -417,7 +417,8 @@ static sdp_record_t *avrcp_ct_record(bool browsing)uint16_t feat = (AVRCP_FEATURE_CATEGORY_1 |AVRCP_FEATURE_CATEGORY_2 |AVRCP_FEATURE_CATEGORY_3 | -AVRCP_FEATURE_CATEGORY_4 ); +AVRCP_FEATURE_CATEGORY_4 | +AVRCP_FEATURE_CT_GET_THUMBNAIL ); record =sdp_record_alloc ();if (!record)
@@ -883,6 +884,8 @@ static const char *metadata_to_str(uint32_t id)return "NumberOfTracks" ;case AVRCP_MEDIA_ATTRIBUTE_DURATION :return "Duration" ; +case AVRCP_MEDIA_ATTRIBUTE_IMG_HANDLE : +return "ImgHandle" ; }return NULL ;
@@ -1197,6 +1200,8 @@ static uint32_t str_to_metadata(const char *str)return AVRCP_MEDIA_ATTRIBUTE_N_TRACKS ; else if (strcasecmp(str, "Duration") == 0) return AVRCP_MEDIA_ATTRIBUTE_DURATION; + else if (strcasecmp(str, "ImgHandle") == 0) + return AVRCP_MEDIA_ATTRIBUTE_IMG_HANDLE;return 0 ; }
profiles/audio/avrcp.h +2 -1
@@ -46,7 +46,8 @@#define AVRCP_MEDIA_ATTRIBUTE_N_TRACKS 0x05#define AVRCP_MEDIA_ATTRIBUTE_GENRE 0x06#define AVRCP_MEDIA_ATTRIBUTE_DURATION 0x07 -#define AVRCP_MEDIA_ATTRIBUTE_LAST AVRCP_MEDIA_ATTRIBUTE_DURATION +#define AVRCP_MEDIA_ATTRIBUTE_IMG_HANDLE 0x08 +#define AVRCP_MEDIA_ATTRIBUTE_LAST AVRCP_MEDIA_ATTRIBUTE_IMG_HANDLE/* play status */ #define AVRCP_PLAY_STATUS_STOPPED 0x00
tools/parser/avrcp.c +3 -0
@@ -160,6 +160,7 @@#define AVRCP_MEDIA_ATTRIBUTE_TOTAL 0x5#define AVRCP_MEDIA_ATTRIBUTE_GENRE 0x6#define AVRCP_MEDIA_ATTRIBUTE_DURATION 0x7 +#define AVRCP_MEDIA_ATTRIBUTE_IMG_HANDLE 0x08/* play status */ #define AVRCP_PLAY_STATUS_STOPPED 0x00
@@ -933,6 +934,8 @@ static const char *mediattr2str(uint32_t attr)return "Genre" ;case AVRCP_MEDIA_ATTRIBUTE_DURATION :return "Track duration" ; +case AVRCP_MEDIA_ATTRIBUTE_IMG_HANDLE : +return "Imaging handle" ;default :return "Reserved" ; }
Signature · 1 line
2.34.1
PATCH v3 4/9 obexd: Add support for specific headers in obex transfer
In reply to Frédéric DanisThe BIP is using the Image Handle Tag header to set the file handle to transfer.
--- obexd/client/transfer.c | 19 +++++++++++++++++++ obexd/client/transfer.h | 2 ++ 2 files changed, 21 insertions(+)
obexd/client/transfer.c +19 -0
@@ -57,6 +57,7 @@ struct obc_transfer {GObex *obex;uint8_t status;GObexApparam *apparam; +GSList *headers;guint8 op;struct transfer_callback *callback;DBusConnection *conn;
@@ -400,6 +401,11 @@ static const GDBusPropertyTable obc_transfer_properties[] = { { } }; +static void header_free (void *data,void *user_data) +{ +g_obex_header_free (data); +} +static void obc_transfer_free (struct obc_transfer *transfer) {DBG ("%p" , transfer);
@@ -441,6 +447,8 @@ static void obc_transfer_free(struct obc_transfer *transfer)if (transfer->obex)g_obex_unref (transfer->obex); +g_slist_foreach (transfer->headers, header_free,NULL ); +g_slist_free (transfer->headers);g_free (transfer->callback);g_free (transfer->owner);g_free (transfer->filename);
@@ -820,6 +828,12 @@ static gboolean transfer_start_get(struct obc_transfer *transfer, GError **err)g_obex_packet_add_bytes (req,G_OBEX_HDR_TYPE , transfer->type,strlen (transfer->type) +1 ); +while (transfer->headers) { + hdr = transfer->headers->data; +g_obex_packet_add_header (req, hdr); + transfer->headers =g_slist_remove (transfer->headers, hdr); + } +if (transfer->apparam !=NULL ) { hdr =g_obex_header_new_apparam (transfer->apparam);g_obex_packet_add_header (req, hdr);
@@ -974,3 +988,8 @@ gint64 obc_transfer_get_size(struct obc_transfer *transfer) {return transfer->size; } + +void obc_transfer_add_header (struct obc_transfer *transfer,void *data) +{ + transfer->headers =g_slist_append (transfer->headers, data); +}
obexd/client/transfer.h +2 -0
@@ -47,3 +47,5 @@ gint64 obc_transfer_get_size(struct obc_transfer *transfer);DBusMessage *obc_transfer_create_dbus_reply (struct obc_transfer *transfer,DBusMessage *message); + +void obc_transfer_add_header (struct obc_transfer *transfer,void *data);
Signature · 1 line
2.34.1
PATCH v3 5/9 obexd: Add BIP client for AVRCP cover art download
In reply to Frédéric DanisThe cover art image handle is available in the metadata of the track when the OBEX BIP session is connected to the PSM port provided in AVRCP SDP record and available as org.bluez.MediaPlayer property.
This service allows to get the thumbnail.
--- Makefile.obexd | 1 + obexd/client/bip.c | 171 +++++++++++++++++++++++++++++++++++++++++ obexd/client/bip.h | 12 +++ obexd/client/manager.c | 2 + 4 files changed, 186 insertions(+) create mode 100644 obexd/client/bip.c create mode 100644 obexd/client/bip.h
Makefile.obexd +1 -0
@@ -81,6 +81,7 @@ obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \ obexd/client/ftp.h obexd/client/ftp.c \ obexd/client/opp.h obexd/client/opp.c \ obexd/client/map.h obexd/client/map.c \ + obexd/client/bip.h obexd/client/bip.c \ obexd/client/map-event.h obexd/client/map-event.c \ obexd/client/transfer.h obexd/client/transfer.c \ obexd/client/transport.h obexd/client/transport.c \
obexd/client/bip.c new file +171 -0
171 lines not on this page · raw message
obexd/client/bip.h new file +12 -0
@@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* +* OBEX Client +* +* Copyright (C) 2024 Collabora Ltd. +* +* +*/ + +int bip_init (void ); +void bip_exit (void );
obexd/client/manager.c +2 -0
@@ -32,6 +32,7 @@#include "pbap.h" #include "sync.h" #include "map.h" +#include "bip.h" #include "manager.h" #define CLIENT_INTERFACE "org.bluez.obex.Client1"
@@ -258,6 +259,7 @@ static const struct obc_module { { "pbap", pbap_init, pbap_exit }, { "sync", sync_init, sync_exit }, { "map", map_init, map_exit }, + { "bip", bip_init, bip_exit }, { } };
Signature · 1 line
2.34.1
Luiz Augusto von Dentz
maintainerRe: [PATCH BlueZ v3 5/9] obexd: Add BIP client for AVRCP cover art download
Hi Frédéric,
Quoted 52 lines · Frédéric Danis
The cover art image handle is available in the metadata of the track when the OBEX BIP session is connected to the PSM port provided in AVRCP SDP record and available as org.bluez.MediaPlayer property.
This service allows to get the thumbnail.
--- Makefile.obexd | 1 + obexd/client/bip.c | 171 +++++++++++++++++++++++++++++++++++++++++ obexd/client/bip.h | 12 +++ obexd/client/manager.c | 2 + 4 files changed, 186 insertions(+) create mode 100644 obexd/client/bip.c create mode 100644 obexd/client/bip.hMakefile.obexd +1
-0@@ -81,6 +81,7 @@ obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \ obexd/client/ftp.h obexd/client/ftp.c \ obexd/client/opp.h obexd/client/opp.c \ obexd/client/map.h obexd/client/map.c \ + obexd/client/bip.h obexd/client/bip.c \ obexd/client/map-event.h obexd/client/map-event.c \ obexd/client/transfer.h obexd/client/transfer.c \ obexd/client/transport.h obexd/client/transport.c \obexd/client/bip.c new file +19
-0@@ -0,0 +1,171 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* +* OBEX Client +* +* Copyright (C) 2024 Collabora Ltd. +* +* +*/ + +#define _GNU_SOURCE +#include <errno.h> +#include <stdlib.h> +#include <string.h> + +#include "gdbus/gdbus.h" +#include "gobex/gobex.h" + +#include "obexd/src/log.h"
obexd/client/bip.c line 29
Quoted 10 lines
obexd/client/bip.c new file +10
-0+#include "transfer.h" +#include "session.h" +#include "driver.h" +#include "bip.h" + +#define OBEX_BIP_AVRCP_UUID \ + "\x71\x63\xDD\x54\x4A\x7E\x11\xE2\xB4\x7C\x00\x50\xC2\x49\x00\x48" +#define OBEX_BIP_AVRCP_UUID_LEN 16 + +#define BIP_AVRCP_INTERFACE "org.bluez.obex.BipAvrcp1"
I'd go with org.bluez.obex.Image and then work the details of BIP vs BIP-AVRCP internally.
Quoted 43 lines
obexd/client/bip.c new file +43
-0+#define ERROR_INTERFACE "org.bluez.obex.Error" +#define BIP_AVRCP_UUID "0000111A-0000-1000-8000-00805f9b34fb" + +#define IMG_HANDLE_TAG 0x30 + +static DBusConnection *conn; + +struct bip_avrcp_data { +struct obc_session *session; +}; + +static DBusMessage *get_image_thumbnail (DBusConnection *connection, +DBusMessage *message,void *user_data) +{ +struct bip_avrcp_data *bip_avrcp = user_data; +const char *handle =NULL , *image_path =NULL ; +struct obc_transfer *transfer; +GObexHeader *header; +DBusMessage *reply =NULL ; +GError *err =NULL ; + +DBG ("" ); + +if (dbus_message_get_args (message,NULL , +DBUS_TYPE_STRING , &image_path, +DBUS_TYPE_STRING , &handle, +DBUS_TYPE_INVALID ) == FALSE) { + reply =g_dbus_create_error (message, +ERROR_INTERFACE ".InvalidArguments" ,NULL ); +return reply; + } + + transfer =obc_transfer_get ("x-bt/img-thm" ,NULL , image_path, &err); +if (transfer ==NULL ) + goto fail; + + header =g_obex_header_new_unicode (IMG_HANDLE_TAG , handle); +obc_transfer_add_header (transfer, header); + +if (!obc_session_queue (bip_avrcp->session, transfer,NULL ,NULL , &err)) + goto fail; + +return obc_transfer_create_dbus_reply (transfer, message);
obexd/client/bip.c line 82
Quoted 10 lines
obexd/client/bip.c new file +10
-0+ +fail: + reply =g_dbus_create_error (message,ERROR_INTERFACE ".Failed" ,"%s" , + err->message); +g_error_free (err); +return reply; +} + +static const GDBusMethodTable bip_avrcp_methods[] = { + { GDBUS_ASYNC_METHOD("GetImageThumbnail",
If we rename the interface to Image then this can be just "GetThumbnail".
Quoted 131 lines
obexd/client/bip.c new file +89
-0+ GDBUS_ARGS({ "file", "s" }, { "handle", "s"}), + GDBUS_ARGS({ "transfer", "o" }, { "properties", "a{sv}" }), + get_image_thumbnail) }, + { } +}; + +static void bip_avrcp_free (void *data) +{ +struct bip_avrcp_data *bip_avrcp = data; + +obc_session_unref (bip_avrcp->session); +g_free (bip_avrcp); +} + +static int bip_avrcp_probe (struct obc_session *session) +{ +struct bip_avrcp_data *bip_avrcp; +const char *path; + + path =obc_session_get_path (session); + +DBG ("%s" , path); + + bip_avrcp = g_try_new0(struct bip_avrcp_data, 1); +if (!bip_avrcp) +return -ENOMEM ; + + bip_avrcp->session =obc_session_ref (session); + +if (!g_dbus_register_interface (conn, path,BIP_AVRCP_INTERFACE , + bip_avrcp_methods, +NULL ,NULL , + bip_avrcp, bip_avrcp_free)) { +bip_avrcp_free (bip_avrcp); +return -ENOMEM ; + } + +return 0 ; +} + +static void bip_avrcp_remove (struct obc_session *session) +{ +const char *path =obc_session_get_path (session); + +DBG ("%s" , path); + +g_dbus_unregister_interface (conn, path,BIP_AVRCP_INTERFACE ); +} + +static struct obc_driver bip_avrcp = { + .service ="BIP-AVRCP" , + .uuid =BIP_AVRCP_UUID , + .target =OBEX_BIP_AVRCP_UUID , + .target_len =OBEX_BIP_AVRCP_UUID_LEN , + .probe = bip_avrcp_probe, + .remove = bip_avrcp_remove +}; + +int bip_init (void ) +{ +int err; + +DBG ("" ); + + conn =dbus_bus_get (DBUS_BUS_SESSION ,NULL ); +if (!conn) +return -EIO ; + + err =obc_driver_register (&bip_avrcp); +if (err <0 ) + goto failed; + +return 0 ; + +failed: +dbus_connection_unref (conn); + conn =NULL ; +return err; +} + +void bip_exit (void ) +{ +DBG ("" ); + +dbus_connection_unref (conn); + conn =NULL ; + +obc_driver_unregister (&bip_avrcp); +}obexd/client/bip.h new file +12
-0@@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* +* OBEX Client +* +* Copyright (C) 2024 Collabora Ltd. +* +* +*/ + +int bip_init (void ); +void bip_exit (void );obexd/client/manager.c +2
-1@@ -32,6 +32,7 @@#include "pbap.h" #include "sync.h" #include "map.h" +#include "bip.h" #include "manager.h" #define CLIENT_INTERFACE "org.bluez.obex.Client1"@@ -258,6 +259,7 @@ static const struct obc_module { { "pbap", pbap_init, pbap_exit }, { "sync", sync_init, sync_exit }, { "map", map_init, map_exit }, + { "bip", bip_init, bip_exit }, { } }; --2.34.1
Signature · 1 line
Luiz Augusto von Dentz
PATCH v3 6/9 obexd: Add GetImageProperties to bip-avrcp
In reply to Frédéric DanisThis allows to get the different version of the image provided by the remote device to chose the one to use with GetImage.
This bip-common.[ch] files are based on previous work done by Jakub Adamek for GSoC 2011, see [1] and [2].
[1] https://www.bluez.org/gsoc-basic-image-profilebip/
[2] https://github.com/enkait/Basic-Imaging-Profile-in-obexd/blob/gsoc_final/plugins/bip_util.c
--- Makefile.obexd | 1 + obexd/client/bip-common.c | 781 ++++++++++++++++++++++++++++++++++++++ obexd/client/bip-common.h | 19 + obexd/client/bip.c | 101 +++++ 4 files changed, 902 insertions(+) create mode 100644 obexd/client/bip-common.c create mode 100644 obexd/client/bip-common.h
Makefile.obexd +1 -0
@@ -82,6 +82,7 @@ obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \ obexd/client/opp.h obexd/client/opp.c \ obexd/client/map.h obexd/client/map.c \ obexd/client/bip.h obexd/client/bip.c \ + obexd/client/bip-common.h obexd/client/bip-common.c \ obexd/client/map-event.h obexd/client/map-event.c \ obexd/client/transfer.h obexd/client/transfer.c \ obexd/client/transport.h obexd/client/transport.c \
obexd/client/bip-common.c new file +781 -0
781 lines not on this page · raw message
obexd/client/bip-common.h new file +19 -0
@@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* +* OBEX Client +* +* Copyright (C) 2024 Collabora Ltd. +* +* +*/ + +#include <glib.h> +#include "gdbus/gdbus.h" + +struct prop_object ; + +struct prop_object *parse_properties (char *data,unsigned int length, +int *err); +gboolean verify_properties (struct prop_object *obj); +void append_properties (DBusMessageIter *args,struct prop_object *obj);
obexd/client/bip.c +101 -0
119 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v3 7/9 obexd: Add GetImage to bip-avrcp
In reply to Frédéric DanisRetrieves the image corresponding to the handle and the description, as one of the descriptions retrieved by GetImageProperties, and store it in a local file.
If the "transform" property description exists it should be set to one of the value listed by GetImageProperties for this description.
--- obexd/client/bip-common.c | 21 ++++- obexd/client/bip-common.h | 5 ++ obexd/client/bip.c | 168 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 193 insertions(+), 1 deletion(-)
obexd/client/bip-common.c +20 -1
@@ -49,7 +49,7 @@ static const gchar *convBIP2IM(const gchar *encoding)return NULL ; } -static gboolean parse_pixel_range (const gchar *dim,unsigned int *lower_ret, +gboolean parse_pixel_range (const gchar *dim,unsigned int *lower_ret,unsigned int *upper_ret,gboolean *fixed_ratio_ret) {
@@ -139,6 +139,18 @@ char *transforms[] = { NULL }; +gboolean verify_encoding (const char *encoding) +{ +struct encconv_pair *et = encconv_table; + +while (et->bip) { +if (g_strcmp0 (encoding, et->bip) ==0 ) +return TRUE; + et++; + } +return FALSE; +} +static gboolean verify_transform (const char *transform) {char **str = transforms;
@@ -151,6 +163,13 @@ static gboolean verify_transform(const char *transform)return FALSE; } +char *parse_transform (const char *transform) +{ +if (!verify_transform (transform)) +return NULL ; +return g_strdup (transform); +} +static char *parse_transform_list (const char *transform) {char **args =NULL , **arg =NULL ;
obexd/client/bip-common.h +5 -0
@@ -13,6 +13,11 @@struct prop_object ; +gboolean parse_pixel_range (const gchar *dim,unsigned int *lower_ret, +unsigned int *upper_ret, +gboolean *fixed_ratio_ret); +gboolean verify_encoding (const char *encoding); +char *parse_transform (const char *transform);struct prop_object *parse_properties (char *data,unsigned int length,int *err);gboolean verify_properties (struct prop_object *obj);
obexd/client/bip.c +168 -0
185 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v3 8/9 avrcp: Update controller SDP record with cover art support
In reply to Frédéric Danis--- profiles/audio/avrcp.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
profiles/audio/avrcp.c +7 -5
@@ -413,12 +413,14 @@ static sdp_record_t *avrcp_ct_record(bool browsing)sdp_record_t *record;sdp_data_t *psm[2 ], *version, *features;uint16_t lp =AVCTP_CONTROL_PSM ; -uint16_t avctp_ver =0x0103 ; +uint16_t avctp_ver =0x0106 ;uint16_t feat = (AVRCP_FEATURE_CATEGORY_1 | -AVRCP_FEATURE_CATEGORY_2 | -AVRCP_FEATURE_CATEGORY_3 | -AVRCP_FEATURE_CATEGORY_4 | -AVRCP_FEATURE_CT_GET_THUMBNAIL ); +AVRCP_FEATURE_CATEGORY_2 | +AVRCP_FEATURE_CATEGORY_3 | +AVRCP_FEATURE_CATEGORY_4 | +AVRCP_FEATURE_CT_GET_IMAGE_PROP | +AVRCP_FEATURE_CT_GET_IMAGE | +AVRCP_FEATURE_CT_GET_THUMBNAIL ); record =sdp_record_alloc ();if (!record)
Signature · 1 line
2.34.1
PATCH v3 9/9 doc: Add description of org.bluez.obex.BipAvrcp
In reply to Frédéric DanisThis new interface allows to get the image referenced in the audio metadata ImgHandle available in org.bluez.MediaPlayer track properties. The image handle is only available in track info if an OBEX session is connected to the ObexPort port provided in org.bluez.MediaPlayer properties.
--- Makefile.am | 9 +++-- doc/org.bluez.obex.BipAvrcp.rst | 72 +++++++++++++++++++++++++++++++++ doc/org.bluez.obex.Client.rst | 1 + 3 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 doc/org.bluez.obex.BipAvrcp.rst
Makefile.am +6 -3
@@ -382,7 +382,8 @@ man_MANS += doc/org.bluez.obex.Client.5 doc/org.bluez.obex.Session.5 \ doc/org.bluez.obex.PhonebookAccess.5 \ doc/org.bluez.obex.MessageAccess.5 \ doc/org.bluez.obex.Message.5 \ - doc/org.bluez.obex.AgentManager.5 doc/org.bluez.obex.Agent.5 + doc/org.bluez.obex.AgentManager.5 doc/org.bluez.obex.Agent.5 \ + doc/org.bluez.obex.BipAvrcp.5 endif manual_pages += src/bluetoothd.8 manual_pages += doc/l2cap.7 doc/rfcomm.7
@@ -415,7 +416,8 @@ manual_pages += doc/org.bluez.obex.Client.5 doc/org.bluez.obex.Session.5 \ doc/org.bluez.obex.PhonebookAccess.5 \ doc/org.bluez.obex.MessageAccess.5 \ doc/org.bluez.obex.Message.5 \ - doc/org.bluez.obex.AgentManager.5 doc/org.bluez.obex.Agent.5 + doc/org.bluez.obex.AgentManager.5 doc/org.bluez.obex.Agent.5 \ + doc/org.bluez.obex.BipAvrcp.5 EXTRA_DIST += src/genbuiltin src/bluetooth.conf \ src/main.conf profiles/network/network.conf \
@@ -497,7 +499,8 @@ EXTRA_DIST += doc/org.bluez.obex.Client.rst doc/org.bluez.obex.Session.rst \ doc/org.bluez.obex.PhonebookAccess.rst \ doc/org.bluez.obex.MessageAccess.rst \ doc/org.bluez.obex.Message.rst \ - doc/org.bluez.obex.AgentManager.rst doc/org.bluez.obex.Agent.rst + doc/org.bluez.obex.AgentManager.rst doc/org.bluez.obex.Agent.rst \ + doc/org.bluez.obex.BipAvrcp.rst EXTRA_DIST += doc/pics-opp.txt doc/pixit-opp.txt \ doc/pts-opp.txt
doc/org.bluez.obex.BipAvrcp.rst new file +72 -0
72 lines not on this page · raw message
doc/org.bluez.obex.Client.rst +1 -0
@@ -43,6 +43,7 @@ object CreateSession(string destination, dict args) :"opp": :"pbap": :"sync": + :"bip-avrcp": :string Source:
Signature · 1 line
2.34.1
Luiz Augusto von Dentz
maintainerRe: [PATCH BlueZ v3 9/9] doc: Add description of org.bluez.obex.BipAvrcp
Hi Frédéric,
Quoted 61 lines · Frédéric Danis
This new interface allows to get the image referenced in the audio metadata ImgHandle available in org.bluez.MediaPlayer track properties. The image handle is only available in track info if an OBEX session is connected to the ObexPort port provided in org.bluez.MediaPlayer properties.
--- Makefile.am | 9 +++-- doc/org.bluez.obex.BipAvrcp.rst | 72 +++++++++++++++++++++++++++++++++ doc/org.bluez.obex.Client.rst | 1 + 3 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 doc/org.bluez.obex.BipAvrcp.rstMakefile.am +6
-3@@ -382,7 +382,8 @@ man_MANS += doc/org.bluez.obex.Client.5 doc/org.bluez.obex.Session.5 \ doc/org.bluez.obex.PhonebookAccess.5 \ doc/org.bluez.obex.MessageAccess.5 \ doc/org.bluez.obex.Message.5 \ - doc/org.bluez.obex.AgentManager.5 doc/org.bluez.obex.Agent.5 + doc/org.bluez.obex.AgentManager.5 doc/org.bluez.obex.Agent.5 \ + doc/org.bluez.obex.BipAvrcp.5 endif manual_pages += src/bluetoothd.8 manual_pages += doc/l2cap.7 doc/rfcomm.7@@ -415,7 +416,8 @@ manual_pages += doc/org.bluez.obex.Client.5 doc/org.bluez.obex.Session.5 \ doc/org.bluez.obex.PhonebookAccess.5 \ doc/org.bluez.obex.MessageAccess.5 \ doc/org.bluez.obex.Message.5 \ - doc/org.bluez.obex.AgentManager.5 doc/org.bluez.obex.Agent.5 + doc/org.bluez.obex.AgentManager.5 doc/org.bluez.obex.Agent.5 \ + doc/org.bluez.obex.BipAvrcp.5 EXTRA_DIST += src/genbuiltin src/bluetooth.conf \ src/main.conf profiles/network/network.conf \@@ -497,7 +499,8 @@ EXTRA_DIST += doc/org.bluez.obex.Client.rst doc/org.bluez.obex.Session.rst \ doc/org.bluez.obex.PhonebookAccess.rst \ doc/org.bluez.obex.MessageAccess.rst \ doc/org.bluez.obex.Message.rst \ - doc/org.bluez.obex.AgentManager.rst doc/org.bluez.obex.Agent.rst + doc/org.bluez.obex.AgentManager.rst doc/org.bluez.obex.Agent.rst \ + doc/org.bluez.obex.BipAvrcp.rst EXTRA_DIST += doc/pics-opp.txt doc/pixit-opp.txt \ doc/pts-opp.txtdoc/org.bluez.obex.BipAvrcp.rst new file +8
-0@@ -0,0 +1,72 @@ +======================= +org.bluez.obex.BipAvrcp +======================= + +-------------------------------------------------- +BlueZ D-Bus OBEX BipAvrcp API documentation +-------------------------------------------------- +
doc/org.bluez.obex.BipAvrcp.rst line 18
Quoted 10 lines
doc/org.bluez.obex.BipAvrcp.rst new file +10
-0+:Version: BlueZ +:Date: August 2024 +:Manual section: 5 +:Manual group: Linux System Administration + +Interface +========= + +:Service: org.bluez.obex +:Interface: org.bluez.obex.BipAvrcp1 [experimental]
org.bluez.obex.Image
doc/org.bluez.obex.BipAvrcp.rst line 29
Quoted 11 lines
doc/org.bluez.obex.BipAvrcp.rst new file +11
-0+:Object path: [Session object path] + +Methods +------- + +object, dict GetImage(string targetfile, string handle, dict description) +````````````````````````````````````````````````````````````````````````` + + Retrieves the image corresponding to the handle and the description, as + one of the descriptions retrieved by GetImageProperties, and store it in + a local file.
We can probably just use Get instead of GetImage.
doc/org.bluez.obex.BipAvrcp.rst line 32
Quoted 3 lines
doc/org.bluez.obex.BipAvrcp.rst new file +3
-0+ + If the "transform" property description exists it should be set to one + of the value listed by GetImageProperties for this description.
Id probably got with properties as the name so it is more obvious that it is referring to GetProperty, or perhaps options and rename the method to GetOptions.
Quoted 13 lines
doc/org.bluez.obex.BipAvrcp.rst new file +13
-0+ If description is an empty dict, the native image will be retrieved; + + Possible errors: + + :org.bluez.obex.Error.InvalidArguments: + :org.bluez.obex.Error.Failed: + +array{dict} GetImageproperties(string handle) +````````````````````````````````````````````` + + Retrieves the image properties corresponding to the handle. + + The first dict entry is mandatory and correspond to 'handle' and 'name'
doc/org.bluez.obex.BipAvrcp.rst line 56
Quoted 10 lines
doc/org.bluez.obex.BipAvrcp.rst new file +10
-0+ of the image. + + The second dict entry is mandatory and correspond to the native description + ('type':'native') of the image. + + The following dict entries are optional and correspond to variant + descriptions of the image. If the 'transform' entry exists in the + description, it lists the available possible image transformations and + should be set to one of them before using the description as parameter + to GetImage.
I'd recommend we include the list of possible table of key-value pairs we could return here, otherwise the client would have to look at the spec which sort of defeats the purpose of having this documented here.
doc/org.bluez.obex.BipAvrcp.rst line 67
Quoted 11 lines
doc/org.bluez.obex.BipAvrcp.rst new file +11
-0+ + Possible errors: + + :org.bluez.obex.Error.InvalidArguments: + :org.bluez.obex.Error.Failed: + +object, dict GetImageThumbnail(string targetfile, string handle) +```````````````````````````````````````````````````````````````` + + Retrieves the image thumbnail corresponding to the handle and store it in + a local file.
GetThumbnail, also I assume the options don't apply here? So I assume we cannot ask the server to convert to a different format?
doc/org.bluez.obex.Client.rst object CreateSession(string destination, dict args) · line 46
Quoted 13 lines
doc/org.bluez.obex.BipAvrcp.rst new file +4
-0+ Possible errors: + + :org.bluez.obex.Error.InvalidArguments: + :org.bluez.obex.Error.Failed:doc/org.bluez.obex.Client.rst +1
-0@@ -43,6 +43,7 @@ object CreateSession(string destination, dict args) :"opp": :"pbap": :"sync": + :"bip-avrcp":
This change should probably go alongside the patch that introduces support for creating the session of this type.
Quoted 6 lines
doc/org.bluez.obex.Client.rst +0
-1:string Source: --2.34.1
Signature · 1 line
Luiz Augusto von Dentz
This series was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This series was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 11 lines · On Mon, 16 Sep 2024 15:28:04 +0200 you wrote:
If AVRCP Target supports Cover Art download its SDP record contains an additional access protocol for OBEX with an LCAP PSM on which the OBEX client session should connect to, with the specific OBEX target header 7163DD54-4A7E-11E2-B47C-0050C2490048.
Once the OBEX session is connected, the AVRCP track metadata will contain an Image Handle which can be used to get the associated image using GetImageThumbnail or GetImage with one of the description property found with GetImageProperties.
[...]
Here is the summary with links:
- [BlueZ,v3,1/9] obexd: Add PSM support to session create
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=5d7d3ac25bd5 - [BlueZ,v3,2/9] player: Add OBEX PSM port for cover art support https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=4c05a0ff41c8 - [BlueZ,v3,3/9] player: Add image handle support property https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=5cd301e888a1 - [BlueZ,v3,4/9] obexd: Add support for specific headers in obex transfer https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=8562d0e3874e
- [BlueZ,v3,5/9] obexd: Add BIP client for AVRCP cover art download (no matching commit)
- [BlueZ,v3,6/9] obexd: Add GetImageProperties to bip-avrcp
(no matching commit)
- [BlueZ,v3,7/9] obexd: Add GetImage to bip-avrcp
(no matching commit)
- [BlueZ,v3,8/9] avrcp: Update controller SDP record with cover art support (no matching commit)
- [BlueZ,v3,9/9] doc: Add description of org.bluez.obex.BipAvrcp (no matching commit)
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html