From: Vani Patel <[email protected]>
Adds SDP record to support browsing
---
audio/avctp.c | 4 ++--
audio/avctp.h | 3 ++-
audio/avrcp.c | 25 +++++++++++++++++++++----
3 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/audio/avctp.c b/audio/avctp.c
index 074eabd..a20dba9 100644
--- a/audio/avctp.c
+++ b/audio/avctp.c
@@ -802,7 +802,7 @@ static GIOChannel *avctp_server_socket(const bdaddr_t *src, gboolean master)
io = bt_io_listen(BT_IO_L2CAP, NULL, avctp_confirm_cb, NULL,
NULL, &err,
BT_IO_OPT_SOURCE_BDADDR, src,
- BT_IO_OPT_PSM, AVCTP_PSM,
+ BT_IO_OPT_PSM, AVCTP_CONTROL_PSM,
BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM,
BT_IO_OPT_MASTER, master,
BT_IO_OPT_INVALID);
@@ -1090,7 +1090,7 @@ struct avctp *avctp_connect(const bdaddr_t *src, const bdaddr_t *dst)
io = bt_io_connect(BT_IO_L2CAP, avctp_connect_cb, session, NULL, &err,
BT_IO_OPT_SOURCE_BDADDR, &session->server->src,
BT_IO_OPT_DEST_BDADDR, &session->dst,
- BT_IO_OPT_PSM, AVCTP_PSM,
+ BT_IO_OPT_PSM, AVCTP_CONTROL_PSM,
BT_IO_OPT_INVALID);
if (err) {
avctp_set_state(session, AVCTP_STATE_DISCONNECTED);
diff --git a/audio/avctp.h b/audio/avctp.h
index d0cbd97..34b0c1c 100644
--- a/audio/avctp.h
+++ b/audio/avctp.h
@@ -22,7 +22,8 @@
*
*/
-#define AVCTP_PSM 23
+#define AVCTP_CONTROL_PSM 23
+#define AVCTP_BROWSING_PSM 27
#define AVC_MTU 512
#define AVC_HEADER_LENGTH 3
diff --git a/audio/avrcp.c b/audio/avrcp.c
index d925365..ca40c1e 100644
--- a/audio/avrcp.c
+++ b/audio/avrcp.c
@@ -190,7 +190,7 @@ static sdp_record_t *avrcp_ct_record(void)
sdp_list_t *aproto, *proto[2];
sdp_record_t *record;
sdp_data_t *psm, *version, *features;
- uint16_t lp = AVCTP_PSM;
+ uint16_t lp = AVCTP_CONTROL_PSM;
uint16_t avrcp_ver = 0x0100, avctp_ver = 0x0103;
uint16_t feat = ( AVRCP_FEATURE_CATEGORY_1 |
AVRCP_FEATURE_CATEGORY_2 |
@@ -252,13 +252,15 @@ static sdp_record_t *avrcp_ct_record(void)
static sdp_record_t *avrcp_tg_record(void)
{
- sdp_list_t *svclass_id, *pfseq, *apseq, *root;
+ sdp_list_t *svclass_id, *pfseq, *apseq, *root, *apseq_browsing;
uuid_t root_uuid, l2cap, avctp, avrtg;
sdp_profile_desc_t profile[1];
sdp_list_t *aproto, *proto[2];
sdp_record_t *record;
- sdp_data_t *psm, *version, *features;
- uint16_t lp = AVCTP_PSM;
+ sdp_data_t *psm, *version, *features, *psm_browsing;
+ sdp_list_t *aproto_browsing, *proto_browsing[2] = {0};
+ uint16_t lp = AVCTP_CONTROL_PSM;
+ uint16_t lp_browsing = AVCTP_BROWSING_PSM;
uint16_t avrcp_ver = 0x0104, avctp_ver = 0x0103;
uint16_t feat = ( AVRCP_FEATURE_CATEGORY_1 |
AVRCP_FEATURE_CATEGORY_2 |
@@ -294,6 +296,17 @@ static sdp_record_t *avrcp_tg_record(void)
aproto = sdp_list_append(0, apseq);
sdp_set_access_protos(record, aproto);
+ proto_browsing[0] = sdp_list_append(0, &l2cap);
+ psm_browsing = sdp_data_alloc(SDP_UINT16, &lp_browsing);
+ proto_browsing[0] = sdp_list_append(proto_browsing[0], psm_browsing);
+ apseq_browsing = sdp_list_append(0, proto_browsing[0]);
+
+ proto_browsing[1] = sdp_list_append(0, &avctp);
+ proto_browsing[1] = sdp_list_append(proto_browsing[1], version);
+ apseq_browsing = sdp_list_append(apseq_browsing, proto_browsing[1]);
+
+ aproto_browsing = sdp_list_append(0, apseq_browsing);
+ sdp_set_add_access_protos(record, aproto_browsing);
/* Bluetooth Profile Descriptor List */
sdp_uuid16_create(&profile[0].uuid, AV_REMOTE_PROFILE_ID);
@@ -306,6 +319,10 @@ static sdp_record_t *avrcp_tg_record(void)
sdp_set_info_attr(record, "AVRCP TG", 0, 0);
+ free(psm_browsing);
+ sdp_list_free(proto_browsing[0], 0);
+ sdp_list_free(proto_browsing[1], 0);
+ sdp_list_free(aproto_browsing, 0);
free(psm);
free(version);
sdp_list_free(proto[0], 0);
--
1.7.5.4
Hi Michal,
On Mon, Aug 13, 2012 at 2:49 PM, <[email protected]> wrote:
> According to the specification we should not expose browsing in feature bits:
> "*4: Bit 6 (Browsing supported) is not set based on category. Bit 6 in the SDP record shall only be set if
> browsing of the "Media Player Virtual Filesystem" is supported."
>
> So no GetFolderItems on VFS scope - no browsing.
Well since SDP actually rely on the player to support that feature so
we might actually make it always be set and if the player doesn't
support we return an error or empty list. The spec itself states that
PlayerFeatureBitmask should be used instead, so the way I interpreted
it is that Bit 6 is there to tell if the transport support that not
the player itself.
--
Luiz Augusto von Dentz
Hi Luiz,
>> diff --git a/audio/avrcp.c b/audio/avrcp.c
>> index d925365..ca40c1e 100644
>> --- a/audio/avrcp.c
> +++ b/audio/avrcp.c
>> @@ -190,7 +190,7 @@ static sdp_record_t *avrcp_ct_record(void)
>> sdp_list_t *aproto, *proto[2];
>> sdp_record_t *record;
>> sdp_data_t *psm, *version, *features;
>> - uint16_t lp = AVCTP_PSM;
>> + uint16_t lp = AVCTP_CONTROL_PSM;
>> uint16_t avrcp_ver = 0x0100, avctp_ver = 0x0103;
>> uint16_t feat = ( AVRCP_FEATURE_CATEGORY_1 |
>> AVRCP_FEATURE_CATEGORY_2 |
>> @@ -252,13 +252,15 @@ static sdp_record_t *avrcp_ct_record(void)
>>
>> static sdp_record_t *avrcp_tg_record(void)
>> {
>> - sdp_list_t *svclass_id, *pfseq, *apseq, *root;
> + sdp_list_t *svclass_id, *pfseq, *apseq, *root, *apseq_browsing;
>> uuid_t root_uuid, l2cap, avctp, avrtg;
>> sdp_profile_desc_t profile[1];
>> sdp_list_t *aproto, *proto[2];
>> sdp_record_t *record;
>> - sdp_data_t *psm, *version, *features;
>> - uint16_t lp = AVCTP_PSM;
>> + sdp_data_t *psm, *version, *features, *psm_browsing;
>> + sdp_list_t *aproto_browsing, *proto_browsing[2] = {0};
>> + uint16_t lp = AVCTP_CONTROL_PSM;
>> + uint16_t lp_browsing = AVCTP_BROWSING_PSM;
>> uint16_t avrcp_ver = 0x0104, avctp_ver = 0x0103;
>> uint16_t feat = ( AVRCP_FEATURE_CATEGORY_1 |
>> AVRCP_FEATURE_CATEGORY_2 |
>According to the spec if we register the browsing channel we should
>set it in feature bits, btw apparently apseq_browsing is leaking
>please make sure you run your patches with valgrind/gdb to catch this
>type of errors.
>
>--
>Luiz Augusto von Dentz
According to the specification we should not expose browsing in feature bits:
"*4: Bit 6 (Browsing supported) is not set based on category. Bit 6 in the SDP record shall only be set if
browsing of the "Media Player Virtual Filesystem" is supported."
So no GetFolderItems on VFS scope - no browsing.
Regards / Pozdrawiam
-------------------------------------------------------------------------------------------------------------
Micha? ?ab?dzki
ASCII: Michal Labedzki
e-mail: [email protected]
office communicator: [email protected]
location: Poland, Wroc?aw, Legnicka 55F
room: 420
phone: +48 717 740 340
---
Tieto Corporation / Tieto Poland
http://www.tieto.com / http://www.tieto.pl
---
Tieto Poland sp??ka z ograniczon? odpowiedzialno?ci? z siedzib? w Szczecinie, ul. Malczewskiego 26. Zarejestrowana w S?dzie Rejonowym Szczecin-Centrum w Szczecinie, XIII Wydzia? Gospodarczy Krajowego Rejestru S?dowego pod numerem 0000124858. NIP: 8542085557. REGON: 812023656. Kapita? zak?adowy: 4 271500 PLN
________________________________________
Hi Vani,
On Fri, Aug 10, 2012 at 12:35 PM, Vani-dineshbhai PATEL
<[email protected]> wrote:
> From: Vani Patel <[email protected]>
>
> Adds SDP record to support browsing
> ---
> audio/avctp.c | 4 ++--
> audio/avctp.h | 3 ++-
> audio/avrcp.c | 25 +++++++++++++++++++++----
> 3 files changed, 25 insertions(+), 7 deletions(-)
>
> diff --git a/audio/avctp.c b/audio/avctp.c
> index 074eabd..a20dba9 100644
> --- a/audio/avctp.c
> +++ b/audio/avctp.c
> @@ -802,7 +802,7 @@ static GIOChannel *avctp_server_socket(const bdaddr_t *src, gboolean master)
> io = bt_io_listen(BT_IO_L2CAP, NULL, avctp_confirm_cb, NULL,
> NULL, &err,
> BT_IO_OPT_SOURCE_BDADDR, src,
> - BT_IO_OPT_PSM, AVCTP_PSM,
> + BT_IO_OPT_PSM, AVCTP_CONTROL_PSM,
> BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM,
> BT_IO_OPT_MASTER, master,
> BT_IO_OPT_INVALID);
> @@ -1090,7 +1090,7 @@ struct avctp *avctp_connect(const bdaddr_t *src, const bdaddr_t *dst)
> io = bt_io_connect(BT_IO_L2CAP, avctp_connect_cb, session, NULL, &err,
> BT_IO_OPT_SOURCE_BDADDR, &session->server->src,
> BT_IO_OPT_DEST_BDADDR, &session->dst,
> - BT_IO_OPT_PSM, AVCTP_PSM,
> + BT_IO_OPT_PSM, AVCTP_CONTROL_PSM,
> BT_IO_OPT_INVALID);
> if (err) {
> avctp_set_state(session, AVCTP_STATE_DISCONNECTED);
> diff --git a/audio/avctp.h b/audio/avctp.h
> index d0cbd97..34b0c1c 100644
> --- a/audio/avctp.h
> +++ b/audio/avctp.h
> @@ -22,7 +22,8 @@
> *
> */
>
> -#define AVCTP_PSM 23
> +#define AVCTP_CONTROL_PSM 23
> +#define AVCTP_BROWSING_PSM 27
>
> #define AVC_MTU 512
> #define AVC_HEADER_LENGTH 3
> diff --git a/audio/avrcp.c b/audio/avrcp.c
> index d925365..ca40c1e 100644
> --- a/audio/avrcp.c
> +++ b/audio/avrcp.c
> @@ -190,7 +190,7 @@ static sdp_record_t *avrcp_ct_record(void)
> sdp_list_t *aproto, *proto[2];
> sdp_record_t *record;
> sdp_data_t *psm, *version, *features;
> - uint16_t lp = AVCTP_PSM;
> + uint16_t lp = AVCTP_CONTROL_PSM;
> uint16_t avrcp_ver = 0x0100, avctp_ver = 0x0103;
> uint16_t feat = ( AVRCP_FEATURE_CATEGORY_1 |
> AVRCP_FEATURE_CATEGORY_2 |
> @@ -252,13 +252,15 @@ static sdp_record_t *avrcp_ct_record(void)
>
> static sdp_record_t *avrcp_tg_record(void)
> {
> - sdp_list_t *svclass_id, *pfseq, *apseq, *root;
> + sdp_list_t *svclass_id, *pfseq, *apseq, *root, *apseq_browsing;
> uuid_t root_uuid, l2cap, avctp, avrtg;
> sdp_profile_desc_t profile[1];
> sdp_list_t *aproto, *proto[2];
> sdp_record_t *record;
> - sdp_data_t *psm, *version, *features;
> - uint16_t lp = AVCTP_PSM;
> + sdp_data_t *psm, *version, *features, *psm_browsing;
> + sdp_list_t *aproto_browsing, *proto_browsing[2] = {0};
> + uint16_t lp = AVCTP_CONTROL_PSM;
> + uint16_t lp_browsing = AVCTP_BROWSING_PSM;
> uint16_t avrcp_ver = 0x0104, avctp_ver = 0x0103;
> uint16_t feat = ( AVRCP_FEATURE_CATEGORY_1 |
> AVRCP_FEATURE_CATEGORY_2 |
According to the spec if we register the browsing channel we should
set it in feature bits, btw apparently apseq_browsing is leaking
please make sure you run your patches with valgrind/gdb to catch this
type of errors.
--
Luiz Augusto von Dentz