Hi Jo?o Paulo,
On Wed, Mar 27, 2013 at 6:17 AM, <jprvita at gmail.com> wrote:
> From: Jo?o Paulo Rechi Vita <jprvita at openbossa.org>
>
> Use the correct value for block size and instead of trying to acquire
> the transport, get it from the HF card.
> ---
> src/modules/bluetooth/bluetooth-util.c | 15 +++++++++++++++
> src/modules/bluetooth/module-bluetooth-device.c | 2 +-
> 2 files changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c
> index a2be396..37d96ee 100644
> --- a/src/modules/bluetooth/bluetooth-util.c
> +++ b/src/modules/bluetooth/bluetooth-util.c
> @@ -1838,6 +1838,21 @@ int pa_bluetooth_transport_acquire(pa_bluetooth_transport *t, bool optional, siz
> pa_assert(t->device);
> pa_assert(t->device->discovery);
>
> + if (t->profile == PROFILE_HFP_AG) {
> + struct handsfree_card *hf_card = pa_hashmap_get(t->device->discovery->hf_cards, t->path);
> +
> + /* TODO: get block size from adapter and USB endpoint */
> + if (imtu)
> + *imtu = 48;
> + if (omtu)
> + *omtu = 48;
> +
> + if (hf_card)
> + return hf_card->fd;
> + else
> + return -1;
> + }
> +
> dbus_error_init(&err);
>
> if (t->device->discovery->version == BLUEZ_VERSION_4) {
> diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
> index 1027dd5..47457e5 100644
> --- a/src/modules/bluetooth/module-bluetooth-device.c
> +++ b/src/modules/bluetooth/module-bluetooth-device.c
> @@ -243,7 +243,7 @@ static void a2dp_set_bitpool(struct userdata *u, uint8_t bitpool)
> /* from IO thread, except in SCO over PCM */
> static void bt_transport_config_mtu(struct userdata *u) {
> /* Calculate block sizes */
> - if (u->profile == PROFILE_HSP || u->profile == PROFILE_HFGW) {
> + if (u->profile == PROFILE_HSP || u->profile == PROFILE_HFGW || u->profile == PROFILE_HFP_AG) {
> u->read_block_size = u->read_link_mtu;
> u->write_block_size = u->write_link_mtu;
> } else {
> --
> 1.7.11.7
>
This is actually not what pa_bluetooth_transport_acquire() is supposed
to do. What you implemented works only if optional==true, but
otherwise you're supposed to initiate the audio stream.
Having a look at oFono's API, you should be calling
HandsfreeAudioCard.Connect(), and block until the fd is received. I'm
eager to see how you achieve this since oFono's API seems quite
inconvenient to implement this, given that Connect() doesn't return
the fd. This is admittedly a problem in PA, but due to practical
reasons, unless you find a nice way to block until the NewConnection
call is received, I would suggest oFono's API should be modified to
return this fd as a result of HandsfreeAudioCard.Connect() for
convenience of PA-like clients.
Cheers,
Mikel
