* [PATCH BlueZ 1/5] audio: Remove unix socket support
@ 2012-06-14 13:41 Luiz Augusto von Dentz
2012-06-14 13:41 ` [PATCH BlueZ 2/5] audio: Remove ALSA support Luiz Augusto von Dentz
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Luiz Augusto von Dentz @ 2012-06-14 13:41 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Unix socket support is deprecated by Media API.
---
Makefile.am | 1 -
audio/a2dp.c | 4 -
audio/device.c | 3 -
audio/manager.c | 7 -
audio/unix.c | 1909 -------------------------------------------------------
audio/unix.h | 30 -
6 files changed, 1954 deletions(-)
delete mode 100644 audio/unix.c
delete mode 100644 audio/unix.h
diff --git a/Makefile.am b/Makefile.am
index 53fcbe9..a3a30d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -152,7 +152,6 @@ builtin_sources += audio/main.c \
audio/a2dp.h audio/a2dp.c \
audio/avdtp.h audio/avdtp.c \
audio/ipc.h audio/ipc.c \
- audio/unix.h audio/unix.c \
audio/media.h audio/media.c \
audio/transport.h audio/transport.c \
audio/telephony.h audio/a2dp-codecs.h
diff --git a/audio/a2dp.c b/audio/a2dp.c
index 64a5a8a..96137e4 100644
--- a/audio/a2dp.c
+++ b/audio/a2dp.c
@@ -43,7 +43,6 @@
#include "avdtp.h"
#include "sink.h"
#include "source.h"
-#include "unix.h"
#include "a2dp.h"
#include "sdpd.h"
@@ -1238,15 +1237,12 @@ static gboolean delayreport_ind(struct avdtp *session,
uint8_t *err, void *user_data)
{
struct a2dp_sep *a2dp_sep = user_data;
- struct audio_device *dev = a2dp_get_dev(session);
if (a2dp_sep->type == AVDTP_SEP_TYPE_SINK)
DBG("Sink %p: DelayReport_Ind", sep);
else
DBG("Source %p: DelayReport_Ind", sep);
- unix_delay_report(dev, rseid, delay);
-
return TRUE;
}
diff --git a/audio/device.c b/audio/device.c
index 6cd9cf6..51ec2d0 100644
--- a/audio/device.c
+++ b/audio/device.c
@@ -49,7 +49,6 @@
#include "ipc.h"
#include "dbus-common.h"
#include "device.h"
-#include "unix.h"
#include "avdtp.h"
#include "control.h"
#include "avctp.h"
@@ -733,8 +732,6 @@ gboolean audio_device_is_active(struct audio_device *dev,
void audio_device_unregister(struct audio_device *device)
{
- unix_device_removed(device);
-
if (device->hs_preauth_id) {
g_source_remove(device->hs_preauth_id);
device->hs_preauth_id = 0;
diff --git a/audio/manager.c b/audio/manager.c
index 7b3cd22..7ed39bb 100644
--- a/audio/manager.c
+++ b/audio/manager.c
@@ -69,7 +69,6 @@
#include "manager.h"
#include "sdpd.h"
#include "telephony.h"
-#include "unix.h"
typedef enum {
HEADSET = 1 << 0,
@@ -1243,9 +1242,6 @@ int audio_manager_init(DBusConnection *conn, GKeyFile *conf,
max_connected_headsets = i;
proceed:
- if (enabled.socket)
- unix_init();
-
if (enabled.media)
btd_register_adapter_driver(&media_server_driver);
@@ -1282,9 +1278,6 @@ void audio_manager_exit(void)
config = NULL;
}
- if (enabled.socket)
- unix_exit();
-
if (enabled.media)
btd_unregister_adapter_driver(&media_server_driver);
diff --git a/audio/unix.c b/audio/unix.c
deleted file mode 100644
index 9a10764..0000000
--- a/audio/unix.c
+++ /dev/null
@@ -1,1909 +0,0 @@
-/*
- *
- * BlueZ - Bluetooth protocol stack for Linux
- *
- * Copyright (C) 2006-2010 Nokia Corporation
- * Copyright (C) 2004-2010 Marcel Holtmann <marcel@holtmann.org>
- *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdint.h>
-
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <dbus/dbus.h>
-#include <glib.h>
-
-#include "log.h"
-#include "ipc.h"
-#include "device.h"
-#include "manager.h"
-#include "avdtp.h"
-#include "media.h"
-#include "a2dp.h"
-#include "headset.h"
-#include "sink.h"
-#include "source.h"
-#include "gateway.h"
-#include "unix.h"
-
-#define check_nul(str) (str[sizeof(str) - 1] == '\0')
-
-typedef enum {
- TYPE_NONE,
- TYPE_HEADSET,
- TYPE_GATEWAY,
- TYPE_SINK,
- TYPE_SOURCE
-} service_type_t;
-
-typedef void (*notify_cb_t) (struct audio_device *dev, void *data);
-
-struct a2dp_data {
- struct avdtp *session;
- struct avdtp_stream *stream;
- struct a2dp_sep *sep;
-};
-
-struct headset_data {
- gboolean locked;
-};
-
-struct unix_client {
- struct audio_device *dev;
- GSList *caps;
- service_type_t type;
- char *interface;
- uint8_t seid;
- union {
- struct a2dp_data a2dp;
- struct headset_data hs;
- } d;
- int sock;
- int lock;
- int data_fd; /* To be deleted once two phase configuration is fully implemented */
- unsigned int req_id;
- unsigned int cb_id;
- gboolean (*cancel) (struct audio_device *dev, unsigned int id);
-};
-
-static GSList *clients = NULL;
-
-static int unix_sock = -1;
-
-static void client_free(void *data)
-{
- struct unix_client *client = data;
-
- DBG("client_free(%p)", client);
-
- if (client->cancel && client->dev && client->req_id > 0)
- client->cancel(client->dev, client->req_id);
-
- if (client->sock >= 0)
- close(client->sock);
-
- g_slist_free_full(client->caps, g_free);
-
- g_free(client->interface);
- g_free(client);
-}
-
-static int set_nonblocking(int fd)
-{
- long arg;
-
- arg = fcntl(fd, F_GETFL);
- if (arg < 0)
- return -errno;
-
- /* Return if already nonblocking */
- if (arg & O_NONBLOCK)
- return 0;
-
- arg |= O_NONBLOCK;
- if (fcntl(fd, F_SETFL, arg) < 0)
- return -errno;
-
- return 0;
-}
-
-/* Pass file descriptor through local domain sockets (AF_LOCAL, formerly
- * AF_UNIX) and the sendmsg() system call with the cmsg_type field of a "struct
- * cmsghdr" set to SCM_RIGHTS and the data being an integer value equal to the
- * handle of the file descriptor to be passed. */
-static int unix_sendmsg_fd(int sock, int fd)
-{
- char cmsg_b[CMSG_SPACE(sizeof(int))], m = 'm';
- struct cmsghdr *cmsg;
- struct iovec iov = { &m, sizeof(m) };
- struct msghdr msgh;
-
- memset(&msgh, 0, sizeof(msgh));
- msgh.msg_iov = &iov;
- msgh.msg_iovlen = 1;
- msgh.msg_control = &cmsg_b;
- msgh.msg_controllen = CMSG_LEN(sizeof(int));
-
- cmsg = CMSG_FIRSTHDR(&msgh);
- cmsg->cmsg_level = SOL_SOCKET;
- cmsg->cmsg_type = SCM_RIGHTS;
- cmsg->cmsg_len = CMSG_LEN(sizeof(int));
- /* Initialize the payload */
- memcpy(CMSG_DATA(cmsg), &fd, sizeof(int));
-
- return sendmsg(sock, &msgh, MSG_NOSIGNAL);
-}
-
-static void unix_ipc_sendmsg(struct unix_client *client,
- const bt_audio_msg_header_t *msg)
-{
- const char *type = bt_audio_strtype(msg->type);
- const char *name = bt_audio_strname(msg->name);
-
- DBG("Audio API: %s -> %s", type, name);
-
- if (send(client->sock, msg, msg->length, 0) < 0)
- error("Error %s(%d)", strerror(errno), errno);
-}
-
-static void unix_ipc_error(struct unix_client *client, uint8_t name, int err)
-{
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- bt_audio_error_t *rsp = (void *) buf;
-
- if (!g_slist_find(clients, client))
- return;
-
- memset(buf, 0, sizeof(buf));
- rsp->h.type = BT_ERROR;
- rsp->h.name = name;
- rsp->h.length = sizeof(*rsp);
-
- rsp->posix_errno = err;
-
- DBG("sending error %s(%d)", strerror(err), err);
- unix_ipc_sendmsg(client, &rsp->h);
-}
-
-static service_type_t select_service(struct audio_device *dev, const char *interface)
-{
- if (!interface) {
- if (dev->sink && avdtp_is_connected(&dev->src, &dev->dst))
- return TYPE_SINK;
- else if (dev->source && avdtp_is_connected(&dev->src,
- &dev->dst))
- return TYPE_SOURCE;
- else if (dev->headset && headset_is_active(dev))
- return TYPE_HEADSET;
- else if (dev->sink)
- return TYPE_SINK;
- else if (dev->source)
- return TYPE_SOURCE;
- else if (dev->headset)
- return TYPE_HEADSET;
- } else if (!strcmp(interface, AUDIO_SOURCE_INTERFACE) && dev->source)
- return TYPE_SOURCE;
- else if (!strcmp(interface, AUDIO_SINK_INTERFACE) && dev->sink)
- return TYPE_SINK;
- else if (!strcmp(interface, AUDIO_HEADSET_INTERFACE) && dev->headset)
- return TYPE_HEADSET;
- else if (!strcmp(interface, AUDIO_GATEWAY_INTERFACE) && dev->gateway)
- return TYPE_GATEWAY;
-
- return TYPE_NONE;
-}
-
-static void stream_state_changed(struct avdtp_stream *stream,
- avdtp_state_t old_state,
- avdtp_state_t new_state,
- struct avdtp_error *err,
- void *user_data)
-{
- struct unix_client *client = user_data;
- struct a2dp_data *a2dp = &client->d.a2dp;
-
- switch (new_state) {
- case AVDTP_STATE_IDLE:
- if (a2dp->sep) {
- a2dp_sep_unlock(a2dp->sep, a2dp->session);
- a2dp->sep = NULL;
- }
- if (a2dp->session) {
- avdtp_unref(a2dp->session);
- a2dp->session = NULL;
- }
- a2dp->stream = NULL;
- client->cb_id = 0;
- break;
- default:
- break;
- }
-}
-
-static uint8_t headset_generate_capability(struct audio_device *dev,
- codec_capabilities_t *codec)
-{
- pcm_capabilities_t *pcm;
-
- codec->seid = BT_A2DP_SEID_RANGE + 1;
- codec->transport = BT_CAPABILITIES_TRANSPORT_SCO;
- codec->type = BT_HFP_CODEC_PCM;
- codec->length = sizeof(*pcm);
-
- pcm = (void *) codec;
- pcm->sampling_rate = 8000;
- if (dev->headset) {
- if (headset_get_nrec(dev))
- pcm->flags |= BT_PCM_FLAG_NREC;
- if (!headset_get_sco_hci(dev))
- pcm->flags |= BT_PCM_FLAG_PCM_ROUTING;
- codec->configured = headset_is_active(dev);
- codec->lock = headset_get_lock(dev);
- } else {
- pcm->flags |= BT_PCM_FLAG_NREC;
- codec->configured = TRUE;
- codec->lock = 0;
- }
-
- return codec->length;
-}
-
-static void headset_discovery_complete(struct audio_device *dev, void *user_data)
-{
- struct unix_client *client = user_data;
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_get_capabilities_rsp *rsp = (void *) buf;
- uint8_t length;
-
- client->req_id = 0;
-
- if (!dev)
- goto failed;
-
- memset(buf, 0, sizeof(buf));
-
- length = headset_generate_capability(dev, (void *) rsp->data);
-
- rsp->h.type = BT_RESPONSE;
- rsp->h.name = BT_GET_CAPABILITIES;
- rsp->h.length = sizeof(*rsp) + length;
-
- ba2str(&dev->src, rsp->source);
- ba2str(&dev->dst, rsp->destination);
- strncpy(rsp->object, dev->path, sizeof(rsp->object));
-
- unix_ipc_sendmsg(client, &rsp->h);
-
- return;
-
-failed:
- error("discovery failed");
- unix_ipc_error(client, BT_SET_CONFIGURATION, EIO);
-}
-
-static void headset_setup_complete(struct audio_device *dev, void *user_data)
-{
- struct unix_client *client = user_data;
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_set_configuration_rsp *rsp = (void *) buf;
-
- client->req_id = 0;
-
- if (!dev)
- goto failed;
-
- memset(buf, 0, sizeof(buf));
-
- rsp->h.type = BT_RESPONSE;
- rsp->h.name = BT_SET_CONFIGURATION;
- rsp->h.length = sizeof(*rsp);
-
- rsp->link_mtu = 48;
-
- client->data_fd = headset_get_sco_fd(dev);
-
- unix_ipc_sendmsg(client, &rsp->h);
-
- return;
-
-failed:
- error("config failed");
- unix_ipc_error(client, BT_SET_CONFIGURATION, EIO);
-}
-
-static void gateway_setup_complete(struct audio_device *dev, GError *err, void *user_data)
-{
- struct unix_client *client = user_data;
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_set_configuration_rsp *rsp = (void *) buf;
-
- if (err) {
- unix_ipc_error(client, BT_SET_CONFIGURATION, err->code);
- return;
- }
-
- client->req_id = 0;
-
- memset(buf, 0, sizeof(buf));
-
- rsp->h.type = BT_RESPONSE;
- rsp->h.name = BT_SET_CONFIGURATION;
- rsp->h.length = sizeof(*rsp);
-
- rsp->link_mtu = 48;
-
- client->data_fd = gateway_get_sco_fd(dev);
-
- unix_ipc_sendmsg(client, &rsp->h);
-}
-
-static void headset_resume_complete(struct audio_device *dev, void *user_data)
-{
- struct unix_client *client = user_data;
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_start_stream_rsp *rsp = (void *) buf;
- struct bt_new_stream_ind *ind = (void *) buf;
-
- client->req_id = 0;
-
- if (!dev)
- goto failed;
-
- client->data_fd = headset_get_sco_fd(dev);
- if (client->data_fd < 0) {
- error("Unable to get a SCO fd");
- goto failed;
- }
-
- memset(buf, 0, sizeof(buf));
- rsp->h.type = BT_RESPONSE;
- rsp->h.name = BT_START_STREAM;
- rsp->h.length = sizeof(*rsp);
-
- unix_ipc_sendmsg(client, &rsp->h);
-
- memset(buf, 0, sizeof(buf));
- ind->h.type = BT_INDICATION;
- ind->h.name = BT_NEW_STREAM;
- ind->h.length = sizeof(*ind);
-
- unix_ipc_sendmsg(client, &ind->h);
-
- if (unix_sendmsg_fd(client->sock, client->data_fd) < 0) {
- error("unix_sendmsg_fd: %s(%d)", strerror(errno), errno);
- goto failed;
- }
-
- return;
-
-failed:
- error("headset_resume_complete: resume failed");
- unix_ipc_error(client, BT_START_STREAM, EIO);
-}
-
-static void gateway_resume_complete(struct audio_device *dev, GError *err, void *user_data)
-{
- struct unix_client *client = user_data;
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_start_stream_rsp *rsp = (void *) buf;
- struct bt_new_stream_ind *ind = (void *) buf;
-
- if (err) {
- unix_ipc_error(client, BT_START_STREAM, err->code);
- return;
- }
-
- memset(buf, 0, sizeof(buf));
- rsp->h.type = BT_RESPONSE;
- rsp->h.name = BT_START_STREAM;
- rsp->h.length = sizeof(*rsp);
-
- unix_ipc_sendmsg(client, &rsp->h);
-
- memset(buf, 0, sizeof(buf));
- ind->h.type = BT_INDICATION;
- ind->h.name = BT_NEW_STREAM;
- ind->h.length = sizeof(*ind);
-
- unix_ipc_sendmsg(client, &ind->h);
-
- client->data_fd = gateway_get_sco_fd(dev);
- if (unix_sendmsg_fd(client->sock, client->data_fd) < 0) {
- error("unix_sendmsg_fd: %s(%d)", strerror(errno), errno);
- unix_ipc_error(client, BT_START_STREAM, EIO);
- }
-
- client->req_id = 0;
-}
-
-static void headset_suspend_complete(struct audio_device *dev, void *user_data)
-{
- struct unix_client *client = user_data;
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_stop_stream_rsp *rsp = (void *) buf;
-
- if (!dev)
- goto failed;
-
- memset(buf, 0, sizeof(buf));
- rsp->h.type = BT_RESPONSE;
- rsp->h.name = BT_STOP_STREAM;
- rsp->h.length = sizeof(*rsp);
-
- unix_ipc_sendmsg(client, &rsp->h);
-
- return;
-
-failed:
- error("suspend failed");
- unix_ipc_error(client, BT_STOP_STREAM, EIO);
-}
-
-static void print_mpeg12(struct mpeg_codec_cap *mpeg)
-{
- DBG("Media Codec: MPEG12"
- " Channel Modes: %s%s%s%s"
- " Frequencies: %s%s%s%s%s%s"
- " Layers: %s%s%s"
- " CRC: %s",
- mpeg->channel_mode & MPEG_CHANNEL_MODE_MONO ? "Mono " : "",
- mpeg->channel_mode & MPEG_CHANNEL_MODE_DUAL_CHANNEL ?
- "DualChannel " : "",
- mpeg->channel_mode & MPEG_CHANNEL_MODE_STEREO ? "Stereo " : "",
- mpeg->channel_mode & MPEG_CHANNEL_MODE_JOINT_STEREO ?
- "JointStereo " : "",
- mpeg->frequency & MPEG_SAMPLING_FREQ_16000 ? "16Khz " : "",
- mpeg->frequency & MPEG_SAMPLING_FREQ_22050 ? "22.05Khz " : "",
- mpeg->frequency & MPEG_SAMPLING_FREQ_24000 ? "24Khz " : "",
- mpeg->frequency & MPEG_SAMPLING_FREQ_32000 ? "32Khz " : "",
- mpeg->frequency & MPEG_SAMPLING_FREQ_44100 ? "44.1Khz " : "",
- mpeg->frequency & MPEG_SAMPLING_FREQ_48000 ? "48Khz " : "",
- mpeg->layer & MPEG_LAYER_MP1 ? "1 " : "",
- mpeg->layer & MPEG_LAYER_MP2 ? "2 " : "",
- mpeg->layer & MPEG_LAYER_MP3 ? "3 " : "",
- mpeg->crc ? "Yes" : "No");
-}
-
-static void print_sbc(struct sbc_codec_cap *sbc)
-{
- DBG("Media Codec: SBC"
- " Channel Modes: %s%s%s%s"
- " Frequencies: %s%s%s%s"
- " Subbands: %s%s"
- " Blocks: %s%s%s%s"
- " Bitpool: %d-%d",
- sbc->channel_mode & SBC_CHANNEL_MODE_MONO ? "Mono " : "",
- sbc->channel_mode & SBC_CHANNEL_MODE_DUAL_CHANNEL ?
- "DualChannel " : "",
- sbc->channel_mode & SBC_CHANNEL_MODE_STEREO ? "Stereo " : "",
- sbc->channel_mode & SBC_CHANNEL_MODE_JOINT_STEREO ? "JointStereo" : "",
- sbc->frequency & SBC_SAMPLING_FREQ_16000 ? "16Khz " : "",
- sbc->frequency & SBC_SAMPLING_FREQ_32000 ? "32Khz " : "",
- sbc->frequency & SBC_SAMPLING_FREQ_44100 ? "44.1Khz " : "",
- sbc->frequency & SBC_SAMPLING_FREQ_48000 ? "48Khz " : "",
- sbc->subbands & SBC_SUBBANDS_4 ? "4 " : "",
- sbc->subbands & SBC_SUBBANDS_8 ? "8 " : "",
- sbc->block_length & SBC_BLOCK_LENGTH_4 ? "4 " : "",
- sbc->block_length & SBC_BLOCK_LENGTH_8 ? "8 " : "",
- sbc->block_length & SBC_BLOCK_LENGTH_12 ? "12 " : "",
- sbc->block_length & SBC_BLOCK_LENGTH_16 ? "16 " : "",
- sbc->min_bitpool, sbc->max_bitpool);
-}
-
-static int a2dp_append_codec(struct bt_get_capabilities_rsp *rsp,
- struct avdtp_service_capability *cap,
- uint8_t seid,
- uint8_t type,
- uint8_t configured,
- uint8_t lock)
-{
- struct avdtp_media_codec_capability *codec_cap = (void *) cap->data;
- codec_capabilities_t *codec = (void *) rsp + rsp->h.length;
- size_t space_left;
-
- if (rsp->h.length > BT_SUGGESTED_BUFFER_SIZE)
- return -ENOMEM;
-
- space_left = BT_SUGGESTED_BUFFER_SIZE - rsp->h.length;
-
- /* endianness prevents direct cast */
- if (codec_cap->media_codec_type == A2DP_CODEC_SBC) {
- struct sbc_codec_cap *sbc_cap = (void *) codec_cap;
- sbc_capabilities_t *sbc = (void *) codec;
-
- if (space_left < sizeof(sbc_capabilities_t))
- return -ENOMEM;
-
- if (type == AVDTP_SEP_TYPE_SINK)
- codec->type = BT_A2DP_SBC_SINK;
- else if (type == AVDTP_SEP_TYPE_SOURCE)
- codec->type = BT_A2DP_SBC_SOURCE;
- else
- return -EINVAL;
-
- codec->length = sizeof(sbc_capabilities_t);
-
- sbc->channel_mode = sbc_cap->channel_mode;
- sbc->frequency = sbc_cap->frequency;
- sbc->allocation_method = sbc_cap->allocation_method;
- sbc->subbands = sbc_cap->subbands;
- sbc->block_length = sbc_cap->block_length;
- sbc->min_bitpool = sbc_cap->min_bitpool;
- sbc->max_bitpool = sbc_cap->max_bitpool;
-
- print_sbc(sbc_cap);
- } else if (codec_cap->media_codec_type == A2DP_CODEC_MPEG12) {
- struct mpeg_codec_cap *mpeg_cap = (void *) codec_cap;
- mpeg_capabilities_t *mpeg = (void *) codec;
-
- if (space_left < sizeof(mpeg_capabilities_t))
- return -ENOMEM;
-
- if (type == AVDTP_SEP_TYPE_SINK)
- codec->type = BT_A2DP_MPEG12_SINK;
- else if (type == AVDTP_SEP_TYPE_SOURCE)
- codec->type = BT_A2DP_MPEG12_SOURCE;
- else
- return -EINVAL;
-
- codec->length = sizeof(mpeg_capabilities_t);
-
- mpeg->channel_mode = mpeg_cap->channel_mode;
- mpeg->crc = mpeg_cap->crc;
- mpeg->layer = mpeg_cap->layer;
- mpeg->frequency = mpeg_cap->frequency;
- mpeg->mpf = mpeg_cap->mpf;
- mpeg->bitrate = mpeg_cap->bitrate;
-
- print_mpeg12(mpeg_cap);
- } else {
- size_t codec_length, type_length, total_length;
-
- codec_length = cap->length - (sizeof(struct avdtp_service_capability)
- + sizeof(struct avdtp_media_codec_capability));
- type_length = sizeof(codec_cap->media_codec_type);
- total_length = type_length + codec_length +
- sizeof(codec_capabilities_t);
-
- if (space_left < total_length)
- return -ENOMEM;
-
- if (type == AVDTP_SEP_TYPE_SINK)
- codec->type = BT_A2DP_UNKNOWN_SINK;
- else if (type == AVDTP_SEP_TYPE_SOURCE)
- codec->type = BT_A2DP_UNKNOWN_SOURCE;
- else
- return -EINVAL;
-
- codec->length = total_length;
- memcpy(codec->data, &codec_cap->media_codec_type, type_length);
- memcpy(codec->data + type_length, codec_cap->data,
- codec_length);
- }
-
- codec->seid = seid;
- codec->configured = configured;
- codec->lock = lock;
- rsp->h.length += codec->length;
-
- DBG("Append %s seid %d - length %d - total %d",
- configured ? "configured" : "", seid, codec->length,
- rsp->h.length);
-
- return 0;
-}
-
-static void a2dp_discovery_complete(struct avdtp *session, GSList *seps,
- struct avdtp_error *err,
- void *user_data)
-{
- struct unix_client *client = user_data;
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_get_capabilities_rsp *rsp = (void *) buf;
- struct a2dp_data *a2dp = &client->d.a2dp;
-
- if (!g_slist_find(clients, client)) {
- DBG("Client disconnected during discovery");
- return;
- }
-
- if (err)
- goto failed;
-
- memset(buf, 0, sizeof(buf));
- client->req_id = 0;
-
- rsp->h.type = BT_RESPONSE;
- rsp->h.name = BT_GET_CAPABILITIES;
- rsp->h.length = sizeof(*rsp);
- ba2str(&client->dev->src, rsp->source);
- ba2str(&client->dev->dst, rsp->destination);
- strncpy(rsp->object, client->dev->path, sizeof(rsp->object));
-
- for (; seps; seps = g_slist_next(seps)) {
- struct avdtp_remote_sep *rsep = seps->data;
- struct a2dp_sep *sep;
- struct avdtp_service_capability *cap;
- struct avdtp_stream *stream;
- uint8_t type, seid, configured = 0, lock = 0;
- GSList *cl;
-
- type = avdtp_get_type(rsep);
-
- if (type != AVDTP_SEP_TYPE_SINK &&
- type != AVDTP_SEP_TYPE_SOURCE)
- continue;
-
- cap = avdtp_get_codec(rsep);
-
- if (cap->category != AVDTP_MEDIA_CODEC)
- continue;
-
- seid = avdtp_get_seid(rsep);
-
- if (client->seid != 0 && client->seid != seid)
- continue;
-
- stream = avdtp_get_stream(rsep);
- if (stream) {
- configured = 1;
- if (client->seid == seid)
- cap = avdtp_stream_get_codec(stream);
- }
-
- for (cl = clients; cl; cl = cl->next) {
- struct unix_client *c = cl->data;
- struct a2dp_data *ca2dp = &c->d.a2dp;
-
- if (ca2dp->session == session && c->seid == seid) {
- lock = c->lock;
- break;
- }
- }
-
- sep = a2dp_get_sep(session, stream);
- if (sep && a2dp_sep_get_lock(sep))
- lock = BT_WRITE_LOCK;
-
- a2dp_append_codec(rsp, cap, seid, type, configured, lock);
- }
-
- unix_ipc_sendmsg(client, &rsp->h);
-
- return;
-
-failed:
- error("discovery failed");
- unix_ipc_error(client, BT_GET_CAPABILITIES, EIO);
-
- if (a2dp->sep) {
- a2dp_sep_unlock(a2dp->sep, a2dp->session);
- a2dp->sep = NULL;
- }
-
- avdtp_unref(a2dp->session);
- a2dp->session = NULL;
- a2dp->stream = NULL;
-}
-
-static void a2dp_config_complete(struct avdtp *session, struct a2dp_sep *sep,
- struct avdtp_stream *stream,
- struct avdtp_error *err,
- void *user_data)
-{
- struct unix_client *client = user_data;
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_set_configuration_rsp *rsp = (void *) buf;
- struct a2dp_data *a2dp = &client->d.a2dp;
- uint16_t imtu, omtu;
- GSList *caps;
-
- client->req_id = 0;
-
- if (err)
- goto failed;
-
- memset(buf, 0, sizeof(buf));
-
- if (!stream)
- goto failed;
-
- if (client->cb_id > 0)
- avdtp_stream_remove_cb(a2dp->session, a2dp->stream,
- client->cb_id);
-
- a2dp->sep = sep;
- a2dp->stream = stream;
-
- if (!avdtp_stream_get_transport(stream, &client->data_fd, &imtu, &omtu,
- &caps)) {
- error("Unable to get stream transport");
- goto failed;
- }
-
- rsp->h.type = BT_RESPONSE;
- rsp->h.name = BT_SET_CONFIGURATION;
- rsp->h.length = sizeof(*rsp);
-
- /* FIXME: Use imtu when fd_opt is CFG_FD_OPT_READ */
- rsp->link_mtu = omtu;
-
- unix_ipc_sendmsg(client, &rsp->h);
-
- client->cb_id = avdtp_stream_add_cb(session, stream,
- stream_state_changed, client);
-
- return;
-
-failed:
- error("config failed");
-
- unix_ipc_error(client, BT_SET_CONFIGURATION, EIO);
-
- avdtp_unref(a2dp->session);
-
- a2dp->session = NULL;
- a2dp->stream = NULL;
- a2dp->sep = NULL;
-}
-
-static void a2dp_resume_complete(struct avdtp *session,
- struct avdtp_error *err, void *user_data)
-{
- struct unix_client *client = user_data;
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_start_stream_rsp *rsp = (void *) buf;
- struct bt_new_stream_ind *ind = (void *) buf;
- struct a2dp_data *a2dp = &client->d.a2dp;
-
- if (err)
- goto failed;
-
- memset(buf, 0, sizeof(buf));
- rsp->h.type = BT_RESPONSE;
- rsp->h.name = BT_START_STREAM;
- rsp->h.length = sizeof(*rsp);
-
- unix_ipc_sendmsg(client, &rsp->h);
-
- memset(buf, 0, sizeof(buf));
- ind->h.type = BT_RESPONSE;
- ind->h.name = BT_NEW_STREAM;
- rsp->h.length = sizeof(*ind);
-
- unix_ipc_sendmsg(client, &ind->h);
-
- if (unix_sendmsg_fd(client->sock, client->data_fd) < 0) {
- error("unix_sendmsg_fd: %s(%d)", strerror(errno), errno);
- goto failed;
- }
-
- return;
-
-failed:
- error("resume failed");
-
- unix_ipc_error(client, BT_START_STREAM, EIO);
-
- if (client->cb_id > 0) {
- avdtp_stream_remove_cb(a2dp->session, a2dp->stream,
- client->cb_id);
- client->cb_id = 0;
- }
-
- if (a2dp->sep) {
- a2dp_sep_unlock(a2dp->sep, a2dp->session);
- a2dp->sep = NULL;
- }
-
- avdtp_unref(a2dp->session);
- a2dp->session = NULL;
- a2dp->stream = NULL;
-}
-
-static void a2dp_suspend_complete(struct avdtp *session,
- struct avdtp_error *err, void *user_data)
-{
- struct unix_client *client = user_data;
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_stop_stream_rsp *rsp = (void *) buf;
-
- if (err)
- goto failed;
-
- memset(buf, 0, sizeof(buf));
- rsp->h.type = BT_RESPONSE;
- rsp->h.name = BT_STOP_STREAM;
- rsp->h.length = sizeof(*rsp);
-
- unix_ipc_sendmsg(client, &rsp->h);
-
- return;
-
-failed:
- error("suspend failed");
-
- unix_ipc_error(client, BT_STOP_STREAM, EIO);
-}
-
-static void start_discovery(struct audio_device *dev, struct unix_client *client)
-{
- struct a2dp_data *a2dp;
- int err = 0;
-
- switch (client->type) {
- case TYPE_SINK:
- case TYPE_SOURCE:
- a2dp = &client->d.a2dp;
-
- if (!a2dp->session)
- a2dp->session = avdtp_get(&dev->src, &dev->dst);
-
- if (!a2dp->session) {
- error("Unable to get a session");
- goto failed;
- }
-
- err = avdtp_discover(a2dp->session, a2dp_discovery_complete,
- client);
- if (err) {
- if (a2dp->session) {
- avdtp_unref(a2dp->session);
- a2dp->session = NULL;
- }
- goto failed;
- }
- break;
-
- case TYPE_HEADSET:
- case TYPE_GATEWAY:
- headset_discovery_complete(dev, client);
- break;
-
- default:
- error("No known services for device");
- goto failed;
- }
-
- client->dev = dev;
-
- return;
-
-failed:
- unix_ipc_error(client, BT_GET_CAPABILITIES, err ? : EIO);
-}
-
-static void open_complete(struct audio_device *dev, void *user_data)
-{
- struct unix_client *client = user_data;
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_open_rsp *rsp = (void *) buf;
-
- memset(buf, 0, sizeof(buf));
-
- rsp->h.type = BT_RESPONSE;
- rsp->h.name = BT_OPEN;
- rsp->h.length = sizeof(*rsp);
-
- ba2str(&dev->src, rsp->source);
- ba2str(&dev->dst, rsp->destination);
- strncpy(rsp->object, dev->path, sizeof(rsp->object));
-
- unix_ipc_sendmsg(client, &rsp->h);
-}
-
-static void start_open(struct audio_device *dev, struct unix_client *client)
-{
- struct a2dp_data *a2dp;
- struct headset_data *hs;
- struct avdtp_remote_sep *rsep;
- gboolean unref_avdtp_on_fail = FALSE;
-
- switch (client->type) {
- case TYPE_SINK:
- case TYPE_SOURCE:
- a2dp = &client->d.a2dp;
-
- if (!a2dp->session) {
- a2dp->session = avdtp_get(&dev->src, &dev->dst);
- unref_avdtp_on_fail = TRUE;
- }
-
- if (!a2dp->session) {
- error("Unable to get a session");
- goto failed;
- }
-
- if (a2dp->sep) {
- error("Client already has an opened session");
- goto failed;
- }
-
- rsep = avdtp_get_remote_sep(a2dp->session, client->seid);
- if (!rsep) {
- error("Invalid seid %d", client->seid);
- goto failed;
- }
-
- a2dp->sep = a2dp_get(a2dp->session, rsep);
- if (!a2dp->sep) {
- error("seid %d not available or locked", client->seid);
- goto failed;
- }
-
- if (!a2dp_sep_lock(a2dp->sep, a2dp->session)) {
- error("Unable to open seid %d", client->seid);
- a2dp->sep = NULL;
- goto failed;
- }
-
- break;
-
- case TYPE_HEADSET:
- hs = &client->d.hs;
-
- if (hs->locked) {
- error("Client already has an opened session");
- goto failed;
- }
-
- hs->locked = headset_lock(dev, client->lock);
- if (!hs->locked) {
- error("Unable to open seid %d", client->seid);
- goto failed;
- }
- break;
-
- case TYPE_GATEWAY:
- break;
- default:
- error("No known services for device");
- goto failed;
- }
-
- client->dev = dev;
-
- open_complete(dev, client);
-
- return;
-
-failed:
- if (unref_avdtp_on_fail && a2dp->session) {
- avdtp_unref(a2dp->session);
- a2dp->session = NULL;
- }
- unix_ipc_error(client, BT_OPEN, EINVAL);
-}
-
-static void start_config(struct audio_device *dev, struct unix_client *client)
-{
- struct a2dp_data *a2dp;
- struct headset_data *hs;
- unsigned int id;
-
- switch (client->type) {
- case TYPE_SINK:
- case TYPE_SOURCE:
- a2dp = &client->d.a2dp;
-
- if (!a2dp->session)
- a2dp->session = avdtp_get(&dev->src, &dev->dst);
-
- if (!a2dp->session) {
- error("Unable to get a session");
- goto failed;
- }
-
- if (!a2dp->sep) {
- error("seid %d not opened", client->seid);
- goto failed;
- }
-
- id = a2dp_config(a2dp->session, a2dp->sep, a2dp_config_complete,
- client->caps, client);
- client->cancel = a2dp_cancel;
- break;
-
- case TYPE_HEADSET:
- hs = &client->d.hs;
-
- if (!hs->locked) {
- error("seid %d not opened", client->seid);
- goto failed;
- }
-
- id = headset_config_stream(dev, TRUE, headset_setup_complete,
- client);
- client->cancel = headset_cancel_stream;
- break;
- case TYPE_GATEWAY:
- id = gateway_config_stream(dev, gateway_setup_complete, client);
- client->cancel = gateway_cancel_stream;
- break;
-
- default:
- error("No known services for device");
- goto failed;
- }
-
- if (id == 0) {
- error("config failed");
- goto failed;
- }
-
- client->req_id = id;
- g_slist_free(client->caps);
- client->caps = NULL;
-
- return;
-
-failed:
- unix_ipc_error(client, BT_SET_CONFIGURATION, EIO);
-}
-
-static void start_resume(struct audio_device *dev, struct unix_client *client)
-{
- struct a2dp_data *a2dp = NULL;
- struct headset_data *hs;
- unsigned int id;
- struct avdtp *session = NULL;
-
- switch (client->type) {
- case TYPE_SINK:
- case TYPE_SOURCE:
- a2dp = &client->d.a2dp;
-
- if (!a2dp->sep) {
- error("seid not opened");
- goto failed;
- }
-
- if (!a2dp->session) {
- session = avdtp_get(&dev->src, &dev->dst);
- if (!session) {
- error("Unable to get a session");
- goto failed;
- }
- a2dp->session = session;
- }
-
- id = a2dp_resume(a2dp->session, a2dp->sep, a2dp_resume_complete,
- client);
- client->cancel = a2dp_cancel;
-
- break;
-
- case TYPE_HEADSET:
- hs = &client->d.hs;
-
- if (!hs->locked) {
- error("seid not opened");
- goto failed;
- }
-
- id = headset_request_stream(dev, headset_resume_complete,
- client);
- client->cancel = headset_cancel_stream;
- break;
-
- case TYPE_GATEWAY:
- id = gateway_request_stream(dev, gateway_resume_complete,
- client);
- client->cancel = gateway_cancel_stream;
- break;
-
- default:
- error("No known services for device");
- goto failed;
- }
-
- if (id == 0) {
- error("start_resume: resume failed");
- goto failed;
- }
-
- client->req_id = id;
-
- return;
-
-failed:
- if (session) {
- avdtp_unref(session);
- a2dp->session = NULL;
- }
-
- unix_ipc_error(client, BT_START_STREAM, EIO);
-}
-
-static void start_suspend(struct audio_device *dev, struct unix_client *client)
-{
- struct a2dp_data *a2dp = NULL;
- struct headset_data *hs;
- unsigned int id;
- struct avdtp *session = NULL;
-
- switch (client->type) {
- case TYPE_SINK:
- case TYPE_SOURCE:
- a2dp = &client->d.a2dp;
-
- if (!a2dp->sep) {
- error("seid not opened");
- goto failed;
- }
-
- if (!a2dp->session) {
- session = avdtp_get(&dev->src, &dev->dst);
- if (!session) {
- error("Unable to get a session");
- goto failed;
- }
- a2dp->session = session;
- }
-
- if (!a2dp->sep) {
- error("Unable to get a sep");
- goto failed;
- }
-
- id = a2dp_suspend(a2dp->session, a2dp->sep,
- a2dp_suspend_complete, client);
- client->cancel = a2dp_cancel;
- break;
-
- case TYPE_HEADSET:
- hs = &client->d.hs;
-
- if (!hs->locked) {
- error("seid not opened");
- goto failed;
- }
-
- id = headset_suspend_stream(dev, headset_suspend_complete,
- client);
- client->cancel = headset_cancel_stream;
- break;
-
- case TYPE_GATEWAY:
- gateway_suspend_stream(dev);
- client->cancel = gateway_cancel_stream;
- headset_suspend_complete(dev, client);
- id = 1;
- break;
-
- default:
- error("No known services for device");
- goto failed;
- }
-
- if (id == 0) {
- error("suspend failed");
- goto failed;
- }
-
- return;
-
-failed:
- if (session) {
- avdtp_unref(session);
- a2dp->session = NULL;
- }
-
- unix_ipc_error(client, BT_STOP_STREAM, EIO);
-}
-
-static void close_complete(struct audio_device *dev, void *user_data)
-{
- struct unix_client *client = user_data;
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_close_rsp *rsp = (void *) buf;
-
- memset(buf, 0, sizeof(buf));
-
- rsp->h.type = BT_RESPONSE;
- rsp->h.name = BT_CLOSE;
- rsp->h.length = sizeof(*rsp);
-
- unix_ipc_sendmsg(client, &rsp->h);
-
- return;
-}
-
-static void start_close(struct audio_device *dev, struct unix_client *client,
- gboolean reply)
-{
- struct a2dp_data *a2dp;
- struct headset_data *hs;
-
- if (!client->dev)
- goto failed;
-
- switch (client->type) {
- case TYPE_HEADSET:
- hs = &client->d.hs;
-
- if (client->dev && hs->locked) {
- headset_unlock(client->dev, client->lock);
- hs->locked = FALSE;
- }
- break;
- case TYPE_GATEWAY:
- break;
- case TYPE_SOURCE:
- case TYPE_SINK:
- a2dp = &client->d.a2dp;
-
- if (client->cb_id > 0) {
- avdtp_stream_remove_cb(a2dp->session, a2dp->stream,
- client->cb_id);
- client->cb_id = 0;
- }
- if (a2dp->sep) {
- a2dp_sep_unlock(a2dp->sep, a2dp->session);
- a2dp->sep = NULL;
- }
- if (a2dp->session) {
- avdtp_unref(a2dp->session);
- a2dp->session = NULL;
- }
- a2dp->stream = NULL;
- break;
- default:
- error("No known services for device");
- goto failed;
- }
-
- if (!reply)
- return;
-
- close_complete(dev, client);
- client->dev = NULL;
-
- return;
-
-failed:
- if (reply)
- unix_ipc_error(client, BT_STOP_STREAM, EINVAL);
-}
-
-static void handle_getcapabilities_req(struct unix_client *client,
- struct bt_get_capabilities_req *req)
-{
- struct audio_device *dev;
- bdaddr_t src, dst;
- int err = EIO;
- const char *interface;
-
- if (!check_nul(req->source) || !check_nul(req->destination) ||
- !check_nul(req->object)) {
- err = EINVAL;
- goto failed;
- }
-
- str2ba(req->source, &src);
- str2ba(req->destination, &dst);
-
- if (!manager_find_device(req->object, &src, &dst, NULL, FALSE))
- goto failed;
-
- if (req->transport == BT_CAPABILITIES_TRANSPORT_SCO)
- interface = AUDIO_HEADSET_INTERFACE;
- else if (req->transport == BT_CAPABILITIES_TRANSPORT_A2DP)
- interface = AUDIO_SINK_INTERFACE;
- else
- interface = client->interface;
-
- dev = manager_find_device(req->object, &src, &dst, interface, TRUE);
- if (!dev && (req->flags & BT_FLAG_AUTOCONNECT))
- dev = manager_find_device(req->object, &src, &dst,
- interface, FALSE);
-
- if (!dev) {
- if (req->transport == BT_CAPABILITIES_TRANSPORT_SCO)
- interface = AUDIO_GATEWAY_INTERFACE;
- else if (req->transport == BT_CAPABILITIES_TRANSPORT_A2DP)
- interface = AUDIO_SOURCE_INTERFACE;
- else
- interface = NULL;
- dev = manager_find_device(req->object, &src, &dst,
- interface, TRUE);
- if (!dev && (req->flags & BT_FLAG_AUTOCONNECT))
- dev = manager_find_device(req->object, &src, &dst,
- interface, FALSE);
- }
-
- if (!dev) {
- error("Unable to find a matching device");
- goto failed;
- }
-
- client->type = select_service(dev, interface);
- if (client->type == TYPE_NONE) {
- error("No matching service found");
- goto failed;
- }
-
- if (g_strcmp0(interface, client->interface) != 0) {
- g_free(client->interface);
- client->interface = g_strdup(interface);
- }
-
- client->seid = req->seid;
-
- start_discovery(dev, client);
-
- return;
-
-failed:
- unix_ipc_error(client, BT_GET_CAPABILITIES, err);
-}
-
-static int handle_sco_open(struct unix_client *client, struct bt_open_req *req)
-{
- if (!client->interface)
- client->interface = g_strdup(AUDIO_HEADSET_INTERFACE);
- else if (!g_str_equal(client->interface, AUDIO_HEADSET_INTERFACE) &&
- !g_str_equal(client->interface, AUDIO_GATEWAY_INTERFACE))
- return -EIO;
-
- DBG("open sco - object=%s source=%s destination=%s lock=%s%s",
- strcmp(req->object, "") ? req->object : "ANY",
- strcmp(req->source, "") ? req->source : "ANY",
- strcmp(req->destination, "") ? req->destination : "ANY",
- req->lock & BT_READ_LOCK ? "read" : "",
- req->lock & BT_WRITE_LOCK ? "write" : "");
-
- return 0;
-}
-
-static int handle_a2dp_open(struct unix_client *client, struct bt_open_req *req)
-{
- if (!client->interface)
- /* FIXME: are we treating a sink or a source? */
- client->interface = g_strdup(AUDIO_SINK_INTERFACE);
- else if (!g_str_equal(client->interface, AUDIO_SINK_INTERFACE) &&
- !g_str_equal(client->interface, AUDIO_SOURCE_INTERFACE))
- return -EIO;
-
- DBG("open a2dp - object=%s source=%s destination=%s lock=%s%s",
- strcmp(req->object, "") ? req->object : "ANY",
- strcmp(req->source, "") ? req->source : "ANY",
- strcmp(req->destination, "") ? req->destination : "ANY",
- req->lock & BT_READ_LOCK ? "read" : "",
- req->lock & BT_WRITE_LOCK ? "write" : "");
-
- return 0;
-}
-
-static void handle_open_req(struct unix_client *client, struct bt_open_req *req)
-{
- struct audio_device *dev;
- bdaddr_t src, dst;
- int err = 0;
-
- if (!check_nul(req->source) || !check_nul(req->destination) ||
- !check_nul(req->object)) {
- err = EINVAL;
- goto failed;
- }
-
- str2ba(req->source, &src);
- str2ba(req->destination, &dst);
-
- if (req->seid > BT_A2DP_SEID_RANGE) {
- err = handle_sco_open(client, req);
- if (err < 0) {
- err = -err;
- goto failed;
- }
- } else {
- err = handle_a2dp_open(client, req);
- if (err < 0) {
- err = -err;
- goto failed;
- }
- }
-
- if (!manager_find_device(req->object, &src, &dst, NULL, FALSE))
- goto failed;
-
- dev = manager_find_device(req->object, &src, &dst, client->interface,
- TRUE);
- if (!dev)
- dev = manager_find_device(req->object, &src, &dst,
- client->interface, FALSE);
-
- if (!dev)
- goto failed;
-
- client->seid = req->seid;
- client->lock = req->lock;
-
- start_open(dev, client);
-
- return;
-
-failed:
- unix_ipc_error(client, BT_OPEN, err ? : EIO);
-}
-
-static int handle_sco_transport(struct unix_client *client,
- struct bt_set_configuration_req *req)
-{
- struct audio_device *dev = client->dev;
-
- if (!client->interface) {
- if (dev->headset)
- client->interface = g_strdup(AUDIO_HEADSET_INTERFACE);
- else if (dev->gateway)
- client->interface = g_strdup(AUDIO_GATEWAY_INTERFACE);
- else
- return -EIO;
- } else if (!g_str_equal(client->interface, AUDIO_HEADSET_INTERFACE) &&
- !g_str_equal(client->interface, AUDIO_GATEWAY_INTERFACE))
- return -EIO;
-
- return 0;
-}
-
-static int handle_a2dp_transport(struct unix_client *client,
- struct bt_set_configuration_req *req)
-{
- struct avdtp_service_capability *media_transport, *media_codec;
- struct sbc_codec_cap sbc_cap;
- struct mpeg_codec_cap mpeg_cap;
-
- if (!client->interface)
- /* FIXME: are we treating a sink or a source? */
- client->interface = g_strdup(AUDIO_SINK_INTERFACE);
- else if (!g_str_equal(client->interface, AUDIO_SINK_INTERFACE) &&
- !g_str_equal(client->interface, AUDIO_SOURCE_INTERFACE))
- return -EIO;
-
- g_slist_free_full(client->caps, g_free);
- client->caps = NULL;
-
- media_transport = avdtp_service_cap_new(AVDTP_MEDIA_TRANSPORT,
- NULL, 0);
-
- client->caps = g_slist_append(client->caps, media_transport);
-
- if (req->codec.type == BT_A2DP_MPEG12_SINK ||
- req->codec.type == BT_A2DP_MPEG12_SOURCE) {
- mpeg_capabilities_t *mpeg = (void *) &req->codec;
-
- memset(&mpeg_cap, 0, sizeof(mpeg_cap));
-
- mpeg_cap.cap.media_type = AVDTP_MEDIA_TYPE_AUDIO;
- mpeg_cap.cap.media_codec_type = A2DP_CODEC_MPEG12;
- mpeg_cap.channel_mode = mpeg->channel_mode;
- mpeg_cap.crc = mpeg->crc;
- mpeg_cap.layer = mpeg->layer;
- mpeg_cap.frequency = mpeg->frequency;
- mpeg_cap.mpf = mpeg->mpf;
- mpeg_cap.bitrate = mpeg->bitrate;
-
- media_codec = avdtp_service_cap_new(AVDTP_MEDIA_CODEC, &mpeg_cap,
- sizeof(mpeg_cap));
-
- print_mpeg12(&mpeg_cap);
- } else if (req->codec.type == BT_A2DP_SBC_SINK ||
- req->codec.type == BT_A2DP_SBC_SOURCE) {
- sbc_capabilities_t *sbc = (void *) &req->codec;
-
- memset(&sbc_cap, 0, sizeof(sbc_cap));
-
- sbc_cap.cap.media_type = AVDTP_MEDIA_TYPE_AUDIO;
- sbc_cap.cap.media_codec_type = A2DP_CODEC_SBC;
- sbc_cap.channel_mode = sbc->channel_mode;
- sbc_cap.frequency = sbc->frequency;
- sbc_cap.allocation_method = sbc->allocation_method;
- sbc_cap.subbands = sbc->subbands;
- sbc_cap.block_length = sbc->block_length;
- sbc_cap.min_bitpool = sbc->min_bitpool;
- sbc_cap.max_bitpool = sbc->max_bitpool;
-
- media_codec = avdtp_service_cap_new(AVDTP_MEDIA_CODEC, &sbc_cap,
- sizeof(sbc_cap));
-
- print_sbc(&sbc_cap);
- } else
- return -EINVAL;
-
- client->caps = g_slist_append(client->caps, media_codec);
-
- return 0;
-}
-
-static void handle_setconfiguration_req(struct unix_client *client,
- struct bt_set_configuration_req *req)
-{
- int err = 0;
-
- if (req->codec.seid != client->seid) {
- error("Unable to set configuration: seid %d not opened",
- req->codec.seid);
- goto failed;
- }
-
- if (!client->dev)
- goto failed;
-
- if (req->codec.transport == BT_CAPABILITIES_TRANSPORT_SCO) {
- err = handle_sco_transport(client, req);
- if (err < 0) {
- err = -err;
- goto failed;
- }
- } else if (req->codec.transport == BT_CAPABILITIES_TRANSPORT_A2DP) {
- err = handle_a2dp_transport(client, req);
- if (err < 0) {
- err = -err;
- goto failed;
- }
- }
-
- start_config(client->dev, client);
-
- return;
-
-failed:
- unix_ipc_error(client, BT_SET_CONFIGURATION, err ? : EIO);
-}
-
-static void handle_streamstart_req(struct unix_client *client,
- struct bt_start_stream_req *req)
-{
- if (!client->dev)
- goto failed;
-
- start_resume(client->dev, client);
-
- return;
-
-failed:
- unix_ipc_error(client, BT_START_STREAM, EIO);
-}
-
-static void handle_streamstop_req(struct unix_client *client,
- struct bt_stop_stream_req *req)
-{
- if (!client->dev)
- goto failed;
-
- start_suspend(client->dev, client);
-
- return;
-
-failed:
- unix_ipc_error(client, BT_STOP_STREAM, EIO);
-}
-
-static void handle_close_req(struct unix_client *client,
- struct bt_close_req *req)
-{
- if (!client->dev)
- goto failed;
-
- start_close(client->dev, client, TRUE);
-
- return;
-
-failed:
- unix_ipc_error(client, BT_CLOSE, EIO);
-}
-
-static void handle_control_req(struct unix_client *client,
- struct bt_control_req *req)
-{
- /* FIXME: really implement that */
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_set_configuration_rsp *rsp = (void *) buf;
-
- memset(buf, 0, sizeof(buf));
- rsp->h.type = BT_RESPONSE;
- rsp->h.name = BT_CONTROL;
- rsp->h.length = sizeof(*rsp);
-
- unix_ipc_sendmsg(client, &rsp->h);
-}
-
-static void handle_delay_report_req(struct unix_client *client,
- struct bt_delay_report_req *req)
-{
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_set_configuration_rsp *rsp = (void *) buf;
- struct a2dp_data *a2dp;
- int err;
-
- if (!client->dev) {
- err = -ENODEV;
- goto failed;
- }
-
- switch (client->type) {
- case TYPE_HEADSET:
- case TYPE_GATEWAY:
- err = -EINVAL;
- goto failed;
- case TYPE_SOURCE:
- case TYPE_SINK:
- a2dp = &client->d.a2dp;
- if (a2dp->session && a2dp->stream) {
- err = avdtp_delay_report(a2dp->session, a2dp->stream,
- req->delay);
- if (err < 0)
- goto failed;
- } else {
- err = -EINVAL;
- goto failed;
- }
- break;
- default:
- error("No known services for device");
- err = -EINVAL;
- goto failed;
- }
-
- memset(buf, 0, sizeof(buf));
- rsp->h.type = BT_RESPONSE;
- rsp->h.name = BT_DELAY_REPORT;
- rsp->h.length = sizeof(*rsp);
-
- unix_ipc_sendmsg(client, &rsp->h);
-
- return;
-
-failed:
- unix_ipc_error(client, BT_DELAY_REPORT, -err);
-}
-
-static gboolean client_cb(GIOChannel *chan, GIOCondition cond, gpointer data)
-{
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- bt_audio_msg_header_t *msghdr = (void *) buf;
- struct unix_client *client = data;
- int len;
- const char *type, *name;
-
- if (cond & G_IO_NVAL)
- return FALSE;
-
- if (cond & (G_IO_HUP | G_IO_ERR)) {
- DBG("Unix client disconnected (fd=%d)", client->sock);
-
- goto failed;
- }
-
- memset(buf, 0, sizeof(buf));
-
- len = recv(client->sock, buf, sizeof(buf), 0);
- if (len < 0) {
- error("recv: %s (%d)", strerror(errno), errno);
- goto failed;
- }
-
- type = bt_audio_strtype(msghdr->type);
- name = bt_audio_strname(msghdr->name);
-
- DBG("Audio API: %s <- %s", type, name);
-
- if (msghdr->length != len) {
- error("Invalid message: length mismatch");
- goto failed;
- }
-
- switch (msghdr->name) {
- case BT_GET_CAPABILITIES:
- handle_getcapabilities_req(client,
- (struct bt_get_capabilities_req *) msghdr);
- break;
- case BT_OPEN:
- handle_open_req(client,
- (struct bt_open_req *) msghdr);
- break;
- case BT_SET_CONFIGURATION:
- handle_setconfiguration_req(client,
- (struct bt_set_configuration_req *) msghdr);
- break;
- case BT_START_STREAM:
- handle_streamstart_req(client,
- (struct bt_start_stream_req *) msghdr);
- break;
- case BT_STOP_STREAM:
- handle_streamstop_req(client,
- (struct bt_stop_stream_req *) msghdr);
- break;
- case BT_CLOSE:
- handle_close_req(client,
- (struct bt_close_req *) msghdr);
- break;
- case BT_CONTROL:
- handle_control_req(client,
- (struct bt_control_req *) msghdr);
- break;
- case BT_DELAY_REPORT:
- handle_delay_report_req(client,
- (struct bt_delay_report_req *) msghdr);
- break;
- default:
- error("Audio API: received unexpected message name %d",
- msghdr->name);
- }
-
- return TRUE;
-
-failed:
- clients = g_slist_remove(clients, client);
- start_close(client->dev, client, FALSE);
- client_free(client);
- return FALSE;
-}
-
-static gboolean server_cb(GIOChannel *chan, GIOCondition cond, gpointer data)
-{
- struct sockaddr_un addr;
- socklen_t addrlen;
- int sk, cli_sk;
- struct unix_client *client;
- GIOChannel *io;
-
- if (cond & G_IO_NVAL)
- return FALSE;
-
- if (cond & (G_IO_HUP | G_IO_ERR)) {
- g_io_channel_shutdown(chan, TRUE, NULL);
- return FALSE;
- }
-
- sk = g_io_channel_unix_get_fd(chan);
-
- memset(&addr, 0, sizeof(addr));
- addrlen = sizeof(addr);
-
- cli_sk = accept(sk, (struct sockaddr *) &addr, &addrlen);
- if (cli_sk < 0) {
- error("accept: %s (%d)", strerror(errno), errno);
- return TRUE;
- }
-
- DBG("Accepted new client connection on unix socket (fd=%d)", cli_sk);
- set_nonblocking(cli_sk);
-
- client = g_new0(struct unix_client, 1);
- client->sock = cli_sk;
- clients = g_slist_append(clients, client);
-
- io = g_io_channel_unix_new(cli_sk);
- g_io_add_watch(io, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
- client_cb, client);
- g_io_channel_unref(io);
-
- return TRUE;
-}
-
-void unix_device_removed(struct audio_device *dev)
-{
- GSList *l;
-
- DBG("unix_device_removed(%p)", dev);
-
- l = clients;
- while (l) {
- struct unix_client *client = l->data;
-
- l = l->next;
-
- if (client->dev == dev) {
- clients = g_slist_remove(clients, client);
- start_close(client->dev, client, FALSE);
- client_free(client);
- }
- }
-}
-
-void unix_delay_report(struct audio_device *dev, uint8_t seid, uint16_t delay)
-{
- GSList *l;
- struct bt_delay_report_ind ind;
-
- DBG("unix_delay_report(%p): %u.%ums", dev, delay / 10, delay % 10);
-
- memset(&ind, 0, sizeof(ind));
- ind.h.type = BT_INDICATION;
- ind.h.name = BT_DELAY_REPORT;
- ind.h.length = sizeof(ind);
- ind.delay = delay;
-
- for (l = clients; l != NULL; l = g_slist_next(l)) {
- struct unix_client *client = l->data;
-
- if (client->dev != dev || client->seid != seid)
- continue;
-
- unix_ipc_sendmsg(client, (void *) &ind);
- }
-}
-
-int unix_init(void)
-{
- GIOChannel *io;
- struct sockaddr_un addr = {
- AF_UNIX, BT_IPC_SOCKET_NAME
- };
-
- int sk, err;
-
- sk = socket(PF_LOCAL, SOCK_STREAM, 0);
- if (sk < 0) {
- err = -errno;
- error("Can't create unix socket: %s (%d)", strerror(-err),
- -err);
- return err;
- }
-
- if (bind(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- err = -errno;
- error("Can't bind unix socket: %s (%d)", strerror(-err),
- -err);
- close(sk);
- return err;
- }
-
- set_nonblocking(sk);
-
- if (listen(sk, 1) < 0) {
- err = -errno;
- error("Can't listen on unix socket: %s (%d)", strerror(-err),
- -err);
- close(sk);
- return err;
- }
-
- unix_sock = sk;
-
- io = g_io_channel_unix_new(sk);
- g_io_add_watch(io, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
- server_cb, NULL);
- g_io_channel_unref(io);
-
- DBG("Unix socket created: %d", sk);
-
- return 0;
-}
-
-void unix_exit(void)
-{
- g_slist_free_full(clients, client_free);
- if (unix_sock >= 0) {
- close(unix_sock);
- unix_sock = -1;
- }
-}
diff --git a/audio/unix.h b/audio/unix.h
deleted file mode 100644
index 74ca16d..0000000
--- a/audio/unix.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- * BlueZ - Bluetooth protocol stack for Linux
- *
- * Copyright (C) 2006-2010 Nokia Corporation
- * Copyright (C) 2004-2010 Marcel Holtmann <marcel@holtmann.org>
- *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-void unix_device_removed(struct audio_device *dev);
-
-void unix_delay_report(struct audio_device *dev, uint8_t seid, uint16_t delay);
-
-int unix_init(void);
-void unix_exit(void);
--
1.7.10.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH BlueZ 2/5] audio: Remove ALSA support
2012-06-14 13:41 [PATCH BlueZ 1/5] audio: Remove unix socket support Luiz Augusto von Dentz
@ 2012-06-14 13:41 ` Luiz Augusto von Dentz
2012-06-14 13:41 ` =?y?q?=5BPATCH=20BlueZ=203/5=5D=20audio=3A=20Remove=20internal=20audio=20IPC?= Luiz Augusto von Dentz
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Luiz Augusto von Dentz @ 2012-06-14 13:41 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
ALSA support depend on unix support that is now removed.
---
Makefile.am | 29 -
acinclude.m4 | 16 +-
audio/bluetooth.conf | 36 -
audio/ctl_bluetooth.c | 383 -----------
audio/pcm_bluetooth.c | 1785 -------------------------------------------------
configure.ac | 1 -
6 files changed, 1 insertion(+), 2249 deletions(-)
delete mode 100644 audio/bluetooth.conf
delete mode 100644 audio/ctl_bluetooth.c
delete mode 100644 audio/pcm_bluetooth.c
diff --git a/Makefile.am b/Makefile.am
index a3a30d0..cb2143b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -335,35 +335,6 @@ EXTRA_DIST += src/genbuiltin src/bluetooth.conf \
audio/telephony-maemo6.c sap/sap-dummy.c sap/sap-u8500.c \
proximity/proximity.conf
-if ALSA
-alsadir = $(libdir)/alsa-lib
-
-alsa_LTLIBRARIES = audio/libasound_module_pcm_bluetooth.la \
- audio/libasound_module_ctl_bluetooth.la
-
-audio_libasound_module_pcm_bluetooth_la_SOURCES = audio/pcm_bluetooth.c \
- audio/rtp.h audio/ipc.h audio/ipc.c
-audio_libasound_module_pcm_bluetooth_la_LDFLAGS = $(AM_LDFLAGS) -module \
- -avoid-version
-audio_libasound_module_pcm_bluetooth_la_LIBADD = sbc/libsbc.la \
- lib/libbluetooth-private.la @ALSA_LIBS@
-audio_libasound_module_pcm_bluetooth_la_CFLAGS = $(AM_CFLAGS) @ALSA_CFLAGS@
-
-audio_libasound_module_ctl_bluetooth_la_SOURCES = audio/ctl_bluetooth.c \
- audio/rtp.h audio/ipc.h audio/ipc.c
-audio_libasound_module_ctl_bluetooth_la_LDFLAGS = $(AM_LDFLAGS) -module \
- -avoid-versionv
-audio_libasound_module_ctl_bluetooth_la_LIBADD = \
- lib/libbluetooth-private.la @ALSA_LIBS@
-audio_libasound_module_ctl_bluetooth_la_CFLAGS = $(AM_CFLAGS) @ALSA_CFLAGS@
-
-if DATAFILES
-alsaconfdir = $(datadir)/alsa
-
-alsaconf_DATA = audio/bluetooth.conf
-endif
-endif
-
if AUDIOPLUGIN
if GSTREAMER
gstreamerdir = $(libdir)/gstreamer-0.10
diff --git a/acinclude.m4 b/acinclude.m4
index 6505ad3..8184307 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -114,13 +114,6 @@ AC_DEFUN([AC_PATH_GSTREAMER], [
AC_SUBST(GSTREAMER_PLUGINSDIR)
])
-AC_DEFUN([AC_PATH_ALSA], [
- PKG_CHECK_MODULES(ALSA, alsa, alsa_found=yes, alsa_found=no)
- AC_CHECK_LIB(rt, clock_gettime, ALSA_LIBS="$ALSA_LIBS -lrt", alsa_found=no)
- AC_SUBST(ALSA_CFLAGS)
- AC_SUBST(ALSA_LIBS)
-])
-
AC_DEFUN([AC_PATH_USB], [
PKG_CHECK_MODULES(USB, libusb, usb_found=yes, usb_found=no)
AC_SUBST(USB_CFLAGS)
@@ -176,7 +169,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [
sndfile_enable=${sndfile_found}
hal_enable=no
usb_enable=${usb_found}
- alsa_enable=${alsa_found}
gstreamer_enable=${gstreamer_found}
audio_enable=yes
input_enable=yes
@@ -257,10 +249,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [
gstreamer_enable=${enableval}
])
- AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa], [enable ALSA support]), [
- alsa_enable=${enableval}
- ])
-
AC_ARG_ENABLE(usb, AC_HELP_STRING([--enable-usb], [enable USB support]), [
usb_enable=${enableval}
])
@@ -368,9 +356,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes")
- AM_CONDITIONAL(SBC, test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes" ||
- test "${test_enable}" = "yes")
- AM_CONDITIONAL(ALSA, test "${alsa_enable}" = "yes" && test "${alsa_found}" = "yes")
+ AM_CONDITIONAL(SBC, test "${gstreamer_enable}" = "yes" || test "${test_enable}" = "yes")
AM_CONDITIONAL(GSTREAMER, test "${gstreamer_enable}" = "yes" && test "${gstreamer_found}" = "yes")
AM_CONDITIONAL(AUDIOPLUGIN, test "${audio_enable}" = "yes")
AM_CONDITIONAL(INPUTPLUGIN, test "${input_enable}" = "yes")
diff --git a/audio/bluetooth.conf b/audio/bluetooth.conf
deleted file mode 100644
index 55b51e4..0000000
--- a/audio/bluetooth.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-# Please note that this ALSA configuration file fragment needs be enabled in
-# /etc/asound.conf or a similar configuration file with directives similar to
-# the following:
-#
-#@hooks [
-# {
-# func load
-# files [
-# "/etc/alsa/bluetooth.conf"
-# ]
-# errors false
-# }
-#]
-
-pcm.rawbluetooth {
- @args [ ADDRESS ]
- @args.ADDRESS {
- type string
- }
- type bluetooth
- device $ADDRESS
-}
-
-pcm.bluetooth {
- @args [ ADDRESS ]
- @args.ADDRESS {
- type string
- }
- type plug
- slave {
- pcm {
- type bluetooth
- device $ADDRESS
- }
- }
-}
diff --git a/audio/ctl_bluetooth.c b/audio/ctl_bluetooth.c
deleted file mode 100644
index a16f476..0000000
--- a/audio/ctl_bluetooth.c
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- *
- * BlueZ - Bluetooth protocol stack for Linux
- *
- * Copyright (C) 2004-2010 Marcel Holtmann <marcel@holtmann.org>
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sys/socket.h>
-#include <sys/un.h>
-
-#include <alsa/asoundlib.h>
-#include <alsa/control_external.h>
-
-#include <bluetooth/bluetooth.h>
-
-#include "ipc.h"
-
-#ifdef ENABLE_DEBUG
-#define DBG(fmt, arg...) printf("DEBUG: %s: " fmt "\n" , __FUNCTION__ , ## arg)
-#else
-#define DBG(fmt, arg...)
-#endif
-
-#define BLUETOOTH_MINVOL 0
-#define BLUETOOTH_MAXVOL 15
-
-struct bluetooth_data {
- snd_ctl_ext_t ext;
- int sock;
-};
-
-enum {
- BLUETOOTH_PLAYBACK,
- BLUETOOTH_CAPTURE,
-};
-
-static const char *vol_devices[2] = {
- [BLUETOOTH_PLAYBACK] = "Playback volume",
- [BLUETOOTH_CAPTURE] = "Capture volume",
-};
-
-static void bluetooth_exit(struct bluetooth_data *data)
-{
- if (data == NULL)
- return;
-
- if (data->sock >= 0)
- bt_audio_service_close(data->sock);
-
- free(data);
-}
-
-static void bluetooth_close(snd_ctl_ext_t *ext)
-{
- struct bluetooth_data *data = ext->private_data;
-
- DBG("ext %p", ext);
-
- bluetooth_exit(data);
-}
-
-static int bluetooth_elem_count(snd_ctl_ext_t *ext)
-{
- DBG("ext %p", ext);
-
- return 2;
-}
-
-static int bluetooth_elem_list(snd_ctl_ext_t *ext,
- unsigned int offset, snd_ctl_elem_id_t *id)
-{
- DBG("ext %p offset %d id %p", ext, offset, id);
-
- snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_MIXER);
-
- if (offset > 1)
- return -EINVAL;
-
- snd_ctl_elem_id_set_name(id, vol_devices[offset]);
-
- return 0;
-}
-
-static snd_ctl_ext_key_t bluetooth_find_elem(snd_ctl_ext_t *ext,
- const snd_ctl_elem_id_t *id)
-{
- const char *name = snd_ctl_elem_id_get_name(id);
- int i;
-
- DBG("ext %p id %p name '%s'", ext, id, name);
-
- for (i = 0; i < 2; i++)
- if (strcmp(name, vol_devices[i]) == 0)
- return i;
-
- return SND_CTL_EXT_KEY_NOT_FOUND;
-}
-
-static int bluetooth_get_attribute(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key,
- int *type, unsigned int *acc, unsigned int *count)
-{
- DBG("ext %p key %ld", ext, key);
-
- *type = SND_CTL_ELEM_TYPE_INTEGER;
- *acc = SND_CTL_EXT_ACCESS_READWRITE;
- *count = 1;
-
- return 0;
-}
-
-static int bluetooth_get_integer_info(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key,
- long *imin, long *imax, long *istep)
-{
- DBG("ext %p key %ld", ext, key);
-
- *istep = 1;
- *imin = BLUETOOTH_MINVOL;
- *imax = BLUETOOTH_MAXVOL;
-
- return 0;
-}
-
-static int bluetooth_send_ctl(struct bluetooth_data *data,
- uint8_t mode, uint8_t key, struct bt_control_rsp *rsp)
-{
- int ret;
- struct bt_control_req *req = (void *) rsp;
- bt_audio_error_t *err = (void *) rsp;
- const char *type, *name;
-
- memset(req, 0, BT_SUGGESTED_BUFFER_SIZE);
- req->h.type = BT_REQUEST;
- req->h.name = BT_CONTROL;
- req->h.length = sizeof(*req);
-
- req->mode = mode;
- req->key = key;
-
- ret = send(data->sock, req, BT_SUGGESTED_BUFFER_SIZE, MSG_NOSIGNAL);
- if (ret <= 0) {
- SYSERR("Unable to request new volume value to server");
- return -errno;
- }
-
- ret = recv(data->sock, rsp, BT_SUGGESTED_BUFFER_SIZE, 0);
- if (ret <= 0) {
- SNDERR("Unable to receive new volume value from server");
- return -errno;
- }
-
- if (rsp->h.type == BT_ERROR) {
- SNDERR("BT_CONTROL failed : %s (%d)",
- strerror(err->posix_errno),
- err->posix_errno);
- return -err->posix_errno;
- }
-
- type = bt_audio_strtype(rsp->h.type);
- if (!type) {
- SNDERR("Bogus message type %d "
- "received from audio service",
- rsp->h.type);
- return -EINVAL;
- }
-
- name = bt_audio_strname(rsp->h.name);
- if (!name) {
- SNDERR("Bogus message name %d "
- "received from audio service",
- rsp->h.name);
- return -EINVAL;
- }
-
- if (rsp->h.name != BT_CONTROL) {
- SNDERR("Unexpected message %s received", type);
- return -EINVAL;
- }
-
- return 0;
-}
-
-static int bluetooth_read_integer(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key,
- long *value)
-{
- struct bluetooth_data *data = ext->private_data;
- int ret;
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_control_rsp *rsp = (void *) buf;
-
- DBG("ext %p key %ld", ext, key);
-
- memset(buf, 0, sizeof(buf));
- *value = 0;
-
- ret = bluetooth_send_ctl(data, key, 0, rsp);
- if (ret == 0)
- *value = rsp->key;
-
- return ret;
-}
-
-static int bluetooth_write_integer(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key,
- long *value)
-{
- struct bluetooth_data *data = ext->private_data;
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_control_rsp *rsp = (void *) buf;
- long current;
- int ret, keyvalue;
-
- DBG("ext %p key %ld", ext, key);
-
- ret = bluetooth_read_integer(ext, key, ¤t);
- if (ret < 0)
- return ret;
-
- if (*value == current)
- return 0;
-
- while (*value != current) {
- keyvalue = (*value > current) ? BT_CONTROL_KEY_VOL_UP :
- BT_CONTROL_KEY_VOL_DOWN;
-
- ret = bluetooth_send_ctl(data, key, keyvalue, rsp);
- if (ret < 0)
- break;
-
- current = keyvalue;
- }
-
- return ret;
-}
-
-static int bluetooth_read_event(snd_ctl_ext_t *ext, snd_ctl_elem_id_t *id,
- unsigned int *event_mask)
-{
- struct bluetooth_data *data = ext->private_data;
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_control_ind *ind = (void *) buf;
- int err;
- const char *type, *name;
-
- DBG("ext %p id %p", ext, id);
-
- memset(buf, 0, sizeof(buf));
-
- err = recv(data->sock, ind, BT_SUGGESTED_BUFFER_SIZE, MSG_DONTWAIT);
- if (err < 0) {
- err = -errno;
- SNDERR("Failed while receiving data: %s (%d)", strerror(-err),
- -err);
- return err;
- }
-
- type = bt_audio_strtype(ind->h.type);
- if (!type) {
- SNDERR("Bogus message type %d "
- "received from audio service",
- ind->h.type);
- return -EAGAIN;
- }
-
- name = bt_audio_strname(ind->h.name);
- if (!name) {
- SNDERR("Bogus message name %d "
- "received from audio service",
- ind->h.name);
- return -EAGAIN;
- }
-
- if (ind->h.name != BT_CONTROL) {
- SNDERR("Unexpected message %s received", name);
- return -EAGAIN;
- }
-
- snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_MIXER);
- snd_ctl_elem_id_set_name(id, ind->mode == BLUETOOTH_PLAYBACK ?
- vol_devices[BLUETOOTH_PLAYBACK] :
- vol_devices[BLUETOOTH_CAPTURE]);
- *event_mask = SND_CTL_EVENT_MASK_VALUE;
-
- return 1;
-}
-
-static snd_ctl_ext_callback_t bluetooth_callback = {
- .close = bluetooth_close,
- .elem_count = bluetooth_elem_count,
- .elem_list = bluetooth_elem_list,
- .find_elem = bluetooth_find_elem,
- .get_attribute = bluetooth_get_attribute,
- .get_integer_info = bluetooth_get_integer_info,
- .read_integer = bluetooth_read_integer,
- .write_integer = bluetooth_write_integer,
- .read_event = bluetooth_read_event,
-};
-
-static int bluetooth_init(struct bluetooth_data *data)
-{
- int sk;
-
- if (!data)
- return -EINVAL;
-
- memset(data, 0, sizeof(struct bluetooth_data));
-
- data->sock = -1;
-
- sk = bt_audio_service_open();
- if (sk < 0)
- return -errno;
-
- data->sock = sk;
-
- return 0;
-}
-
-SND_CTL_PLUGIN_DEFINE_FUNC(bluetooth);
-
-SND_CTL_PLUGIN_DEFINE_FUNC(bluetooth)
-{
- struct bluetooth_data *data;
- int err;
-
- DBG("Bluetooth Control plugin");
-
- data = malloc(sizeof(struct bluetooth_data));
- if (!data) {
- err = -ENOMEM;
- goto error;
- }
-
- err = bluetooth_init(data);
- if (err < 0)
- goto error;
-
- data->ext.version = SND_CTL_EXT_VERSION;
- data->ext.card_idx = -1;
-
- strncpy(data->ext.id, "bluetooth", sizeof(data->ext.id) - 1);
- strncpy(data->ext.driver, "Bluetooth-Audio", sizeof(data->ext.driver) - 1);
- strncpy(data->ext.name, "Bluetooth Audio", sizeof(data->ext.name) - 1);
- strncpy(data->ext.longname, "Bluetooth Audio", sizeof(data->ext.longname) - 1);
- strncpy(data->ext.mixername, "Bluetooth Audio", sizeof(data->ext.mixername) - 1);
-
- data->ext.callback = &bluetooth_callback;
- data->ext.poll_fd = data->sock;
- data->ext.private_data = data;
-
- err = snd_ctl_ext_create(&data->ext, name, mode);
- if (err < 0)
- goto error;
-
- *handlep = data->ext.handle;
-
- return 0;
-
-error:
- bluetooth_exit(data);
-
- return err;
-}
-
-SND_CTL_PLUGIN_SYMBOL(bluetooth);
diff --git a/audio/pcm_bluetooth.c b/audio/pcm_bluetooth.c
deleted file mode 100644
index b9da805..0000000
--- a/audio/pcm_bluetooth.c
+++ /dev/null
@@ -1,1785 +0,0 @@
-/*
- *
- * BlueZ - Bluetooth protocol stack for Linux
- *
- * Copyright (C) 2006-2010 Nokia Corporation
- * Copyright (C) 2004-2010 Marcel Holtmann <marcel@holtmann.org>
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdint.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <time.h>
-#include <sys/time.h>
-#include <pthread.h>
-#include <signal.h>
-#include <limits.h>
-
-#include <netinet/in.h>
-
-#include <alsa/asoundlib.h>
-#include <alsa/pcm_external.h>
-
-#include "ipc.h"
-#include "sbc.h"
-#include "rtp.h"
-
-/* #define ENABLE_DEBUG */
-
-#define UINT_SECS_MAX (UINT_MAX / 1000000 - 1)
-
-#define MIN_PERIOD_TIME 1
-
-#define BUFFER_SIZE 2048
-
-#ifdef ENABLE_DEBUG
-#define DBG(fmt, arg...) printf("DEBUG: %s: " fmt "\n" , __FUNCTION__ , ## arg)
-#else
-#define DBG(fmt, arg...)
-#endif
-
-#ifndef SOL_SCO
-#define SOL_SCO 17
-#endif
-
-#ifndef SCO_TXBUFS
-#define SCO_TXBUFS 0x03
-#endif
-
-#ifndef SCO_RXBUFS
-#define SCO_RXBUFS 0x04
-#endif
-
-#ifndef MIN
-# define MIN(x, y) ((x) < (y) ? (x) : (y))
-#endif
-
-#ifndef MAX
-# define MAX(x, y) ((x) > (y) ? (x) : (y))
-#endif
-
-#define MAX_BITPOOL 64
-#define MIN_BITPOOL 2
-
-/* adapted from glibc sys/time.h timersub() macro */
-#define priv_timespecsub(a, b, result) \
- do { \
- (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
- (result)->tv_nsec = (a)->tv_nsec - (b)->tv_nsec; \
- if ((result)->tv_nsec < 0) { \
- --(result)->tv_sec; \
- (result)->tv_nsec += 1000000000; \
- } \
- } while (0)
-
-struct bluetooth_a2dp {
- sbc_capabilities_t sbc_capabilities;
- sbc_t sbc; /* Codec data */
- int sbc_initialized; /* Keep track if the encoder is initialized */
- unsigned int codesize; /* SBC codesize */
- int samples; /* Number of encoded samples */
- uint8_t buffer[BUFFER_SIZE]; /* Codec transfer buffer */
- unsigned int count; /* Codec transfer buffer counter */
-
- int nsamples; /* Cumulative number of codec samples */
- uint16_t seq_num; /* Cumulative packet sequence */
- int frame_count; /* Current frames in buffer*/
-};
-
-struct bluetooth_alsa_config {
- char device[18]; /* Address of the remote Device */
- int has_device;
- uint8_t transport; /* Requested transport */
- int has_transport;
- uint16_t rate;
- int has_rate;
- uint8_t channel_mode; /* A2DP only */
- int has_channel_mode;
- uint8_t allocation_method; /* A2DP only */
- int has_allocation_method;
- uint8_t subbands; /* A2DP only */
- int has_subbands;
- uint8_t block_length; /* A2DP only */
- int has_block_length;
- uint8_t bitpool; /* A2DP only */
- int has_bitpool;
- int autoconnect;
-};
-
-struct bluetooth_data {
- snd_pcm_ioplug_t io;
- struct bluetooth_alsa_config alsa_config; /* ALSA resource file parameters */
- volatile snd_pcm_sframes_t hw_ptr;
- int transport; /* chosen transport SCO or AD2P */
- unsigned int link_mtu; /* MTU for selected transport channel */
- volatile struct pollfd stream; /* Audio stream filedescriptor */
- struct pollfd server; /* Audio daemon filedescriptor */
- uint8_t buffer[BUFFER_SIZE]; /* Encoded transfer buffer */
- unsigned int count; /* Transfer buffer counter */
- struct bluetooth_a2dp a2dp; /* A2DP data */
-
- pthread_t hw_thread; /* Makes virtual hw pointer move */
- int pipefd[2]; /* Inter thread communication */
- int stopped;
- sig_atomic_t reset; /* Request XRUN handling */
-};
-
-static int audioservice_send(int sk, const bt_audio_msg_header_t *msg);
-static int audioservice_expect(int sk, bt_audio_msg_header_t *outmsg,
- int expected_type);
-
-static int bluetooth_start(snd_pcm_ioplug_t *io)
-{
- DBG("bluetooth_start %p", io);
-
- return 0;
-}
-
-static int bluetooth_stop(snd_pcm_ioplug_t *io)
-{
- DBG("bluetooth_stop %p", io);
-
- return 0;
-}
-
-static void *playback_hw_thread(void *param)
-{
- struct bluetooth_data *data = param;
- unsigned int prev_periods;
- double period_time;
- struct timespec start;
- struct pollfd fds[2];
- int poll_timeout;
-
- data->server.events = POLLIN;
- /* note: only errors for data->stream.events */
-
- fds[0] = data->server;
- fds[1] = data->stream;
-
- prev_periods = 0;
- period_time = 1000000.0 * data->io.period_size / data->io.rate;
- if (period_time > (int) (MIN_PERIOD_TIME * 1000))
- poll_timeout = (int) (period_time / 1000.0f);
- else
- poll_timeout = MIN_PERIOD_TIME;
-
- clock_gettime(CLOCK_MONOTONIC, &start);
-
- while (1) {
- unsigned int dtime, periods;
- struct timespec cur, delta;
- int ret;
-
- if (data->stopped)
- goto iter_sleep;
-
- if (data->reset) {
- DBG("Handle XRUN in hw-thread.");
- data->reset = 0;
- clock_gettime(CLOCK_MONOTONIC, &start);
- prev_periods = 0;
- }
-
- clock_gettime(CLOCK_MONOTONIC, &cur);
-
- priv_timespecsub(&cur, &start, &delta);
-
- dtime = delta.tv_sec * 1000000 + delta.tv_nsec / 1000;
- periods = 1.0 * dtime / period_time;
-
- if (periods > prev_periods) {
- char c = 'w';
- int frags = periods - prev_periods, n;
-
- data->hw_ptr += frags * data->io.period_size;
- data->hw_ptr %= data->io.buffer_size;
-
- for (n = 0; n < frags; n++) {
- /* Notify user that hardware pointer
- * has moved * */
- if (write(data->pipefd[1], &c, 1) < 0)
- pthread_testcancel();
- }
-
- /* Reset point of reference to avoid too big values
- * that wont fit an unsigned int */
- if ((unsigned int) delta.tv_sec < UINT_SECS_MAX)
- prev_periods = periods;
- else {
- prev_periods = 0;
- clock_gettime(CLOCK_MONOTONIC, &start);
- }
- }
-
-iter_sleep:
- /* sleep up to one period interval */
- ret = poll(fds, 2, poll_timeout);
-
- if (ret < 0) {
- if (errno != EINTR) {
- SNDERR("poll error: %s (%d)", strerror(errno),
- errno);
- break;
- }
- } else if (ret > 0) {
- ret = (fds[0].revents) ? 0 : 1;
- SNDERR("poll fd %d revents %d", ret, fds[ret].revents);
- if (fds[ret].revents & (POLLERR | POLLHUP | POLLNVAL))
- break;
- }
-
- /* Offer opportunity to be canceled by main thread */
- pthread_testcancel();
- }
-
- data->hw_thread = 0;
- pthread_exit(NULL);
-}
-
-static int bluetooth_playback_start(snd_pcm_ioplug_t *io)
-{
- struct bluetooth_data *data = io->private_data;
- int err;
-
- DBG("%p", io);
-
- data->stopped = 0;
-
- if (data->hw_thread)
- return 0;
-
- err = pthread_create(&data->hw_thread, 0, playback_hw_thread, data);
-
- return -err;
-}
-
-static int bluetooth_playback_stop(snd_pcm_ioplug_t *io)
-{
- struct bluetooth_data *data = io->private_data;
-
- DBG("%p", io);
-
- data->stopped = 1;
-
- return 0;
-}
-
-static snd_pcm_sframes_t bluetooth_pointer(snd_pcm_ioplug_t *io)
-{
- struct bluetooth_data *data = io->private_data;
-
- return data->hw_ptr;
-}
-
-static void bluetooth_exit(struct bluetooth_data *data)
-{
- struct bluetooth_a2dp *a2dp = &data->a2dp;
-
- if (data->server.fd >= 0)
- bt_audio_service_close(data->server.fd);
-
- if (data->stream.fd >= 0)
- close(data->stream.fd);
-
- if (data->hw_thread) {
- pthread_cancel(data->hw_thread);
- pthread_join(data->hw_thread, 0);
- }
-
- if (a2dp->sbc_initialized)
- sbc_finish(&a2dp->sbc);
-
- if (data->pipefd[0] > 0)
- close(data->pipefd[0]);
-
- if (data->pipefd[1] > 0)
- close(data->pipefd[1]);
-
- free(data);
-}
-
-static int bluetooth_close(snd_pcm_ioplug_t *io)
-{
- struct bluetooth_data *data = io->private_data;
-
- DBG("%p", io);
-
- bluetooth_exit(data);
-
- return 0;
-}
-
-static int bluetooth_prepare(snd_pcm_ioplug_t *io)
-{
- struct bluetooth_data *data = io->private_data;
- char c = 'w';
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_start_stream_req *req = (void *) buf;
- struct bt_start_stream_rsp *rsp = (void *) buf;
- struct bt_new_stream_ind *ind = (void *) buf;
- uint32_t period_count = io->buffer_size / io->period_size;
- int opt_name, err;
- struct timeval t = { 0, period_count };
-
- DBG("Preparing with io->period_size=%lu io->buffer_size=%lu",
- io->period_size, io->buffer_size);
-
- data->reset = 0;
-
- /* As we're gonna receive messages on the server socket, we have to stop the
- hw thread that is polling on it, if any */
- if (data->hw_thread) {
- pthread_cancel(data->hw_thread);
- pthread_join(data->hw_thread, 0);
- data->hw_thread = 0;
- }
-
- if (io->stream == SND_PCM_STREAM_PLAYBACK)
- /* If not null for playback, xmms doesn't display time
- * correctly */
- data->hw_ptr = 0;
- else
- /* ALSA library is really picky on the fact hw_ptr is not null.
- * If it is, capture won't start */
- data->hw_ptr = io->period_size;
-
- /* send start */
- memset(req, 0, BT_SUGGESTED_BUFFER_SIZE);
- req->h.type = BT_REQUEST;
- req->h.name = BT_START_STREAM;
- req->h.length = sizeof(*req);
-
- err = audioservice_send(data->server.fd, &req->h);
- if (err < 0)
- return err;
-
- rsp->h.length = sizeof(*rsp);
- err = audioservice_expect(data->server.fd, &rsp->h,
- BT_START_STREAM);
- if (err < 0)
- return err;
-
- ind->h.length = sizeof(*ind);
- err = audioservice_expect(data->server.fd, &ind->h,
- BT_NEW_STREAM);
- if (err < 0)
- return err;
-
- if (data->stream.fd >= 0)
- close(data->stream.fd);
-
- data->stream.fd = bt_audio_service_get_data_fd(data->server.fd);
- if (data->stream.fd < 0) {
- return -errno;
- }
-
- if (data->transport == BT_CAPABILITIES_TRANSPORT_A2DP) {
- opt_name = (io->stream == SND_PCM_STREAM_PLAYBACK) ?
- SO_SNDTIMEO : SO_RCVTIMEO;
-
- if (setsockopt(data->stream.fd, SOL_SOCKET, opt_name, &t,
- sizeof(t)) < 0)
- return -errno;
- } else {
- opt_name = (io->stream == SND_PCM_STREAM_PLAYBACK) ?
- SCO_TXBUFS : SCO_RXBUFS;
-
- if (setsockopt(data->stream.fd, SOL_SCO, opt_name, &period_count,
- sizeof(period_count)) == 0)
- return 0;
-
- opt_name = (io->stream == SND_PCM_STREAM_PLAYBACK) ?
- SO_SNDBUF : SO_RCVBUF;
-
- if (setsockopt(data->stream.fd, SOL_SCO, opt_name, &period_count,
- sizeof(period_count)) == 0)
- return 0;
-
- /* FIXME : handle error codes */
- }
-
- /* wake up any client polling at us */
- if (write(data->pipefd[1], &c, 1) < 0) {
- err = -errno;
- return err;
- }
-
- return 0;
-}
-
-static int bluetooth_hsp_hw_params(snd_pcm_ioplug_t *io,
- snd_pcm_hw_params_t *params)
-{
- struct bluetooth_data *data = io->private_data;
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_open_req *open_req = (void *) buf;
- struct bt_open_rsp *open_rsp = (void *) buf;
- struct bt_set_configuration_req *req = (void *) buf;
- struct bt_set_configuration_rsp *rsp = (void *) buf;
- int err;
-
- DBG("Preparing with io->period_size=%lu io->buffer_size=%lu",
- io->period_size, io->buffer_size);
-
- memset(req, 0, BT_SUGGESTED_BUFFER_SIZE);
- open_req->h.type = BT_REQUEST;
- open_req->h.name = BT_OPEN;
- open_req->h.length = sizeof(*open_req);
-
- strncpy(open_req->destination, data->alsa_config.device, 18);
- open_req->seid = BT_A2DP_SEID_RANGE + 1;
- open_req->lock = (io->stream == SND_PCM_STREAM_PLAYBACK ?
- BT_WRITE_LOCK : BT_READ_LOCK);
-
- err = audioservice_send(data->server.fd, &open_req->h);
- if (err < 0)
- return err;
-
- open_rsp->h.length = sizeof(*open_rsp);
- err = audioservice_expect(data->server.fd, &open_rsp->h,
- BT_OPEN);
- if (err < 0)
- return err;
-
- memset(req, 0, BT_SUGGESTED_BUFFER_SIZE);
- req->h.type = BT_REQUEST;
- req->h.name = BT_SET_CONFIGURATION;
- req->h.length = sizeof(*req);
-
- req->codec.transport = BT_CAPABILITIES_TRANSPORT_SCO;
- req->codec.seid = BT_A2DP_SEID_RANGE + 1;
- req->codec.length = sizeof(pcm_capabilities_t);
-
- req->h.length += req->codec.length - sizeof(req->codec);
- err = audioservice_send(data->server.fd, &req->h);
- if (err < 0)
- return err;
-
- rsp->h.length = sizeof(*rsp);
- err = audioservice_expect(data->server.fd, &rsp->h,
- BT_SET_CONFIGURATION);
- if (err < 0)
- return err;
-
- data->transport = BT_CAPABILITIES_TRANSPORT_SCO;
- data->link_mtu = rsp->link_mtu;
-
- return 0;
-}
-
-static uint8_t default_bitpool(uint8_t freq, uint8_t mode)
-{
- switch (freq) {
- case BT_SBC_SAMPLING_FREQ_16000:
- case BT_SBC_SAMPLING_FREQ_32000:
- return 53;
- case BT_SBC_SAMPLING_FREQ_44100:
- switch (mode) {
- case BT_A2DP_CHANNEL_MODE_MONO:
- case BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL:
- return 31;
- case BT_A2DP_CHANNEL_MODE_STEREO:
- case BT_A2DP_CHANNEL_MODE_JOINT_STEREO:
- return 53;
- default:
- DBG("Invalid channel mode %u", mode);
- return 53;
- }
- case BT_SBC_SAMPLING_FREQ_48000:
- switch (mode) {
- case BT_A2DP_CHANNEL_MODE_MONO:
- case BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL:
- return 29;
- case BT_A2DP_CHANNEL_MODE_STEREO:
- case BT_A2DP_CHANNEL_MODE_JOINT_STEREO:
- return 51;
- default:
- DBG("Invalid channel mode %u", mode);
- return 51;
- }
- default:
- DBG("Invalid sampling freq %u", freq);
- return 53;
- }
-}
-
-static int bluetooth_a2dp_init(struct bluetooth_data *data,
- snd_pcm_hw_params_t *params)
-{
- struct bluetooth_alsa_config *cfg = &data->alsa_config;
- sbc_capabilities_t *cap = &data->a2dp.sbc_capabilities;
- unsigned int max_bitpool, min_bitpool, rate, channels;
- int dir;
-
- snd_pcm_hw_params_get_rate(params, &rate, &dir);
- snd_pcm_hw_params_get_channels(params, &channels);
-
- switch (rate) {
- case 48000:
- cap->frequency = BT_SBC_SAMPLING_FREQ_48000;
- break;
- case 44100:
- cap->frequency = BT_SBC_SAMPLING_FREQ_44100;
- break;
- case 32000:
- cap->frequency = BT_SBC_SAMPLING_FREQ_32000;
- break;
- case 16000:
- cap->frequency = BT_SBC_SAMPLING_FREQ_16000;
- break;
- default:
- DBG("Rate %d not supported", rate);
- return -1;
- }
-
- if (cfg->has_channel_mode)
- cap->channel_mode = cfg->channel_mode;
- else if (channels == 2) {
- if (cap->channel_mode & BT_A2DP_CHANNEL_MODE_JOINT_STEREO)
- cap->channel_mode = BT_A2DP_CHANNEL_MODE_JOINT_STEREO;
- else if (cap->channel_mode & BT_A2DP_CHANNEL_MODE_STEREO)
- cap->channel_mode = BT_A2DP_CHANNEL_MODE_STEREO;
- else if (cap->channel_mode & BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL)
- cap->channel_mode = BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL;
- } else {
- if (cap->channel_mode & BT_A2DP_CHANNEL_MODE_MONO)
- cap->channel_mode = BT_A2DP_CHANNEL_MODE_MONO;
- }
-
- if (!cap->channel_mode) {
- DBG("No supported channel modes");
- return -1;
- }
-
- if (cfg->has_block_length)
- cap->block_length = cfg->block_length;
- else if (cap->block_length & BT_A2DP_BLOCK_LENGTH_16)
- cap->block_length = BT_A2DP_BLOCK_LENGTH_16;
- else if (cap->block_length & BT_A2DP_BLOCK_LENGTH_12)
- cap->block_length = BT_A2DP_BLOCK_LENGTH_12;
- else if (cap->block_length & BT_A2DP_BLOCK_LENGTH_8)
- cap->block_length = BT_A2DP_BLOCK_LENGTH_8;
- else if (cap->block_length & BT_A2DP_BLOCK_LENGTH_4)
- cap->block_length = BT_A2DP_BLOCK_LENGTH_4;
- else {
- DBG("No supported block lengths");
- return -1;
- }
-
- if (cfg->has_subbands)
- cap->subbands = cfg->subbands;
- if (cap->subbands & BT_A2DP_SUBBANDS_8)
- cap->subbands = BT_A2DP_SUBBANDS_8;
- else if (cap->subbands & BT_A2DP_SUBBANDS_4)
- cap->subbands = BT_A2DP_SUBBANDS_4;
- else {
- DBG("No supported subbands");
- return -1;
- }
-
- if (cfg->has_allocation_method)
- cap->allocation_method = cfg->allocation_method;
- if (cap->allocation_method & BT_A2DP_ALLOCATION_LOUDNESS)
- cap->allocation_method = BT_A2DP_ALLOCATION_LOUDNESS;
- else if (cap->allocation_method & BT_A2DP_ALLOCATION_SNR)
- cap->allocation_method = BT_A2DP_ALLOCATION_SNR;
-
- if (cfg->has_bitpool)
- min_bitpool = max_bitpool = cfg->bitpool;
- else {
- min_bitpool = MAX(MIN_BITPOOL, cap->min_bitpool);
- max_bitpool = MIN(default_bitpool(cap->frequency,
- cap->channel_mode),
- cap->max_bitpool);
- }
-
- cap->min_bitpool = min_bitpool;
- cap->max_bitpool = max_bitpool;
-
- return 0;
-}
-
-static void bluetooth_a2dp_setup(struct bluetooth_a2dp *a2dp)
-{
- sbc_capabilities_t active_capabilities = a2dp->sbc_capabilities;
-
- if (a2dp->sbc_initialized)
- sbc_reinit(&a2dp->sbc, 0);
- else
- sbc_init(&a2dp->sbc, 0);
- a2dp->sbc_initialized = 1;
-
- if (active_capabilities.frequency & BT_SBC_SAMPLING_FREQ_16000)
- a2dp->sbc.frequency = SBC_FREQ_16000;
-
- if (active_capabilities.frequency & BT_SBC_SAMPLING_FREQ_32000)
- a2dp->sbc.frequency = SBC_FREQ_32000;
-
- if (active_capabilities.frequency & BT_SBC_SAMPLING_FREQ_44100)
- a2dp->sbc.frequency = SBC_FREQ_44100;
-
- if (active_capabilities.frequency & BT_SBC_SAMPLING_FREQ_48000)
- a2dp->sbc.frequency = SBC_FREQ_48000;
-
- if (active_capabilities.channel_mode & BT_A2DP_CHANNEL_MODE_MONO)
- a2dp->sbc.mode = SBC_MODE_MONO;
-
- if (active_capabilities.channel_mode & BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL)
- a2dp->sbc.mode = SBC_MODE_DUAL_CHANNEL;
-
- if (active_capabilities.channel_mode & BT_A2DP_CHANNEL_MODE_STEREO)
- a2dp->sbc.mode = SBC_MODE_STEREO;
-
- if (active_capabilities.channel_mode & BT_A2DP_CHANNEL_MODE_JOINT_STEREO)
- a2dp->sbc.mode = SBC_MODE_JOINT_STEREO;
-
- a2dp->sbc.allocation = active_capabilities.allocation_method
- == BT_A2DP_ALLOCATION_SNR ? SBC_AM_SNR
- : SBC_AM_LOUDNESS;
-
- switch (active_capabilities.subbands) {
- case BT_A2DP_SUBBANDS_4:
- a2dp->sbc.subbands = SBC_SB_4;
- break;
- case BT_A2DP_SUBBANDS_8:
- a2dp->sbc.subbands = SBC_SB_8;
- break;
- }
-
- switch (active_capabilities.block_length) {
- case BT_A2DP_BLOCK_LENGTH_4:
- a2dp->sbc.blocks = SBC_BLK_4;
- break;
- case BT_A2DP_BLOCK_LENGTH_8:
- a2dp->sbc.blocks = SBC_BLK_8;
- break;
- case BT_A2DP_BLOCK_LENGTH_12:
- a2dp->sbc.blocks = SBC_BLK_12;
- break;
- case BT_A2DP_BLOCK_LENGTH_16:
- a2dp->sbc.blocks = SBC_BLK_16;
- break;
- }
-
- a2dp->sbc.bitpool = active_capabilities.max_bitpool;
- a2dp->codesize = sbc_get_codesize(&a2dp->sbc);
- a2dp->count = sizeof(struct rtp_header) + sizeof(struct rtp_payload);
-}
-
-static int bluetooth_a2dp_hw_params(snd_pcm_ioplug_t *io,
- snd_pcm_hw_params_t *params)
-{
- struct bluetooth_data *data = io->private_data;
- struct bluetooth_a2dp *a2dp = &data->a2dp;
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_open_req *open_req = (void *) buf;
- struct bt_open_rsp *open_rsp = (void *) buf;
- struct bt_set_configuration_req *req = (void *) buf;
- struct bt_set_configuration_rsp *rsp = (void *) buf;
- int err;
-
- DBG("Preparing with io->period_size=%lu io->buffer_size=%lu",
- io->period_size, io->buffer_size);
-
- memset(req, 0, BT_SUGGESTED_BUFFER_SIZE);
- open_req->h.type = BT_REQUEST;
- open_req->h.name = BT_OPEN;
- open_req->h.length = sizeof(*open_req);
-
- strncpy(open_req->destination, data->alsa_config.device, 18);
- open_req->seid = a2dp->sbc_capabilities.capability.seid;
- open_req->lock = (io->stream == SND_PCM_STREAM_PLAYBACK ?
- BT_WRITE_LOCK : BT_READ_LOCK);
-
- err = audioservice_send(data->server.fd, &open_req->h);
- if (err < 0)
- return err;
-
- open_rsp->h.length = sizeof(*open_rsp);
- err = audioservice_expect(data->server.fd, &open_rsp->h,
- BT_OPEN);
- if (err < 0)
- return err;
-
- err = bluetooth_a2dp_init(data, params);
- if (err < 0)
- return err;
-
- memset(req, 0, BT_SUGGESTED_BUFFER_SIZE);
- req->h.type = BT_REQUEST;
- req->h.name = BT_SET_CONFIGURATION;
- req->h.length = sizeof(*req);
-
- memcpy(&req->codec, &a2dp->sbc_capabilities,
- sizeof(a2dp->sbc_capabilities));
-
- req->codec.transport = BT_CAPABILITIES_TRANSPORT_A2DP;
- req->codec.length = sizeof(a2dp->sbc_capabilities);
- req->h.length += req->codec.length - sizeof(req->codec);
-
- err = audioservice_send(data->server.fd, &req->h);
- if (err < 0)
- return err;
-
- rsp->h.length = sizeof(*rsp);
- err = audioservice_expect(data->server.fd, &rsp->h,
- BT_SET_CONFIGURATION);
- if (err < 0)
- return err;
-
- data->transport = BT_CAPABILITIES_TRANSPORT_A2DP;
- data->link_mtu = rsp->link_mtu;
-
- /* Setup SBC encoder now we agree on parameters */
- bluetooth_a2dp_setup(a2dp);
-
- DBG("\tallocation=%u\n\tsubbands=%u\n\tblocks=%u\n\tbitpool=%u\n",
- a2dp->sbc.allocation, a2dp->sbc.subbands, a2dp->sbc.blocks,
- a2dp->sbc.bitpool);
-
- return 0;
-}
-
-static int bluetooth_poll_descriptors(snd_pcm_ioplug_t *io,
- struct pollfd *pfd, unsigned int space)
-{
- struct bluetooth_data *data = io->private_data;
-
- assert(io);
-
- if (space < 1)
- return 0;
-
- pfd[0].fd = data->stream.fd;
- pfd[0].events = POLLIN;
- pfd[0].revents = 0;
-
- return 1;
-}
-
-static int bluetooth_poll_revents(snd_pcm_ioplug_t *io ATTRIBUTE_UNUSED,
- struct pollfd *pfds, unsigned int nfds,
- unsigned short *revents)
-{
- assert(pfds && nfds == 1 && revents);
-
- *revents = pfds[0].revents;
-
- return 0;
-}
-
-static int bluetooth_playback_poll_descriptors_count(snd_pcm_ioplug_t *io)
-{
- return 2;
-}
-
-static int bluetooth_playback_poll_descriptors(snd_pcm_ioplug_t *io,
- struct pollfd *pfd, unsigned int space)
-{
- struct bluetooth_data *data = io->private_data;
-
- DBG("");
-
- assert(data->pipefd[0] >= 0);
-
- if (space < 2)
- return 0;
-
- pfd[0].fd = data->pipefd[0];
- pfd[0].events = POLLIN;
- pfd[0].revents = 0;
- pfd[1].fd = data->stream.fd;
- pfd[1].events = POLLERR | POLLHUP | POLLNVAL;
- pfd[1].revents = 0;
-
- return 2;
-}
-
-static int bluetooth_playback_poll_revents(snd_pcm_ioplug_t *io,
- struct pollfd *pfds, unsigned int nfds,
- unsigned short *revents)
-{
- static char buf[1];
-
- DBG("");
-
- assert(pfds);
- assert(nfds == 2);
- assert(revents);
- assert(pfds[0].fd >= 0);
- assert(pfds[1].fd >= 0);
-
- if (io->state != SND_PCM_STATE_PREPARED)
- if (read(pfds[0].fd, buf, 1) < 0)
- SYSERR("read error: %s (%d)", strerror(errno), errno);
-
- if (pfds[1].revents & (POLLERR | POLLHUP | POLLNVAL))
- io->state = SND_PCM_STATE_DISCONNECTED;
-
- *revents = (pfds[0].revents & POLLIN) ? POLLOUT : 0;
-
- return 0;
-}
-
-
-static snd_pcm_sframes_t bluetooth_hsp_read(snd_pcm_ioplug_t *io,
- const snd_pcm_channel_area_t *areas,
- snd_pcm_uframes_t offset,
- snd_pcm_uframes_t size)
-{
- struct bluetooth_data *data = io->private_data;
- snd_pcm_uframes_t frames_to_write, ret;
- unsigned char *buff;
- unsigned int frame_size = 0;
- int nrecv;
-
- DBG("areas->step=%u areas->first=%u offset=%lu size=%lu io->nonblock=%u",
- areas->step, areas->first, offset, size, io->nonblock);
-
- frame_size = areas->step / 8;
-
- if (data->count > 0)
- goto proceed;
-
- nrecv = recv(data->stream.fd, data->buffer, data->link_mtu,
- io->nonblock ? MSG_DONTWAIT : 0);
-
- if (nrecv < 0) {
- ret = (errno == EPIPE) ? -EIO : -errno;
- goto done;
- }
-
- if ((unsigned int) nrecv != data->link_mtu) {
- ret = -EIO;
- SNDERR(strerror(-ret));
- goto done;
- }
-
- /* Increment hardware transmition pointer */
- data->hw_ptr = (data->hw_ptr + data->link_mtu / frame_size) %
- io->buffer_size;
-
-proceed:
- buff = (unsigned char *) areas->addr +
- (areas->first + areas->step * offset) / 8;
-
- if ((data->count + size * frame_size) <= data->link_mtu)
- frames_to_write = size;
- else
- frames_to_write = (data->link_mtu - data->count) / frame_size;
-
- memcpy(buff, data->buffer + data->count, frame_size * frames_to_write);
- data->count += (frame_size * frames_to_write);
- data->count %= data->link_mtu;
-
- /* Return written frames count */
- ret = frames_to_write;
-
-done:
- DBG("returning %lu", ret);
- return ret;
-}
-
-static snd_pcm_sframes_t bluetooth_hsp_write(snd_pcm_ioplug_t *io,
- const snd_pcm_channel_area_t *areas,
- snd_pcm_uframes_t offset,
- snd_pcm_uframes_t size)
-{
- struct bluetooth_data *data = io->private_data;
- snd_pcm_sframes_t ret = 0;
- snd_pcm_uframes_t frames_to_read;
- uint8_t *buff;
- int rsend, frame_size;
-
- DBG("areas->step=%u areas->first=%u offset=%lu, size=%lu io->nonblock=%u",
- areas->step, areas->first, offset, size, io->nonblock);
-
- if (io->hw_ptr > io->appl_ptr) {
- ret = bluetooth_playback_stop(io);
- if (ret == 0)
- ret = -EPIPE;
- goto done;
- }
-
- frame_size = areas->step / 8;
- if ((data->count + size * frame_size) <= data->link_mtu)
- frames_to_read = size;
- else
- frames_to_read = (data->link_mtu - data->count) / frame_size;
-
- DBG("count=%d frames_to_read=%lu", data->count, frames_to_read);
-
- /* Ready for more data */
- buff = (uint8_t *) areas->addr +
- (areas->first + areas->step * offset) / 8;
- memcpy(data->buffer + data->count, buff, frame_size * frames_to_read);
-
- /* Remember we have some frames in the pipe now */
- data->count += frames_to_read * frame_size;
- if (data->count != data->link_mtu) {
- ret = frames_to_read;
- goto done;
- }
-
- rsend = send(data->stream.fd, data->buffer, data->link_mtu,
- io->nonblock ? MSG_DONTWAIT : 0);
- if (rsend > 0) {
- /* Reset count pointer */
- data->count = 0;
-
- ret = frames_to_read;
- } else if (rsend < 0)
- ret = (errno == EPIPE) ? -EIO : -errno;
- else
- ret = -EIO;
-
-done:
- DBG("returning %ld", ret);
- return ret;
-}
-
-static snd_pcm_sframes_t bluetooth_a2dp_read(snd_pcm_ioplug_t *io,
- const snd_pcm_channel_area_t *areas,
- snd_pcm_uframes_t offset, snd_pcm_uframes_t size)
-{
- snd_pcm_uframes_t ret = 0;
- return ret;
-}
-
-static int avdtp_write(struct bluetooth_data *data)
-{
- int err;
- struct rtp_header *header;
- struct rtp_payload *payload;
- struct bluetooth_a2dp *a2dp = &data->a2dp;
-
- header = (void *) a2dp->buffer;
- payload = (void *) (a2dp->buffer + sizeof(*header));
-
- memset(a2dp->buffer, 0, sizeof(*header) + sizeof(*payload));
-
- payload->frame_count = a2dp->frame_count;
- header->v = 2;
- header->pt = 1;
- header->sequence_number = htons(a2dp->seq_num);
- header->timestamp = htonl(a2dp->nsamples);
- header->ssrc = htonl(1);
-
- err = send(data->stream.fd, a2dp->buffer, a2dp->count, MSG_DONTWAIT);
- if (err < 0) {
- err = -errno;
- DBG("send failed: %s (%d)", strerror(-err), -err);
- }
-
- /* Reset buffer of data to send */
- a2dp->count = sizeof(struct rtp_header) + sizeof(struct rtp_payload);
- a2dp->frame_count = 0;
- a2dp->samples = 0;
- a2dp->seq_num++;
-
- return err;
-}
-
-static snd_pcm_sframes_t bluetooth_a2dp_write(snd_pcm_ioplug_t *io,
- const snd_pcm_channel_area_t *areas,
- snd_pcm_uframes_t offset, snd_pcm_uframes_t size)
-{
- struct bluetooth_data *data = io->private_data;
- struct bluetooth_a2dp *a2dp = &data->a2dp;
- snd_pcm_sframes_t ret = 0;
- unsigned int bytes_left;
- int frame_size, encoded;
- ssize_t written;
- uint8_t *buff;
-
- DBG("areas->step=%u areas->first=%u offset=%lu size=%lu",
- areas->step, areas->first, offset, size);
- DBG("hw_ptr=%lu appl_ptr=%lu diff=%lu", io->hw_ptr, io->appl_ptr,
- io->appl_ptr - io->hw_ptr);
-
- /* Calutate starting pointers */
- frame_size = areas->step / 8;
- bytes_left = size * frame_size;
- buff = (uint8_t *) areas->addr +
- (areas->first + areas->step * (offset)) / 8;
-
- /* Check for underrun */
- if (io->hw_ptr > io->appl_ptr) {
- ret = bluetooth_playback_stop(io);
- if (ret == 0)
- ret = -EPIPE;
- data->reset = 1;
- return ret;
- }
-
- /* Check if we should autostart */
- if (io->state == SND_PCM_STATE_PREPARED) {
- snd_pcm_sw_params_t *swparams;
- snd_pcm_uframes_t threshold;
-
- snd_pcm_sw_params_malloc(&swparams);
- if (!snd_pcm_sw_params_current(io->pcm, swparams) &&
- !snd_pcm_sw_params_get_start_threshold(swparams,
- &threshold)) {
- if (io->appl_ptr >= threshold) {
- ret = snd_pcm_start(io->pcm);
- if (ret != 0)
- return ret;
- }
- }
-
- snd_pcm_sw_params_free(swparams);
- }
-
- /* Check if we have any left over data from the last write */
- if (data->count > 0) {
- unsigned int additional_bytes_needed =
- a2dp->codesize - data->count;
- if (additional_bytes_needed > bytes_left)
- goto out;
-
- memcpy(data->buffer + data->count, buff,
- additional_bytes_needed);
-
- /* Enough data to encode (sbc wants 1k blocks) */
- encoded = sbc_encode(&a2dp->sbc, data->buffer, a2dp->codesize,
- a2dp->buffer + a2dp->count,
- sizeof(a2dp->buffer) - a2dp->count,
- &written);
- if (encoded <= 0) {
- DBG("Encoding error %d", encoded);
- goto done;
- }
-
- /* Increment a2dp buffers */
- a2dp->count += written;
- a2dp->frame_count++;
- a2dp->samples += encoded / frame_size;
- a2dp->nsamples += encoded / frame_size;
-
- /* No space left for another frame then send */
- if (a2dp->count + written >= data->link_mtu) {
- avdtp_write(data);
- DBG("sending packet %d, count %d, link_mtu %u",
- a2dp->seq_num, a2dp->count,
- data->link_mtu);
- }
-
- /* Increment up buff pointer to take into account
- * the data processed */
- buff += additional_bytes_needed;
- bytes_left -= additional_bytes_needed;
-
- /* Since data has been process mark it as zero */
- data->count = 0;
- }
-
-
- /* Process this buffer in full chunks */
- while (bytes_left >= a2dp->codesize) {
- /* Enough data to encode (sbc wants 1k blocks) */
- encoded = sbc_encode(&a2dp->sbc, buff, a2dp->codesize,
- a2dp->buffer + a2dp->count,
- sizeof(a2dp->buffer) - a2dp->count,
- &written);
- if (encoded <= 0) {
- DBG("Encoding error %d", encoded);
- goto done;
- }
-
- /* Increment up buff pointer to take into account
- * the data processed */
- buff += a2dp->codesize;
- bytes_left -= a2dp->codesize;
-
- /* Increment a2dp buffers */
- a2dp->count += written;
- a2dp->frame_count++;
- a2dp->samples += encoded / frame_size;
- a2dp->nsamples += encoded / frame_size;
-
- /* No space left for another frame then send */
- if (a2dp->count + written >= data->link_mtu) {
- avdtp_write(data);
- DBG("sending packet %d, count %d, link_mtu %u",
- a2dp->seq_num, a2dp->count,
- data->link_mtu);
- }
- }
-
-out:
- /* Copy the extra to our temp buffer for the next write */
- if (bytes_left > 0) {
- memcpy(data->buffer + data->count, buff, bytes_left);
- data->count += bytes_left;
- bytes_left = 0;
- }
-
-done:
- DBG("returning %ld", size - bytes_left / frame_size);
-
- return size - bytes_left / frame_size;
-}
-
-static int bluetooth_playback_delay(snd_pcm_ioplug_t *io,
- snd_pcm_sframes_t *delayp)
-{
- DBG("");
-
- /* This updates io->hw_ptr value using pointer() function */
- snd_pcm_hwsync(io->pcm);
-
- *delayp = io->appl_ptr - io->hw_ptr;
- if ((io->state == SND_PCM_STATE_RUNNING) && (*delayp < 0)) {
- io->callback->stop(io);
- io->state = SND_PCM_STATE_XRUN;
- *delayp = 0;
- }
-
- /* This should never fail, ALSA API is really not
- prepared to handle a non zero return value */
- return 0;
-}
-
-static snd_pcm_ioplug_callback_t bluetooth_hsp_playback = {
- .start = bluetooth_playback_start,
- .stop = bluetooth_playback_stop,
- .pointer = bluetooth_pointer,
- .close = bluetooth_close,
- .hw_params = bluetooth_hsp_hw_params,
- .prepare = bluetooth_prepare,
- .transfer = bluetooth_hsp_write,
- .poll_descriptors_count = bluetooth_playback_poll_descriptors_count,
- .poll_descriptors = bluetooth_playback_poll_descriptors,
- .poll_revents = bluetooth_playback_poll_revents,
- .delay = bluetooth_playback_delay,
-};
-
-static snd_pcm_ioplug_callback_t bluetooth_hsp_capture = {
- .start = bluetooth_start,
- .stop = bluetooth_stop,
- .pointer = bluetooth_pointer,
- .close = bluetooth_close,
- .hw_params = bluetooth_hsp_hw_params,
- .prepare = bluetooth_prepare,
- .transfer = bluetooth_hsp_read,
- .poll_descriptors = bluetooth_poll_descriptors,
- .poll_revents = bluetooth_poll_revents,
-};
-
-static snd_pcm_ioplug_callback_t bluetooth_a2dp_playback = {
- .start = bluetooth_playback_start,
- .stop = bluetooth_playback_stop,
- .pointer = bluetooth_pointer,
- .close = bluetooth_close,
- .hw_params = bluetooth_a2dp_hw_params,
- .prepare = bluetooth_prepare,
- .transfer = bluetooth_a2dp_write,
- .poll_descriptors_count = bluetooth_playback_poll_descriptors_count,
- .poll_descriptors = bluetooth_playback_poll_descriptors,
- .poll_revents = bluetooth_playback_poll_revents,
- .delay = bluetooth_playback_delay,
-};
-
-static snd_pcm_ioplug_callback_t bluetooth_a2dp_capture = {
- .start = bluetooth_start,
- .stop = bluetooth_stop,
- .pointer = bluetooth_pointer,
- .close = bluetooth_close,
- .hw_params = bluetooth_a2dp_hw_params,
- .prepare = bluetooth_prepare,
- .transfer = bluetooth_a2dp_read,
- .poll_descriptors = bluetooth_poll_descriptors,
- .poll_revents = bluetooth_poll_revents,
-};
-
-#define ARRAY_NELEMS(a) (sizeof((a)) / sizeof((a)[0]))
-
-static int bluetooth_hsp_hw_constraint(snd_pcm_ioplug_t *io)
-{
- struct bluetooth_data *data = io->private_data;
- snd_pcm_access_t access_list[] = {
- SND_PCM_ACCESS_RW_INTERLEAVED,
- /* Mmap access is really useless fo this driver, but we
- * support it because some pieces of software out there
- * insist on using it */
- SND_PCM_ACCESS_MMAP_INTERLEAVED
- };
- unsigned int format_list[] = {
- SND_PCM_FORMAT_S16
- };
- int err;
-
- /* access type */
- err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_ACCESS,
- ARRAY_NELEMS(access_list), access_list);
- if (err < 0)
- return err;
-
- /* supported formats */
- err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_FORMAT,
- ARRAY_NELEMS(format_list), format_list);
- if (err < 0)
- return err;
-
- /* supported channels */
- err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_CHANNELS,
- 1, 1);
- if (err < 0)
- return err;
-
- /* supported rate */
- err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_RATE,
- 8000, 8000);
- if (err < 0)
- return err;
-
- /* supported block size */
- err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_PERIOD_BYTES,
- data->link_mtu, data->link_mtu);
- if (err < 0)
- return err;
-
- err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_PERIODS,
- 2, 200);
- if (err < 0)
- return err;
-
- return 0;
-}
-
-static int bluetooth_a2dp_hw_constraint(snd_pcm_ioplug_t *io)
-{
- struct bluetooth_data *data = io->private_data;
- struct bluetooth_a2dp *a2dp = &data->a2dp;
- struct bluetooth_alsa_config *cfg = &data->alsa_config;
- snd_pcm_access_t access_list[] = {
- SND_PCM_ACCESS_RW_INTERLEAVED,
- /* Mmap access is really useless fo this driver, but we
- * support it because some pieces of software out there
- * insist on using it */
- SND_PCM_ACCESS_MMAP_INTERLEAVED
- };
- unsigned int format_list[] = {
- SND_PCM_FORMAT_S16
- };
- unsigned int rate_list[4];
- unsigned int rate_count;
- int err, min_channels, max_channels;
- unsigned int period_list[] = {
- 2048,
- 4096, /* e.g. 23.2msec/period (stereo 16bit at 44.1kHz) */
- 8192
- };
-
- /* access type */
- err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_ACCESS,
- ARRAY_NELEMS(access_list), access_list);
- if (err < 0)
- return err;
-
- /* supported formats */
- err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_FORMAT,
- ARRAY_NELEMS(format_list), format_list);
- if (err < 0)
- return err;
-
- /* supported channels */
- if (cfg->has_channel_mode)
- a2dp->sbc_capabilities.channel_mode = cfg->channel_mode;
-
- if (a2dp->sbc_capabilities.channel_mode &
- BT_A2DP_CHANNEL_MODE_MONO)
- min_channels = 1;
- else
- min_channels = 2;
-
- if (a2dp->sbc_capabilities.channel_mode &
- (~BT_A2DP_CHANNEL_MODE_MONO))
- max_channels = 2;
- else
- max_channels = 1;
-
- err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_CHANNELS,
- min_channels, max_channels);
- if (err < 0)
- return err;
-
- /* supported buffer sizes
- * (can be used as 3*8192, 6*4096, 12*2048, ...) */
- err = snd_pcm_ioplug_set_param_minmax(io,
- SND_PCM_IOPLUG_HW_BUFFER_BYTES,
- 8192*3, 8192*3);
- if (err < 0)
- return err;
-
- /* supported block sizes: */
- err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_PERIOD_BYTES,
- ARRAY_NELEMS(period_list), period_list);
- if (err < 0)
- return err;
-
- /* supported rates */
- rate_count = 0;
- if (cfg->has_rate) {
- rate_list[rate_count] = cfg->rate;
- rate_count++;
- } else {
- if (a2dp->sbc_capabilities.frequency &
- BT_SBC_SAMPLING_FREQ_16000) {
- rate_list[rate_count] = 16000;
- rate_count++;
- }
-
- if (a2dp->sbc_capabilities.frequency &
- BT_SBC_SAMPLING_FREQ_32000) {
- rate_list[rate_count] = 32000;
- rate_count++;
- }
-
- if (a2dp->sbc_capabilities.frequency &
- BT_SBC_SAMPLING_FREQ_44100) {
- rate_list[rate_count] = 44100;
- rate_count++;
- }
-
- if (a2dp->sbc_capabilities.frequency &
- BT_SBC_SAMPLING_FREQ_48000) {
- rate_list[rate_count] = 48000;
- rate_count++;
- }
- }
-
- err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_RATE,
- rate_count, rate_list);
- if (err < 0)
- return err;
-
- return 0;
-}
-
-static int bluetooth_parse_config(snd_config_t *conf,
- struct bluetooth_alsa_config *bt_config)
-{
- snd_config_iterator_t i, next;
-
- memset(bt_config, 0, sizeof(struct bluetooth_alsa_config));
-
- /* Set defaults */
- bt_config->autoconnect = 1;
-
- snd_config_for_each(i, next, conf) {
- snd_config_t *n = snd_config_iterator_entry(i);
- const char *id, *value;
-
- if (snd_config_get_id(n, &id) < 0)
- continue;
-
- if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0)
- continue;
-
- if (strcmp(id, "autoconnect") == 0) {
- int b;
-
- b = snd_config_get_bool(n);
- if (b < 0) {
- SNDERR("Invalid type for %s", id);
- return -EINVAL;
- }
-
- bt_config->autoconnect = b;
- continue;
- }
-
- if (strcmp(id, "device") == 0 || strcmp(id, "bdaddr") == 0) {
- if (snd_config_get_string(n, &value) < 0) {
- SNDERR("Invalid type for %s", id);
- return -EINVAL;
- }
-
- bt_config->has_device = 1;
- strncpy(bt_config->device, value, 18);
- continue;
- }
-
- if (strcmp(id, "profile") == 0) {
- if (snd_config_get_string(n, &value) < 0) {
- SNDERR("Invalid type for %s", id);
- return -EINVAL;
- }
-
- if (strcmp(value, "auto") == 0) {
- bt_config->transport = BT_CAPABILITIES_TRANSPORT_ANY;
- bt_config->has_transport = 1;
- } else if (strcmp(value, "voice") == 0 ||
- strcmp(value, "hfp") == 0) {
- bt_config->transport = BT_CAPABILITIES_TRANSPORT_SCO;
- bt_config->has_transport = 1;
- } else if (strcmp(value, "hifi") == 0 ||
- strcmp(value, "a2dp") == 0) {
- bt_config->transport = BT_CAPABILITIES_TRANSPORT_A2DP;
- bt_config->has_transport = 1;
- }
- continue;
- }
-
- if (strcmp(id, "rate") == 0) {
- if (snd_config_get_string(n, &value) < 0) {
- SNDERR("Invalid type for %s", id);
- return -EINVAL;
- }
-
- bt_config->rate = atoi(value);
- bt_config->has_rate = 1;
- continue;
- }
-
- if (strcmp(id, "mode") == 0) {
- if (snd_config_get_string(n, &value) < 0) {
- SNDERR("Invalid type for %s", id);
- return -EINVAL;
- }
-
- if (strcmp(value, "mono") == 0) {
- bt_config->channel_mode = BT_A2DP_CHANNEL_MODE_MONO;
- bt_config->has_channel_mode = 1;
- } else if (strcmp(value, "dual") == 0) {
- bt_config->channel_mode = BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL;
- bt_config->has_channel_mode = 1;
- } else if (strcmp(value, "stereo") == 0) {
- bt_config->channel_mode = BT_A2DP_CHANNEL_MODE_STEREO;
- bt_config->has_channel_mode = 1;
- } else if (strcmp(value, "joint") == 0) {
- bt_config->channel_mode = BT_A2DP_CHANNEL_MODE_JOINT_STEREO;
- bt_config->has_channel_mode = 1;
- }
- continue;
- }
-
- if (strcmp(id, "allocation") == 0) {
- if (snd_config_get_string(n, &value) < 0) {
- SNDERR("Invalid type for %s", id);
- return -EINVAL;
- }
-
- if (strcmp(value, "loudness") == 0) {
- bt_config->allocation_method = BT_A2DP_ALLOCATION_LOUDNESS;
- bt_config->has_allocation_method = 1;
- } else if (strcmp(value, "snr") == 0) {
- bt_config->allocation_method = BT_A2DP_ALLOCATION_SNR;
- bt_config->has_allocation_method = 1;
- }
- continue;
- }
-
- if (strcmp(id, "subbands") == 0) {
- if (snd_config_get_string(n, &value) < 0) {
- SNDERR("Invalid type for %s", id);
- return -EINVAL;
- }
-
- bt_config->subbands = atoi(value);
- bt_config->has_subbands = 1;
- continue;
- }
-
- if (strcmp(id, "blocks") == 0) {
- if (snd_config_get_string(n, &value) < 0) {
- SNDERR("Invalid type for %s", id);
- return -EINVAL;
- }
-
- bt_config->block_length = atoi(value);
- bt_config->has_block_length = 1;
- continue;
- }
-
- if (strcmp(id, "bitpool") == 0) {
- if (snd_config_get_string(n, &value) < 0) {
- SNDERR("Invalid type for %s", id);
- return -EINVAL;
- }
-
- bt_config->bitpool = atoi(value);
- bt_config->has_bitpool = 1;
- continue;
- }
-
- SNDERR("Unknown field %s", id);
- return -EINVAL;
- }
-
- return 0;
-}
-
-static int audioservice_send(int sk, const bt_audio_msg_header_t *msg)
-{
- int err;
- uint16_t length;
-
- length = msg->length ? msg->length : BT_SUGGESTED_BUFFER_SIZE;
-
- DBG("sending %s:%s", bt_audio_strtype(msg->type),
- bt_audio_strname(msg->name));
- if (send(sk, msg, length, 0) > 0)
- err = 0;
- else {
- err = -errno;
- SNDERR("Error sending data to audio service: %s(%d)",
- strerror(-err), -err);
- }
-
- return err;
-}
-
-static int audioservice_recv(int sk, bt_audio_msg_header_t *inmsg)
-{
- int err;
- ssize_t ret;
- const char *type, *name;
- uint16_t length;
-
- length = inmsg->length ? inmsg->length : BT_SUGGESTED_BUFFER_SIZE;
-
- DBG("trying to receive msg from audio service...");
-
- ret = recv(sk, inmsg, length, 0);
- if (ret < 0) {
- err = -errno;
- SNDERR("Error receiving IPC data from bluetoothd: %s (%d)",
- strerror(-err), -err);
- } else if ((size_t) ret < sizeof(bt_audio_msg_header_t)) {
- SNDERR("Too short (%d bytes) IPC packet from bluetoothd", ret);
- err = -EINVAL;
- } else {
- type = bt_audio_strtype(inmsg->type);
- name = bt_audio_strname(inmsg->name);
- if (type && name) {
- DBG("Received %s - %s", type, name);
- err = 0;
- } else {
- err = -EINVAL;
- SNDERR("Bogus message type %d - name %d"
- " received from audio service",
- inmsg->type, inmsg->name);
- }
-
- }
-
- return err;
-}
-
-static int audioservice_expect(int sk, bt_audio_msg_header_t *rsp,
- int expected_name)
-{
- bt_audio_error_t *error;
- int err = audioservice_recv(sk, rsp);
-
- if (err != 0)
- return err;
-
- if (rsp->name != expected_name) {
- err = -EINVAL;
- SNDERR("Bogus message %s received while %s was expected",
- bt_audio_strname(rsp->name),
- bt_audio_strname(expected_name));
- }
-
- if (rsp->type == BT_ERROR) {
- error = (void *) rsp;
- SNDERR("%s failed : %s(%d)",
- bt_audio_strname(rsp->name),
- strerror(error->posix_errno),
- error->posix_errno);
- return -error->posix_errno;
- }
-
- return err;
-}
-
-static int bluetooth_parse_capabilities(struct bluetooth_data *data,
- struct bt_get_capabilities_rsp *rsp)
-{
- int bytes_left = rsp->h.length - sizeof(*rsp);
- codec_capabilities_t *codec = (void *) rsp->data;
-
- data->transport = codec->transport;
-
- if (codec->transport != BT_CAPABILITIES_TRANSPORT_A2DP)
- return 0;
-
- while (bytes_left > 0) {
- if ((codec->type == BT_A2DP_SBC_SINK) &&
- !(codec->lock & BT_WRITE_LOCK))
- break;
-
- bytes_left -= codec->length;
- codec = (void *) codec + codec->length;
- }
-
- if (bytes_left <= 0 ||
- codec->length != sizeof(data->a2dp.sbc_capabilities))
- return -EINVAL;
-
- memcpy(&data->a2dp.sbc_capabilities, codec, codec->length);
-
- return 0;
-}
-
-static int bluetooth_init(struct bluetooth_data *data,
- snd_pcm_stream_t stream, snd_config_t *conf)
-{
- int sk, err;
- struct bluetooth_alsa_config *alsa_conf = &data->alsa_config;
- char buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_get_capabilities_req *req = (void *) buf;
- struct bt_get_capabilities_rsp *rsp = (void *) buf;
-
- memset(data, 0, sizeof(struct bluetooth_data));
-
- err = bluetooth_parse_config(conf, alsa_conf);
- if (err < 0)
- return err;
-
- data->server.fd = -1;
- data->stream.fd = -1;
-
- sk = bt_audio_service_open();
- if (sk < 0) {
- err = -errno;
- goto failed;
- }
-
- data->server.fd = sk;
- data->server.events = POLLIN;
-
- data->pipefd[0] = -1;
- data->pipefd[1] = -1;
-
- if (pipe(data->pipefd) < 0) {
- err = -errno;
- goto failed;
- }
- if (fcntl(data->pipefd[0], F_SETFL, O_NONBLOCK) < 0) {
- err = -errno;
- goto failed;
- }
- if (fcntl(data->pipefd[1], F_SETFL, O_NONBLOCK) < 0) {
- err = -errno;
- goto failed;
- }
-
- memset(req, 0, BT_SUGGESTED_BUFFER_SIZE);
- req->h.type = BT_REQUEST;
- req->h.name = BT_GET_CAPABILITIES;
- req->h.length = sizeof(*req);
-
- if (alsa_conf->autoconnect)
- req->flags |= BT_FLAG_AUTOCONNECT;
- strncpy(req->destination, alsa_conf->device, 18);
- if (alsa_conf->has_transport)
- req->transport = alsa_conf->transport;
- else
- req->transport = BT_CAPABILITIES_TRANSPORT_ANY;
-
- err = audioservice_send(data->server.fd, &req->h);
- if (err < 0)
- goto failed;
-
- rsp->h.length = 0;
- err = audioservice_expect(data->server.fd, &rsp->h,
- BT_GET_CAPABILITIES);
- if (err < 0)
- goto failed;
-
- bluetooth_parse_capabilities(data, rsp);
-
- return 0;
-
-failed:
- if (sk >= 0)
- bt_audio_service_close(sk);
- return err;
-}
-
-SND_PCM_PLUGIN_DEFINE_FUNC(bluetooth);
-
-SND_PCM_PLUGIN_DEFINE_FUNC(bluetooth)
-{
- struct bluetooth_data *data;
- int err;
-
- DBG("Bluetooth PCM plugin (%s)",
- stream == SND_PCM_STREAM_PLAYBACK ? "Playback" : "Capture");
-
- data = malloc(sizeof(struct bluetooth_data));
- if (!data) {
- err = -ENOMEM;
- goto error;
- }
-
- err = bluetooth_init(data, stream, conf);
- if (err < 0)
- goto error;
-
- data->io.version = SND_PCM_IOPLUG_VERSION;
- data->io.name = "Bluetooth Audio Device";
- data->io.mmap_rw = 0; /* No direct mmap communication */
- data->io.private_data = data;
-
- if (data->transport == BT_CAPABILITIES_TRANSPORT_A2DP)
- data->io.callback = stream == SND_PCM_STREAM_PLAYBACK ?
- &bluetooth_a2dp_playback :
- &bluetooth_a2dp_capture;
- else
- data->io.callback = stream == SND_PCM_STREAM_PLAYBACK ?
- &bluetooth_hsp_playback :
- &bluetooth_hsp_capture;
-
- err = snd_pcm_ioplug_create(&data->io, name, stream, mode);
- if (err < 0)
- goto error;
-
- if (data->transport == BT_CAPABILITIES_TRANSPORT_A2DP)
- err = bluetooth_a2dp_hw_constraint(&data->io);
- else
- err = bluetooth_hsp_hw_constraint(&data->io);
-
- if (err < 0) {
- snd_pcm_ioplug_delete(&data->io);
- goto error;
- }
-
- *pcmp = data->io.pcm;
-
- return 0;
-
-error:
- if (data)
- bluetooth_exit(data);
-
- return err;
-}
-
-SND_PCM_PLUGIN_SYMBOL(bluetooth);
diff --git a/configure.ac b/configure.ac
index 48b181e..87b47ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,6 @@ AC_CHECK_HEADER([sys/inotify.h],
[AC_MSG_ERROR(inotify headers are required and missing)])
AC_PATH_DBUS
AC_PATH_GLIB
-AC_PATH_ALSA
AC_PATH_GSTREAMER
AC_PATH_USB
AC_PATH_UDEV
--
1.7.10.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* =?y?q?=5BPATCH=20BlueZ=203/5=5D=20audio=3A=20Remove=20internal=20audio=20IPC?=
2012-06-14 13:41 [PATCH BlueZ 1/5] audio: Remove unix socket support Luiz Augusto von Dentz
2012-06-14 13:41 ` [PATCH BlueZ 2/5] audio: Remove ALSA support Luiz Augusto von Dentz
@ 2012-06-14 13:41 ` Luiz Augusto von Dentz
2012-06-14 13:41 ` [PATCH BlueZ 4/5] audio: Remove local A2DP endpoints options Luiz Augusto von Dentz
2012-06-14 13:41 ` [PATCH BlueZ 5/5] audio: Remove remaining references to Socket Luiz Augusto von Dentz
3 siblings, 0 replies; 8+ messages in thread
From: Luiz Augusto von Dentz @ 2012-06-14 13:41 UTC (permalink / raw)
To: linux-bluetooth
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 85881 bytes --]
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
With unix socket and ALSA removed there is no longer any use for the
internal IPC.
---
Makefile.am | 4 +-
Makefile.tools | 5 +-
audio/device.c | 1 -
audio/gstavdtpsink.c | 1107 ++++-------------------------------
audio/gstavdtpsink.h | 1 -
audio/ipc.c | 134 -----
audio/ipc.h | 361 ------------
audio/manager.c | 1 -
test/ipctest-a2dp-easy.test | 8 -
test/ipctest-a2dp-resume-fast.test | 82 ---
test/ipctest-hsp-a2dp-switch.test | 50 --
test/ipctest-hsp-easy.test | 7 -
test/ipctest-init-shutdown.test | 59 --
test/ipctest.c | 1133 ------------------------------------
14 files changed, 112 insertions(+), 2841 deletions(-)
delete mode 100644 audio/ipc.c
delete mode 100644 audio/ipc.h
delete mode 100644 test/ipctest-a2dp-easy.test
delete mode 100644 test/ipctest-a2dp-resume-fast.test
delete mode 100644 test/ipctest-hsp-a2dp-switch.test
delete mode 100644 test/ipctest-hsp-easy.test
delete mode 100644 test/ipctest-init-shutdown.test
delete mode 100644 test/ipctest.c
diff --git a/Makefile.am b/Makefile.am
index cb2143b..deb25e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -151,7 +151,6 @@ builtin_sources += audio/main.c \
audio/sink.h audio/sink.c \
audio/a2dp.h audio/a2dp.c \
audio/avdtp.h audio/avdtp.c \
- audio/ipc.h audio/ipc.c \
audio/media.h audio/media.c \
audio/transport.h audio/transport.c \
audio/telephony.h audio/a2dp-codecs.h
@@ -348,8 +347,7 @@ audio_libgstbluetooth_la_SOURCES = audio/gstbluetooth.c audio/gstpragma.h \
audio/gstavdtpsink.h audio/gstavdtpsink.c \
audio/gsta2dpsink.h audio/gsta2dpsink.c \
audio/gstsbcutil.h audio/gstsbcutil.c \
- audio/gstrtpsbcpay.h audio/gstrtpsbcpay.c \
- audio/rtp.h audio/ipc.h audio/ipc.c
+ audio/gstrtpsbcpay.h audio/gstrtpsbcpay.c
audio_libgstbluetooth_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
audio_libgstbluetooth_la_LIBADD = sbc/libsbc.la lib/libbluetooth-private.la \
@DBUS_LIBS@ @GSTREAMER_LIBS@ \
diff --git a/Makefile.tools b/Makefile.tools
index c93b263..8dc5674 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -163,7 +163,7 @@ sbin_PROGRAMS += test/hciemu
bin_PROGRAMS += test/l2test test/rctest
noinst_PROGRAMS += test/gaptest test/sdptest test/scotest \
- test/attest test/hstest test/avtest test/ipctest \
+ test/attest test/hstest test/avtest \
test/lmptest test/bdaddr test/agent \
test/btiotest test/test-textfile \
test/uuidtest test/mpris-player
@@ -188,9 +188,6 @@ test_avtest_LDADD = lib/libbluetooth-private.la
test_lmptest_LDADD = lib/libbluetooth-private.la
-test_ipctest_SOURCES = test/ipctest.c audio/ipc.h audio/ipc.c
-test_ipctest_LDADD= @GLIB_LIBS@ sbc/libsbc.la
-
test_bdaddr_SOURCES = test/bdaddr.c src/oui.h src/oui.c
test_bdaddr_LDADD = lib/libbluetooth-private.la
diff --git a/audio/device.c b/audio/device.c
index 51ec2d0..2e7aa97 100644
--- a/audio/device.c
+++ b/audio/device.c
@@ -46,7 +46,6 @@
#include "../src/device.h"
#include "error.h"
-#include "ipc.h"
#include "dbus-common.h"
#include "device.h"
#include "avdtp.h"
diff --git a/audio/gstavdtpsink.c b/audio/gstavdtpsink.c
index 1f374fc..ffaed7f 100644
--- a/audio/gstavdtpsink.c
+++ b/audio/gstavdtpsink.c
@@ -39,7 +39,6 @@
#include <dbus/dbus.h>
-#include "ipc.h"
#include "rtp.h"
#include "a2dp-codecs.h"
@@ -65,7 +64,6 @@ GST_DEBUG_CATEGORY_STATIC(avdtp_sink_debug);
} G_STMT_END
struct bluetooth_data {
- struct bt_get_capabilities_rsp *caps; /* Bluetooth device caps */
guint link_mtu;
DBusConnection *conn;
@@ -118,13 +116,6 @@ static GstStaticPadTemplate avdtp_sink_factory =
"encoding-name = (string) \"MPA\""
));
-static int gst_avdtp_sink_audioservice_send(GstAvdtpSink *self,
- const bt_audio_msg_header_t *msg);
-static int gst_avdtp_sink_audioservice_expect(GstAvdtpSink *self,
- bt_audio_msg_header_t *outmsg,
- guint8 expected_name);
-
-
static void gst_avdtp_sink_base_init(gpointer g_class)
{
GstElementClass *element_class = GST_ELEMENT_CLASS(g_class);
@@ -163,12 +154,6 @@ static gboolean gst_avdtp_sink_stop(GstBaseSink *basesink)
self->watch_id = 0;
}
- if (self->server) {
- bt_audio_service_close(g_io_channel_unix_get_fd(self->server));
- g_io_channel_unref(self->server);
- self->server = NULL;
- }
-
if (self->stream) {
g_io_channel_shutdown(self->stream, TRUE, NULL);
g_io_channel_unref(self->stream);
@@ -241,545 +226,30 @@ static void gst_avdtp_sink_set_property(GObject *object, guint prop_id,
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
}
-}
-
-static void gst_avdtp_sink_get_property(GObject *object, guint prop_id,
- GValue *value, GParamSpec *pspec)
-{
- GstAvdtpSink *sink = GST_AVDTP_SINK(object);
-
- switch (prop_id) {
- case PROP_DEVICE:
- g_value_set_string(value, sink->device);
- break;
-
- case PROP_AUTOCONNECT:
- g_value_set_boolean(value, sink->autoconnect);
- break;
-
- case PROP_TRANSPORT:
- g_value_set_string(value, sink->transport);
- break;
-
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
- break;
- }
-}
-
-static gint gst_avdtp_sink_bluetooth_recvmsg_fd(GstAvdtpSink *sink)
-{
- int err, ret;
-
- ret = bt_audio_service_get_data_fd(
- g_io_channel_unix_get_fd(sink->server));
-
- if (ret < 0) {
- err = -errno;
- GST_ERROR_OBJECT(sink, "Unable to receive fd: %s (%d)",
- strerror(-err), -err);
- return err;
- }
-
- sink->stream = g_io_channel_unix_new(ret);
- g_io_channel_set_encoding(sink->stream, NULL, NULL);
- GST_DEBUG_OBJECT(sink, "stream_fd=%d", ret);
-
- return 0;
-}
-
-static codec_capabilities_t *gst_avdtp_find_caps(GstAvdtpSink *sink,
- uint8_t codec_type)
-{
- struct bt_get_capabilities_rsp *rsp = sink->data->caps;
- codec_capabilities_t *codec = (void *) rsp->data;
- int bytes_left = rsp->h.length - sizeof(*rsp);
-
- while (bytes_left > 0) {
- if ((codec->type == codec_type) &&
- !(codec->lock & BT_WRITE_LOCK))
- break;
-
- bytes_left -= codec->length;
- codec = (void *) codec + codec->length;
- }
-
- if (bytes_left <= 0)
- return NULL;
-
- return codec;
-}
-
-static gboolean gst_avdtp_sink_init_sbc_pkt_conf(GstAvdtpSink *sink,
- GstCaps *caps,
- sbc_capabilities_t *pkt)
-{
- sbc_capabilities_t *cfg;
- const GValue *value = NULL;
- const char *pref, *name;
- gint rate, subbands, blocks;
- GstStructure *structure = gst_caps_get_structure(caps, 0);
-
- cfg = (void *) gst_avdtp_find_caps(sink, BT_A2DP_SBC_SINK);
- name = gst_structure_get_name(structure);
-
- if (!(IS_SBC(name))) {
- GST_ERROR_OBJECT(sink, "Unexpected format %s, "
- "was expecting sbc", name);
- return FALSE;
- }
-
- value = gst_structure_get_value(structure, "rate");
- rate = g_value_get_int(value);
- if (rate == 44100)
- cfg->frequency = BT_SBC_SAMPLING_FREQ_44100;
- else if (rate == 48000)
- cfg->frequency = BT_SBC_SAMPLING_FREQ_48000;
- else if (rate == 32000)
- cfg->frequency = BT_SBC_SAMPLING_FREQ_32000;
- else if (rate == 16000)
- cfg->frequency = BT_SBC_SAMPLING_FREQ_16000;
- else {
- GST_ERROR_OBJECT(sink, "Invalid rate while setting caps");
- return FALSE;
- }
-
- value = gst_structure_get_value(structure, "mode");
- pref = g_value_get_string(value);
- if (strcmp(pref, "mono") == 0)
- cfg->channel_mode = BT_A2DP_CHANNEL_MODE_MONO;
- else if (strcmp(pref, "dual") == 0)
- cfg->channel_mode = BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL;
- else if (strcmp(pref, "stereo") == 0)
- cfg->channel_mode = BT_A2DP_CHANNEL_MODE_STEREO;
- else if (strcmp(pref, "joint") == 0)
- cfg->channel_mode = BT_A2DP_CHANNEL_MODE_JOINT_STEREO;
- else {
- GST_ERROR_OBJECT(sink, "Invalid mode %s", pref);
- return FALSE;
- }
-
- value = gst_structure_get_value(structure, "allocation");
- pref = g_value_get_string(value);
- if (strcmp(pref, "loudness") == 0)
- cfg->allocation_method = BT_A2DP_ALLOCATION_LOUDNESS;
- else if (strcmp(pref, "snr") == 0)
- cfg->allocation_method = BT_A2DP_ALLOCATION_SNR;
- else {
- GST_ERROR_OBJECT(sink, "Invalid allocation: %s", pref);
- return FALSE;
- }
-
- value = gst_structure_get_value(structure, "subbands");
- subbands = g_value_get_int(value);
- if (subbands == 8)
- cfg->subbands = BT_A2DP_SUBBANDS_8;
- else if (subbands == 4)
- cfg->subbands = BT_A2DP_SUBBANDS_4;
- else {
- GST_ERROR_OBJECT(sink, "Invalid subbands %d", subbands);
- return FALSE;
- }
-
- value = gst_structure_get_value(structure, "blocks");
- blocks = g_value_get_int(value);
- if (blocks == 16)
- cfg->block_length = BT_A2DP_BLOCK_LENGTH_16;
- else if (blocks == 12)
- cfg->block_length = BT_A2DP_BLOCK_LENGTH_12;
- else if (blocks == 8)
- cfg->block_length = BT_A2DP_BLOCK_LENGTH_8;
- else if (blocks == 4)
- cfg->block_length = BT_A2DP_BLOCK_LENGTH_4;
- else {
- GST_ERROR_OBJECT(sink, "Invalid blocks %d", blocks);
- return FALSE;
- }
-
- value = gst_structure_get_value(structure, "bitpool");
- cfg->max_bitpool = cfg->min_bitpool = g_value_get_int(value);
-
- memcpy(pkt, cfg, sizeof(*pkt));
-
- return TRUE;
-}
-
-static gboolean gst_avdtp_sink_conf_recv_stream_fd(
- GstAvdtpSink *self)
-{
- struct bluetooth_data *data = self->data;
- gint ret;
- GError *gerr = NULL;
- GIOStatus status;
- GIOFlags flags;
- int fd;
-
- /* Proceed if stream was already acquired */
- if (self->stream != NULL)
- goto proceed;
-
- ret = gst_avdtp_sink_bluetooth_recvmsg_fd(self);
- if (ret < 0)
- return FALSE;
-
- if (!self->stream) {
- GST_ERROR_OBJECT(self, "Error while configuring device: "
- "could not acquire audio socket");
- return FALSE;
- }
-
-proceed:
- /* set stream socket to nonblock */
- GST_LOG_OBJECT(self, "setting stream socket to nonblock");
- flags = g_io_channel_get_flags(self->stream);
- flags |= G_IO_FLAG_NONBLOCK;
- status = g_io_channel_set_flags(self->stream, flags, &gerr);
- if (status != G_IO_STATUS_NORMAL) {
- if (gerr)
- GST_WARNING_OBJECT(self, "Error while "
- "setting server socket to nonblock: "
- "%s", gerr->message);
- else
- GST_WARNING_OBJECT(self, "Error while "
- "setting server "
- "socket to nonblock");
- }
-
- fd = g_io_channel_unix_get_fd(self->stream);
-
- /* It is possible there is some outstanding
- data in the pipe - we have to empty it */
- GST_LOG_OBJECT(self, "emptying stream pipe");
- while (1) {
- ssize_t bread = read(fd, data->buffer, data->link_mtu);
- if (bread <= 0)
- break;
- }
-
- /* set stream socket to block */
- GST_LOG_OBJECT(self, "setting stream socket to block");
- flags = g_io_channel_get_flags(self->stream);
- flags &= ~G_IO_FLAG_NONBLOCK;
- status = g_io_channel_set_flags(self->stream, flags, &gerr);
- if (status != G_IO_STATUS_NORMAL) {
- if (gerr)
- GST_WARNING_OBJECT(self, "Error while "
- "setting server socket to block:"
- "%s", gerr->message);
- else
- GST_WARNING_OBJECT(self, "Error while "
- "setting server "
- "socket to block");
- }
-
- memset(data->buffer, 0, sizeof(data->buffer));
-
- return TRUE;
-}
-
-static gboolean server_callback(GIOChannel *chan,
- GIOCondition cond, gpointer data)
-{
- if (cond & G_IO_HUP || cond & G_IO_NVAL)
- return FALSE;
- else if (cond & G_IO_ERR)
- GST_WARNING_OBJECT(GST_AVDTP_SINK(data),
- "Untreated callback G_IO_ERR");
-
- return TRUE;
-}
-
-static GstStructure *gst_avdtp_sink_parse_sbc_caps(
- GstAvdtpSink *self, sbc_capabilities_t *sbc)
-{
- GstStructure *structure;
- GValue *value;
- GValue *list;
- gboolean mono, stereo;
-
- if (sbc == NULL)
- return NULL;
-
- structure = gst_structure_empty_new("audio/x-sbc");
- value = g_value_init(g_new0(GValue, 1), G_TYPE_STRING);
-
- /* mode */
- list = g_value_init(g_new0(GValue, 1), GST_TYPE_LIST);
- if (sbc->channel_mode & BT_A2DP_CHANNEL_MODE_MONO) {
- g_value_set_static_string(value, "mono");
- gst_value_list_prepend_value(list, value);
- }
- if (sbc->channel_mode & BT_A2DP_CHANNEL_MODE_STEREO) {
- g_value_set_static_string(value, "stereo");
- gst_value_list_prepend_value(list, value);
- }
- if (sbc->channel_mode & BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL) {
- g_value_set_static_string(value, "dual");
- gst_value_list_prepend_value(list, value);
- }
- if (sbc->channel_mode & BT_A2DP_CHANNEL_MODE_JOINT_STEREO) {
- g_value_set_static_string(value, "joint");
- gst_value_list_prepend_value(list, value);
- }
- g_value_unset(value);
- if (list) {
- gst_structure_set_value(structure, "mode", list);
- g_free(list);
- list = NULL;
- }
-
- /* subbands */
- list = g_value_init(g_new0(GValue, 1), GST_TYPE_LIST);
- value = g_value_init(value, G_TYPE_INT);
- if (sbc->subbands & BT_A2DP_SUBBANDS_4) {
- g_value_set_int(value, 4);
- gst_value_list_prepend_value(list, value);
- }
- if (sbc->subbands & BT_A2DP_SUBBANDS_8) {
- g_value_set_int(value, 8);
- gst_value_list_prepend_value(list, value);
- }
- g_value_unset(value);
- if (list) {
- gst_structure_set_value(structure, "subbands", list);
- g_free(list);
- list = NULL;
- }
-
- /* blocks */
- value = g_value_init(value, G_TYPE_INT);
- list = g_value_init(g_new0(GValue, 1), GST_TYPE_LIST);
- if (sbc->block_length & BT_A2DP_BLOCK_LENGTH_16) {
- g_value_set_int(value, 16);
- gst_value_list_prepend_value(list, value);
- }
- if (sbc->block_length & BT_A2DP_BLOCK_LENGTH_12) {
- g_value_set_int(value, 12);
- gst_value_list_prepend_value(list, value);
- }
- if (sbc->block_length & BT_A2DP_BLOCK_LENGTH_8) {
- g_value_set_int(value, 8);
- gst_value_list_prepend_value(list, value);
- }
- if (sbc->block_length & BT_A2DP_BLOCK_LENGTH_4) {
- g_value_set_int(value, 4);
- gst_value_list_prepend_value(list, value);
- }
- g_value_unset(value);
- if (list) {
- gst_structure_set_value(structure, "blocks", list);
- g_free(list);
- list = NULL;
- }
-
- /* allocation */
- g_value_init(value, G_TYPE_STRING);
- list = g_value_init(g_new0(GValue,1), GST_TYPE_LIST);
- if (sbc->allocation_method & BT_A2DP_ALLOCATION_LOUDNESS) {
- g_value_set_static_string(value, "loudness");
- gst_value_list_prepend_value(list, value);
- }
- if (sbc->allocation_method & BT_A2DP_ALLOCATION_SNR) {
- g_value_set_static_string(value, "snr");
- gst_value_list_prepend_value(list, value);
- }
- g_value_unset(value);
- if (list) {
- gst_structure_set_value(structure, "allocation", list);
- g_free(list);
- list = NULL;
- }
-
- /* rate */
- g_value_init(value, G_TYPE_INT);
- list = g_value_init(g_new0(GValue, 1), GST_TYPE_LIST);
- if (sbc->frequency & BT_SBC_SAMPLING_FREQ_48000) {
- g_value_set_int(value, 48000);
- gst_value_list_prepend_value(list, value);
- }
- if (sbc->frequency & BT_SBC_SAMPLING_FREQ_44100) {
- g_value_set_int(value, 44100);
- gst_value_list_prepend_value(list, value);
- }
- if (sbc->frequency & BT_SBC_SAMPLING_FREQ_32000) {
- g_value_set_int(value, 32000);
- gst_value_list_prepend_value(list, value);
- }
- if (sbc->frequency & BT_SBC_SAMPLING_FREQ_16000) {
- g_value_set_int(value, 16000);
- gst_value_list_prepend_value(list, value);
- }
- g_value_unset(value);
- if (list) {
- gst_structure_set_value(structure, "rate", list);
- g_free(list);
- list = NULL;
- }
-
- /* bitpool */
- value = g_value_init(value, GST_TYPE_INT_RANGE);
- gst_value_set_int_range(value,
- MIN(sbc->min_bitpool, TEMPLATE_MAX_BITPOOL),
- MIN(sbc->max_bitpool, TEMPLATE_MAX_BITPOOL));
- gst_structure_set_value(structure, "bitpool", value);
- g_value_unset(value);
-
- /* channels */
- mono = FALSE;
- stereo = FALSE;
- if (sbc->channel_mode & BT_A2DP_CHANNEL_MODE_MONO)
- mono = TRUE;
- if ((sbc->channel_mode & BT_A2DP_CHANNEL_MODE_STEREO) ||
- (sbc->channel_mode &
- BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL) ||
- (sbc->channel_mode &
- BT_A2DP_CHANNEL_MODE_JOINT_STEREO))
- stereo = TRUE;
-
- if (mono && stereo) {
- g_value_init(value, GST_TYPE_INT_RANGE);
- gst_value_set_int_range(value, 1, 2);
- } else {
- g_value_init(value, G_TYPE_INT);
- if (mono)
- g_value_set_int(value, 1);
- else if (stereo)
- g_value_set_int(value, 2);
- else {
- GST_ERROR_OBJECT(self,
- "Unexpected number of channels");
- g_value_set_int(value, 0);
- }
- }
-
- gst_structure_set_value(structure, "channels", value);
- g_free(value);
-
- return structure;
-}
-
-static GstStructure *gst_avdtp_sink_parse_mpeg_caps(
- GstAvdtpSink *self, mpeg_capabilities_t *mpeg)
-{
- GstStructure *structure;
- GValue *value;
- GValue *list;
- gboolean valid_layer = FALSE;
- gboolean mono, stereo;
-
- if (!mpeg)
- return NULL;
-
- GST_LOG_OBJECT(self, "parsing mpeg caps");
-
- structure = gst_structure_empty_new("audio/mpeg");
- value = g_new0(GValue, 1);
- g_value_init(value, G_TYPE_INT);
-
- list = g_value_init(g_new0(GValue, 1), GST_TYPE_LIST);
- g_value_set_int(value, 1);
- gst_value_list_prepend_value(list, value);
- g_value_set_int(value, 2);
- gst_value_list_prepend_value(list, value);
- gst_structure_set_value(structure, "mpegversion", list);
- g_free(list);
-
- /* layer */
- GST_LOG_OBJECT(self, "setting mpeg layer");
- list = g_value_init(g_new0(GValue, 1), GST_TYPE_LIST);
- if (mpeg->layer & BT_MPEG_LAYER_1) {
- g_value_set_int(value, 1);
- gst_value_list_prepend_value(list, value);
- valid_layer = TRUE;
- }
- if (mpeg->layer & BT_MPEG_LAYER_2) {
- g_value_set_int(value, 2);
- gst_value_list_prepend_value(list, value);
- valid_layer = TRUE;
- }
- if (mpeg->layer & BT_MPEG_LAYER_3) {
- g_value_set_int(value, 3);
- gst_value_list_prepend_value(list, value);
- valid_layer = TRUE;
- }
- if (list) {
- gst_structure_set_value(structure, "layer", list);
- g_free(list);
- list = NULL;
- }
-
- if (!valid_layer) {
- gst_structure_free(structure);
- g_free(value);
- return NULL;
- }
+}
- /* rate */
- GST_LOG_OBJECT(self, "setting mpeg rate");
- list = g_value_init(g_new0(GValue, 1), GST_TYPE_LIST);
- if (mpeg->frequency & BT_MPEG_SAMPLING_FREQ_48000) {
- g_value_set_int(value, 48000);
- gst_value_list_prepend_value(list, value);
- }
- if (mpeg->frequency & BT_MPEG_SAMPLING_FREQ_44100) {
- g_value_set_int(value, 44100);
- gst_value_list_prepend_value(list, value);
- }
- if (mpeg->frequency & BT_MPEG_SAMPLING_FREQ_32000) {
- g_value_set_int(value, 32000);
- gst_value_list_prepend_value(list, value);
- }
- if (mpeg->frequency & BT_MPEG_SAMPLING_FREQ_24000) {
- g_value_set_int(value, 24000);
- gst_value_list_prepend_value(list, value);
- }
- if (mpeg->frequency & BT_MPEG_SAMPLING_FREQ_22050) {
- g_value_set_int(value, 22050);
- gst_value_list_prepend_value(list, value);
- }
- if (mpeg->frequency & BT_MPEG_SAMPLING_FREQ_16000) {
- g_value_set_int(value, 16000);
- gst_value_list_prepend_value(list, value);
- }
- g_value_unset(value);
- if (list) {
- gst_structure_set_value(structure, "rate", list);
- g_free(list);
- list = NULL;
- }
+static void gst_avdtp_sink_get_property(GObject *object, guint prop_id,
+ GValue *value, GParamSpec *pspec)
+{
+ GstAvdtpSink *sink = GST_AVDTP_SINK(object);
- /* channels */
- GST_LOG_OBJECT(self, "setting mpeg channels");
- mono = FALSE;
- stereo = FALSE;
- if (mpeg->channel_mode & BT_A2DP_CHANNEL_MODE_MONO)
- mono = TRUE;
- if ((mpeg->channel_mode & BT_A2DP_CHANNEL_MODE_STEREO) ||
- (mpeg->channel_mode &
- BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL) ||
- (mpeg->channel_mode &
- BT_A2DP_CHANNEL_MODE_JOINT_STEREO))
- stereo = TRUE;
+ switch (prop_id) {
+ case PROP_DEVICE:
+ g_value_set_string(value, sink->device);
+ break;
- if (mono && stereo) {
- g_value_init(value, GST_TYPE_INT_RANGE);
- gst_value_set_int_range(value, 1, 2);
- } else {
- g_value_init(value, G_TYPE_INT);
- if (mono)
- g_value_set_int(value, 1);
- else if (stereo)
- g_value_set_int(value, 2);
- else {
- GST_ERROR_OBJECT(self,
- "Unexpected number of channels");
- g_value_set_int(value, 0);
- }
- }
- gst_structure_set_value(structure, "channels", value);
- g_free(value);
+ case PROP_AUTOCONNECT:
+ g_value_set_boolean(value, sink->autoconnect);
+ break;
- return structure;
+ case PROP_TRANSPORT:
+ g_value_set_string(value, sink->transport);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+ break;
+ }
}
static GstStructure *gst_avdtp_sink_parse_sbc_raw(GstAvdtpSink *self)
@@ -795,19 +265,19 @@ static GstStructure *gst_avdtp_sink_parse_sbc_raw(GstAvdtpSink *self)
/* mode */
list = g_value_init(g_new0(GValue, 1), GST_TYPE_LIST);
- if (sbc->channel_mode & BT_A2DP_CHANNEL_MODE_MONO) {
+ if (sbc->channel_mode & SBC_CHANNEL_MODE_MONO) {
g_value_set_static_string(value, "mono");
gst_value_list_prepend_value(list, value);
}
- if (sbc->channel_mode & BT_A2DP_CHANNEL_MODE_STEREO) {
+ if (sbc->channel_mode & SBC_CHANNEL_MODE_STEREO) {
g_value_set_static_string(value, "stereo");
gst_value_list_prepend_value(list, value);
}
- if (sbc->channel_mode & BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL) {
+ if (sbc->channel_mode & SBC_CHANNEL_MODE_DUAL_CHANNEL) {
g_value_set_static_string(value, "dual");
gst_value_list_prepend_value(list, value);
}
- if (sbc->channel_mode & BT_A2DP_CHANNEL_MODE_JOINT_STEREO) {
+ if (sbc->channel_mode & SBC_CHANNEL_MODE_JOINT_STEREO) {
g_value_set_static_string(value, "joint");
gst_value_list_prepend_value(list, value);
}
@@ -821,11 +291,11 @@ static GstStructure *gst_avdtp_sink_parse_sbc_raw(GstAvdtpSink *self)
/* subbands */
list = g_value_init(g_new0(GValue, 1), GST_TYPE_LIST);
value = g_value_init(value, G_TYPE_INT);
- if (sbc->subbands & BT_A2DP_SUBBANDS_4) {
+ if (sbc->subbands & SBC_SUBBANDS_4) {
g_value_set_int(value, 4);
gst_value_list_prepend_value(list, value);
}
- if (sbc->subbands & BT_A2DP_SUBBANDS_8) {
+ if (sbc->subbands & SBC_SUBBANDS_8) {
g_value_set_int(value, 8);
gst_value_list_prepend_value(list, value);
}
@@ -839,19 +309,19 @@ static GstStructure *gst_avdtp_sink_parse_sbc_raw(GstAvdtpSink *self)
/* blocks */
value = g_value_init(value, G_TYPE_INT);
list = g_value_init(g_new0(GValue, 1), GST_TYPE_LIST);
- if (sbc->block_length & BT_A2DP_BLOCK_LENGTH_16) {
+ if (sbc->block_length & SBC_BLOCK_LENGTH_16) {
g_value_set_int(value, 16);
gst_value_list_prepend_value(list, value);
}
- if (sbc->block_length & BT_A2DP_BLOCK_LENGTH_12) {
+ if (sbc->block_length & SBC_BLOCK_LENGTH_12) {
g_value_set_int(value, 12);
gst_value_list_prepend_value(list, value);
}
- if (sbc->block_length & BT_A2DP_BLOCK_LENGTH_8) {
+ if (sbc->block_length & SBC_BLOCK_LENGTH_8) {
g_value_set_int(value, 8);
gst_value_list_prepend_value(list, value);
}
- if (sbc->block_length & BT_A2DP_BLOCK_LENGTH_4) {
+ if (sbc->block_length & SBC_BLOCK_LENGTH_4) {
g_value_set_int(value, 4);
gst_value_list_prepend_value(list, value);
}
@@ -865,11 +335,11 @@ static GstStructure *gst_avdtp_sink_parse_sbc_raw(GstAvdtpSink *self)
/* allocation */
g_value_init(value, G_TYPE_STRING);
list = g_value_init(g_new0(GValue,1), GST_TYPE_LIST);
- if (sbc->allocation_method & BT_A2DP_ALLOCATION_LOUDNESS) {
+ if (sbc->allocation_method & SBC_ALLOCATION_LOUDNESS) {
g_value_set_static_string(value, "loudness");
gst_value_list_prepend_value(list, value);
}
- if (sbc->allocation_method & BT_A2DP_ALLOCATION_SNR) {
+ if (sbc->allocation_method & SBC_ALLOCATION_SNR) {
g_value_set_static_string(value, "snr");
gst_value_list_prepend_value(list, value);
}
@@ -883,19 +353,19 @@ static GstStructure *gst_avdtp_sink_parse_sbc_raw(GstAvdtpSink *self)
/* rate */
g_value_init(value, G_TYPE_INT);
list = g_value_init(g_new0(GValue, 1), GST_TYPE_LIST);
- if (sbc->frequency & BT_SBC_SAMPLING_FREQ_48000) {
+ if (sbc->frequency & SBC_SAMPLING_FREQ_48000) {
g_value_set_int(value, 48000);
gst_value_list_prepend_value(list, value);
}
- if (sbc->frequency & BT_SBC_SAMPLING_FREQ_44100) {
+ if (sbc->frequency & SBC_SAMPLING_FREQ_44100) {
g_value_set_int(value, 44100);
gst_value_list_prepend_value(list, value);
}
- if (sbc->frequency & BT_SBC_SAMPLING_FREQ_32000) {
+ if (sbc->frequency & SBC_SAMPLING_FREQ_32000) {
g_value_set_int(value, 32000);
gst_value_list_prepend_value(list, value);
}
- if (sbc->frequency & BT_SBC_SAMPLING_FREQ_16000) {
+ if (sbc->frequency & SBC_SAMPLING_FREQ_16000) {
g_value_set_int(value, 16000);
gst_value_list_prepend_value(list, value);
}
@@ -917,13 +387,13 @@ static GstStructure *gst_avdtp_sink_parse_sbc_raw(GstAvdtpSink *self)
/* channels */
mono = FALSE;
stereo = FALSE;
- if (sbc->channel_mode & BT_A2DP_CHANNEL_MODE_MONO)
+ if (sbc->channel_mode & SBC_CHANNEL_MODE_MONO)
mono = TRUE;
- if ((sbc->channel_mode & BT_A2DP_CHANNEL_MODE_STEREO) ||
+ if ((sbc->channel_mode & SBC_CHANNEL_MODE_STEREO) ||
(sbc->channel_mode &
- BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL) ||
+ SBC_CHANNEL_MODE_DUAL_CHANNEL) ||
(sbc->channel_mode &
- BT_A2DP_CHANNEL_MODE_JOINT_STEREO))
+ SBC_CHANNEL_MODE_JOINT_STEREO))
stereo = TRUE;
if (mono && stereo) {
@@ -974,17 +444,17 @@ static GstStructure *gst_avdtp_sink_parse_mpeg_raw(GstAvdtpSink *self)
/* layer */
GST_LOG_OBJECT(self, "setting mpeg layer");
list = g_value_init(g_new0(GValue, 1), GST_TYPE_LIST);
- if (mpeg->layer & BT_MPEG_LAYER_1) {
+ if (mpeg->layer & MPEG_LAYER_MP1) {
g_value_set_int(value, 1);
gst_value_list_prepend_value(list, value);
valid_layer = TRUE;
}
- if (mpeg->layer & BT_MPEG_LAYER_2) {
+ if (mpeg->layer & MPEG_LAYER_MP2) {
g_value_set_int(value, 2);
gst_value_list_prepend_value(list, value);
valid_layer = TRUE;
}
- if (mpeg->layer & BT_MPEG_LAYER_3) {
+ if (mpeg->layer & MPEG_LAYER_MP3) {
g_value_set_int(value, 3);
gst_value_list_prepend_value(list, value);
valid_layer = TRUE;
@@ -1004,27 +474,27 @@ static GstStructure *gst_avdtp_sink_parse_mpeg_raw(GstAvdtpSink *self)
/* rate */
GST_LOG_OBJECT(self, "setting mpeg rate");
list = g_value_init(g_new0(GValue, 1), GST_TYPE_LIST);
- if (mpeg->frequency & BT_MPEG_SAMPLING_FREQ_48000) {
+ if (mpeg->frequency & MPEG_SAMPLING_FREQ_48000) {
g_value_set_int(value, 48000);
gst_value_list_prepend_value(list, value);
}
- if (mpeg->frequency & BT_MPEG_SAMPLING_FREQ_44100) {
+ if (mpeg->frequency & MPEG_SAMPLING_FREQ_44100) {
g_value_set_int(value, 44100);
gst_value_list_prepend_value(list, value);
}
- if (mpeg->frequency & BT_MPEG_SAMPLING_FREQ_32000) {
+ if (mpeg->frequency & MPEG_SAMPLING_FREQ_32000) {
g_value_set_int(value, 32000);
gst_value_list_prepend_value(list, value);
}
- if (mpeg->frequency & BT_MPEG_SAMPLING_FREQ_24000) {
+ if (mpeg->frequency & MPEG_SAMPLING_FREQ_24000) {
g_value_set_int(value, 24000);
gst_value_list_prepend_value(list, value);
}
- if (mpeg->frequency & BT_MPEG_SAMPLING_FREQ_22050) {
+ if (mpeg->frequency & MPEG_SAMPLING_FREQ_22050) {
g_value_set_int(value, 22050);
gst_value_list_prepend_value(list, value);
}
- if (mpeg->frequency & BT_MPEG_SAMPLING_FREQ_16000) {
+ if (mpeg->frequency & MPEG_SAMPLING_FREQ_16000) {
g_value_set_int(value, 16000);
gst_value_list_prepend_value(list, value);
}
@@ -1039,13 +509,13 @@ static GstStructure *gst_avdtp_sink_parse_mpeg_raw(GstAvdtpSink *self)
GST_LOG_OBJECT(self, "setting mpeg channels");
mono = FALSE;
stereo = FALSE;
- if (mpeg->channel_mode & BT_A2DP_CHANNEL_MODE_MONO)
+ if (mpeg->channel_mode & MPEG_CHANNEL_MODE_MONO)
mono = TRUE;
- if ((mpeg->channel_mode & BT_A2DP_CHANNEL_MODE_STEREO) ||
+ if ((mpeg->channel_mode & MPEG_CHANNEL_MODE_STEREO) ||
(mpeg->channel_mode &
- BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL) ||
+ MPEG_CHANNEL_MODE_DUAL_CHANNEL) ||
(mpeg->channel_mode &
- BT_A2DP_CHANNEL_MODE_JOINT_STEREO))
+ MPEG_CHANNEL_MODE_JOINT_STEREO))
stereo = TRUE;
if (mono && stereo) {
@@ -1103,94 +573,24 @@ static gboolean gst_avdtp_sink_update_config(GstAvdtpSink *self)
static gboolean gst_avdtp_sink_update_caps(GstAvdtpSink *self)
{
- sbc_capabilities_t *sbc;
- mpeg_capabilities_t *mpeg;
- GstStructure *sbc_structure;
- GstStructure *mpeg_structure;
- gchar *tmp;
-
GST_LOG_OBJECT(self, "updating device caps");
- if (self->data->config_size != 0 && self->data->config != NULL)
- return gst_avdtp_sink_update_config(self);
-
- sbc = (void *) gst_avdtp_find_caps(self, BT_A2DP_SBC_SINK);
- mpeg = (void *) gst_avdtp_find_caps(self, BT_A2DP_MPEG12_SINK);
-
- if (!sbc) {
- GST_ERROR_OBJECT(self, "Failed to find mandatory SBC sink");
- return FALSE;
- }
-
- sbc_structure = gst_avdtp_sink_parse_sbc_caps(self, sbc);
- mpeg_structure = gst_avdtp_sink_parse_mpeg_caps(self, mpeg);
-
- if (self->dev_caps != NULL)
- gst_caps_unref(self->dev_caps);
- self->dev_caps = gst_caps_new_full(sbc_structure, NULL);
- if (mpeg_structure != NULL)
- gst_caps_append_structure(self->dev_caps, mpeg_structure);
-
- tmp = gst_caps_to_string(self->dev_caps);
- GST_DEBUG_OBJECT(self, "Device capabilities: %s", tmp);
- g_free(tmp);
-
- return TRUE;
-}
-
-static gboolean gst_avdtp_sink_get_capabilities(GstAvdtpSink *self)
-{
- gchar buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_get_capabilities_req *req = (void *) buf;
- struct bt_get_capabilities_rsp *rsp = (void *) buf;
- int err;
-
- memset(req, 0, BT_SUGGESTED_BUFFER_SIZE);
-
- req->h.type = BT_REQUEST;
- req->h.name = BT_GET_CAPABILITIES;
- req->h.length = sizeof(*req);
-
- if (self->device == NULL)
- return FALSE;
- strncpy(req->destination, self->device, 18);
- if (self->autoconnect)
- req->flags |= BT_FLAG_AUTOCONNECT;
-
- err = gst_avdtp_sink_audioservice_send(self, &req->h);
- if (err < 0) {
- GST_ERROR_OBJECT(self, "Error while asking device caps");
+ if (self->data->config_size == 0 || self->data->config == NULL)
return FALSE;
- }
-
- rsp->h.length = 0;
- err = gst_avdtp_sink_audioservice_expect(self,
- &rsp->h, BT_GET_CAPABILITIES);
- if (err < 0) {
- GST_ERROR_OBJECT(self, "Error while getting device caps");
- return FALSE;
- }
- self->data->caps = g_malloc0(rsp->h.length);
- memcpy(self->data->caps, rsp, rsp->h.length);
- if (!gst_avdtp_sink_update_caps(self)) {
- GST_WARNING_OBJECT(self, "failed to update capabilities");
- return FALSE;
- }
-
- return TRUE;
+ return gst_avdtp_sink_update_config(self);
}
static gint gst_avdtp_sink_get_channel_mode(const gchar *mode)
{
if (strcmp(mode, "stereo") == 0)
- return BT_A2DP_CHANNEL_MODE_STEREO;
+ return SBC_CHANNEL_MODE_STEREO;
else if (strcmp(mode, "joint-stereo") == 0)
- return BT_A2DP_CHANNEL_MODE_JOINT_STEREO;
+ return SBC_CHANNEL_MODE_JOINT_STEREO;
else if (strcmp(mode, "dual-channel") == 0)
- return BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL;
+ return SBC_CHANNEL_MODE_DUAL_CHANNEL;
else if (strcmp(mode, "mono") == 0)
- return BT_A2DP_CHANNEL_MODE_MONO;
+ return SBC_CHANNEL_MODE_MONO;
else
return -1;
}
@@ -1433,8 +833,6 @@ fail:
static gboolean gst_avdtp_sink_start(GstBaseSink *basesink)
{
GstAvdtpSink *self = GST_AVDTP_SINK(basesink);
- gint sk;
- gint err;
GST_INFO_OBJECT(self, "start");
@@ -1445,258 +843,71 @@ static gboolean gst_avdtp_sink_start(GstBaseSink *basesink)
self->mp3_using_crc = -1;
self->channel_mode = -1;
- if (self->transport != NULL)
- return gst_avdtp_sink_transport_get_properties(self);
-
- self->watch_id = 0;
-
- sk = bt_audio_service_open();
- if (sk < 0) {
- err = -errno;
- GST_ERROR_OBJECT(self, "Cannot open connection to bt "
- "audio service: %s %d", strerror(-err), -err);
- return FALSE;
- }
-
- self->server = g_io_channel_unix_new(sk);
- g_io_channel_set_encoding(self->server, NULL, NULL);
- self->watch_id = g_io_add_watch(self->server, G_IO_HUP | G_IO_ERR |
- G_IO_NVAL, server_callback, self);
-
- if (!gst_avdtp_sink_get_capabilities(self)) {
- GST_ERROR_OBJECT(self, "failed to get capabilities "
- "from device");
- goto failed;
- }
-
- return TRUE;
-
-failed:
- bt_audio_service_close(sk);
- return FALSE;
-}
-
-static gboolean gst_avdtp_sink_stream_start(GstAvdtpSink *self)
-{
- gchar buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_start_stream_req *req = (void *) buf;
- struct bt_start_stream_rsp *rsp = (void *) buf;
- struct bt_new_stream_ind *ind = (void *) buf;
- int err;
-
- if (self->transport != NULL)
- return gst_avdtp_sink_conf_recv_stream_fd(self);
-
- memset(req, 0, sizeof(buf));
- req->h.type = BT_REQUEST;
- req->h.name = BT_START_STREAM;
- req->h.length = sizeof(*req);
-
- err = gst_avdtp_sink_audioservice_send(self, &req->h);
- if (err < 0) {
- GST_ERROR_OBJECT(self, "Error occurred while sending "
- "start packet");
- return FALSE;
- }
-
- rsp->h.length = sizeof(*rsp);
- err = gst_avdtp_sink_audioservice_expect(self, &rsp->h,
- BT_START_STREAM);
- if (err < 0) {
- GST_ERROR_OBJECT(self, "Error while stream "
- "start confirmation");
- return FALSE;
- }
-
- ind->h.length = sizeof(*ind);
- err = gst_avdtp_sink_audioservice_expect(self, &ind->h,
- BT_NEW_STREAM);
- if (err < 0) {
- GST_ERROR_OBJECT(self, "Error while receiving "
- "stream filedescriptor");
- return FALSE;
- }
-
- if (!gst_avdtp_sink_conf_recv_stream_fd(self))
- return FALSE;
-
- return TRUE;
-}
-
-static gboolean gst_avdtp_sink_init_mp3_pkt_conf(
- GstAvdtpSink *self, GstCaps *caps,
- mpeg_capabilities_t *pkt)
-{
- const GValue *value = NULL;
- gint rate, layer;
- const gchar *name;
- GstStructure *structure = gst_caps_get_structure(caps, 0);
-
- name = gst_structure_get_name(structure);
-
- if (!(IS_MPEG_AUDIO(name))) {
- GST_ERROR_OBJECT(self, "Unexpected format %s, "
- "was expecting mp3", name);
- return FALSE;
- }
-
- /* layer */
- value = gst_structure_get_value(structure, "layer");
- layer = g_value_get_int(value);
- if (layer == 1)
- pkt->layer = BT_MPEG_LAYER_1;
- else if (layer == 2)
- pkt->layer = BT_MPEG_LAYER_2;
- else if (layer == 3)
- pkt->layer = BT_MPEG_LAYER_3;
- else {
- GST_ERROR_OBJECT(self, "Unexpected layer: %d", layer);
- return FALSE;
- }
-
- /* crc */
- if (self->mp3_using_crc != -1)
- pkt->crc = self->mp3_using_crc;
- else {
- GST_ERROR_OBJECT(self, "No info about crc was received, "
- " can't proceed");
- return FALSE;
- }
-
- /* channel mode */
- if (self->channel_mode != -1)
- pkt->channel_mode = self->channel_mode;
- else {
- GST_ERROR_OBJECT(self, "No info about channel mode "
- "received, can't proceed");
- return FALSE;
- }
-
- /* mpf - we will only use the mandatory one */
- pkt->mpf = 0;
-
- value = gst_structure_get_value(structure, "rate");
- rate = g_value_get_int(value);
- if (rate == 44100)
- pkt->frequency = BT_MPEG_SAMPLING_FREQ_44100;
- else if (rate == 48000)
- pkt->frequency = BT_MPEG_SAMPLING_FREQ_48000;
- else if (rate == 32000)
- pkt->frequency = BT_MPEG_SAMPLING_FREQ_32000;
- else if (rate == 24000)
- pkt->frequency = BT_MPEG_SAMPLING_FREQ_24000;
- else if (rate == 22050)
- pkt->frequency = BT_MPEG_SAMPLING_FREQ_22050;
- else if (rate == 16000)
- pkt->frequency = BT_MPEG_SAMPLING_FREQ_16000;
- else {
- GST_ERROR_OBJECT(self, "Invalid rate while setting caps");
+ if (self->transport == NULL)
return FALSE;
- }
- /* vbr - we always say its vbr, we don't have how to know it */
- pkt->bitrate = 0x8000;
-
- return TRUE;
+ return gst_avdtp_sink_transport_get_properties(self);
}
-static gboolean gst_avdtp_sink_configure(GstAvdtpSink *self,
- GstCaps *caps)
+static gboolean gst_avdtp_sink_conf_recv_stream_fd(GstAvdtpSink *self)
{
- gchar buf[BT_SUGGESTED_BUFFER_SIZE];
- struct bt_open_req *open_req = (void *) buf;
- struct bt_open_rsp *open_rsp = (void *) buf;
- struct bt_set_configuration_req *req = (void *) buf;
- struct bt_set_configuration_rsp *rsp = (void *) buf;
- gboolean ret;
- gchar *temp;
- GstStructure *structure;
- codec_capabilities_t *codec = NULL;
- int err;
-
- temp = gst_caps_to_string(caps);
- GST_DEBUG_OBJECT(self, "configuring device with caps: %s", temp);
- g_free(temp);
-
- /* Transport already configured */
- if (self->transport != NULL)
- return TRUE;
-
- structure = gst_caps_get_structure(caps, 0);
-
- if (gst_structure_has_name(structure, "audio/x-sbc"))
- codec = (void *) gst_avdtp_find_caps(self, BT_A2DP_SBC_SINK);
- else if (gst_structure_has_name(structure, "audio/mpeg"))
- codec = (void *) gst_avdtp_find_caps(self, BT_A2DP_MPEG12_SINK);
-
- if (codec == NULL) {
- GST_ERROR_OBJECT(self, "Couldn't parse caps "
- "to packet configuration");
- return FALSE;
- }
-
- memset(req, 0, BT_SUGGESTED_BUFFER_SIZE);
- open_req->h.type = BT_REQUEST;
- open_req->h.name = BT_OPEN;
- open_req->h.length = sizeof(*open_req);
-
- strncpy(open_req->destination, self->device, 18);
- open_req->seid = codec->seid;
- open_req->lock = BT_WRITE_LOCK;
+ struct bluetooth_data *data = self->data;
+ GError *gerr = NULL;
+ GIOStatus status;
+ GIOFlags flags;
+ int fd;
- err = gst_avdtp_sink_audioservice_send(self, &open_req->h);
- if (err < 0) {
- GST_ERROR_OBJECT(self, "Error occurred while sending "
- "open packet");
+ /* Proceed if stream was already acquired */
+ if (self->stream == NULL) {
+ GST_ERROR_OBJECT(self, "Error while configuring device: "
+ "could not acquire audio socket");
return FALSE;
}
- open_rsp->h.length = sizeof(*open_rsp);
- err = gst_avdtp_sink_audioservice_expect(self, &open_rsp->h,
- BT_OPEN);
- if (err < 0) {
- GST_ERROR_OBJECT(self, "Error while receiving device "
- "confirmation");
- return FALSE;
+ /* set stream socket to nonblock */
+ GST_LOG_OBJECT(self, "setting stream socket to nonblock");
+ flags = g_io_channel_get_flags(self->stream);
+ flags |= G_IO_FLAG_NONBLOCK;
+ status = g_io_channel_set_flags(self->stream, flags, &gerr);
+ if (status != G_IO_STATUS_NORMAL) {
+ if (gerr)
+ GST_WARNING_OBJECT(self, "Error while "
+ "setting server socket to nonblock: "
+ "%s", gerr->message);
+ else
+ GST_WARNING_OBJECT(self, "Error while "
+ "setting server "
+ "socket to nonblock");
}
- memset(req, 0, sizeof(buf));
- req->h.type = BT_REQUEST;
- req->h.name = BT_SET_CONFIGURATION;
- req->h.length = sizeof(*req);
- memcpy(&req->codec, codec, sizeof(req->codec));
-
- if (codec->type == BT_A2DP_SBC_SINK)
- ret = gst_avdtp_sink_init_sbc_pkt_conf(self, caps,
- (void *) &req->codec);
- else
- ret = gst_avdtp_sink_init_mp3_pkt_conf(self, caps,
- (void *) &req->codec);
-
- if (!ret) {
- GST_ERROR_OBJECT(self, "Couldn't parse caps "
- "to packet configuration");
- return FALSE;
- }
+ fd = g_io_channel_unix_get_fd(self->stream);
- req->h.length += req->codec.length - sizeof(req->codec);
- err = gst_avdtp_sink_audioservice_send(self, &req->h);
- if (err < 0) {
- GST_ERROR_OBJECT(self, "Error occurred while sending "
- "configurarion packet");
- return FALSE;
+ /* It is possible there is some outstanding
+ data in the pipe - we have to empty it */
+ GST_LOG_OBJECT(self, "emptying stream pipe");
+ while (1) {
+ ssize_t bread = read(fd, data->buffer, data->link_mtu);
+ if (bread <= 0)
+ break;
}
- rsp->h.length = sizeof(*rsp);
- err = gst_avdtp_sink_audioservice_expect(self, &rsp->h,
- BT_SET_CONFIGURATION);
- if (err < 0) {
- GST_ERROR_OBJECT(self, "Error while receiving device "
- "confirmation");
- return FALSE;
+ /* set stream socket to block */
+ GST_LOG_OBJECT(self, "setting stream socket to block");
+ flags = g_io_channel_get_flags(self->stream);
+ flags &= ~G_IO_FLAG_NONBLOCK;
+ status = g_io_channel_set_flags(self->stream, flags, &gerr);
+ if (status != G_IO_STATUS_NORMAL) {
+ if (gerr)
+ GST_WARNING_OBJECT(self, "Error while "
+ "setting server socket to block:"
+ "%s", gerr->message);
+ else
+ GST_WARNING_OBJECT(self, "Error while "
+ "setting server "
+ "socket to block");
}
- self->data->link_mtu = rsp->link_mtu;
+ memset(data->buffer, 0, sizeof(data->buffer));
return TRUE;
}
@@ -1709,7 +920,7 @@ static GstFlowReturn gst_avdtp_sink_preroll(GstBaseSink *basesink,
GST_AVDTP_SINK_MUTEX_LOCK(sink);
- ret = gst_avdtp_sink_stream_start(sink);
+ ret = gst_avdtp_sink_conf_recv_stream_fd(sink);
GST_AVDTP_SINK_MUTEX_UNLOCK(sink);
@@ -1838,101 +1049,6 @@ static void gst_avdtp_sink_init(GstAvdtpSink *self,
*/
}
-static int gst_avdtp_sink_audioservice_send(GstAvdtpSink *self,
- const bt_audio_msg_header_t *msg)
-{
- ssize_t written;
- const char *type, *name;
- uint16_t length;
- int fd, err;
-
- length = msg->length ? msg->length : BT_SUGGESTED_BUFFER_SIZE;
-
- fd = g_io_channel_unix_get_fd(self->server);
-
- written = write(fd, msg, length);
- if (written < 0) {
- err = -errno;
- GST_ERROR_OBJECT(self, "Error sending data to audio service:"
- " %s", strerror(-err));
- return err;
- }
-
- type = bt_audio_strtype(msg->type);
- name = bt_audio_strname(msg->name);
-
- GST_DEBUG_OBJECT(self, "sent: %s -> %s", type, name);
-
- return 0;
-}
-
-static int gst_avdtp_sink_audioservice_recv(GstAvdtpSink *self,
- bt_audio_msg_header_t *inmsg)
-{
- ssize_t bytes_read;
- const char *type, *name;
- uint16_t length;
- int fd, err = 0;
-
- length = inmsg->length ? inmsg->length : BT_SUGGESTED_BUFFER_SIZE;
-
- fd = g_io_channel_unix_get_fd(self->server);
-
- bytes_read = read(fd, inmsg, length);
- if (bytes_read < 0) {
- err = -errno;
- GST_ERROR_OBJECT(self, "Error receiving data from "
- "audio service: %s", strerror(-err));
- return err;
- }
-
- type = bt_audio_strtype(inmsg->type);
- if (!type) {
- err = -EINVAL;
- GST_ERROR_OBJECT(self, "Bogus message type %d "
- "received from audio service",
- inmsg->type);
- }
-
- name = bt_audio_strname(inmsg->name);
- if (!name) {
- err = -EINVAL;
- GST_ERROR_OBJECT(self, "Bogus message name %d "
- "received from audio service",
- inmsg->name);
- }
-
- if (inmsg->type == BT_ERROR) {
- bt_audio_error_t *msg = (void *) inmsg;
- err = -EINVAL;
- GST_ERROR_OBJECT(self, "%s failed : "
- "%s(%d)",
- name,
- strerror(msg->posix_errno),
- msg->posix_errno);
- }
-
- GST_DEBUG_OBJECT(self, "received: %s <- %s", type, name);
-
- return err;
-}
-
-static int gst_avdtp_sink_audioservice_expect(GstAvdtpSink *self,
- bt_audio_msg_header_t *outmsg,
- guint8 expected_name)
-{
- int err;
-
- err = gst_avdtp_sink_audioservice_recv(self, outmsg);
- if (err < 0)
- return err;
-
- if (outmsg->name != expected_name)
- return -EINVAL;
-
- return 0;
-}
-
gboolean gst_avdtp_sink_plugin_init(GstPlugin *plugin)
{
return gst_element_register(plugin, "avdtpsink", GST_RANK_NONE,
@@ -1952,11 +1068,8 @@ GstCaps *gst_avdtp_sink_get_device_caps(GstAvdtpSink *sink)
gboolean gst_avdtp_sink_set_device_caps(GstAvdtpSink *self,
GstCaps *caps)
{
- gboolean ret;
-
GST_DEBUG_OBJECT(self, "setting device caps");
GST_AVDTP_SINK_MUTEX_LOCK(self);
- ret = gst_avdtp_sink_configure(self, caps);
if (self->stream_caps)
gst_caps_unref(self->stream_caps);
@@ -1964,7 +1077,7 @@ gboolean gst_avdtp_sink_set_device_caps(GstAvdtpSink *self,
GST_AVDTP_SINK_MUTEX_UNLOCK(self);
- return ret;
+ return TRUE;
}
guint gst_avdtp_sink_get_link_mtu(GstAvdtpSink *sink)
diff --git a/audio/gstavdtpsink.h b/audio/gstavdtpsink.h
index c4e5645..eb998ac 100644
--- a/audio/gstavdtpsink.h
+++ b/audio/gstavdtpsink.h
@@ -56,7 +56,6 @@ struct _GstAvdtpSink {
struct bluetooth_data *data;
gboolean autoconnect;
- GIOChannel *server;
/* mp3 stream data (outside caps data)*/
gint mp3_using_crc;
diff --git a/audio/ipc.c b/audio/ipc.c
deleted file mode 100644
index 02d956b..0000000
--- a/audio/ipc.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- *
- * BlueZ - Bluetooth protocol stack for Linux
- *
- * Copyright (C) 2004-2010 Marcel Holtmann <marcel@holtmann.org>
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-#include "ipc.h"
-
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-
-/* This table contains the string representation for messages types */
-static const char *strtypes[] = {
- "BT_REQUEST",
- "BT_RESPONSE",
- "BT_INDICATION",
- "BT_ERROR",
-};
-
-/* This table contains the string representation for messages names */
-static const char *strnames[] = {
- "BT_GET_CAPABILITIES",
- "BT_OPEN",
- "BT_SET_CONFIGURATION",
- "BT_NEW_STREAM",
- "BT_START_STREAM",
- "BT_STOP_STREAM",
- "BT_SUSPEND_STREAM",
- "BT_RESUME_STREAM",
- "BT_CONTROL",
-};
-
-int bt_audio_service_open(void)
-{
- int sk;
- int err;
- struct sockaddr_un addr = {
- AF_UNIX, BT_IPC_SOCKET_NAME
- };
-
- sk = socket(PF_LOCAL, SOCK_STREAM, 0);
- if (sk < 0) {
- err = -errno;
- fprintf(stderr, "%s: Cannot open socket: %s (%d)\n",
- __FUNCTION__, strerror(-err), -err);
- errno = -err;
- return -1;
- }
-
- if (connect(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- err = -errno;
- fprintf(stderr, "%s: connect() failed: %s (%d)\n",
- __FUNCTION__, strerror(-err), -err);
- close(sk);
- errno = -err;
- return -1;
- }
-
- return sk;
-}
-
-int bt_audio_service_close(int sk)
-{
- return close(sk);
-}
-
-int bt_audio_service_get_data_fd(int sk)
-{
- char cmsg_b[CMSG_SPACE(sizeof(int))], m;
- int err, ret;
- struct iovec iov = { &m, sizeof(m) };
- struct msghdr msgh;
- struct cmsghdr *cmsg;
-
- memset(&msgh, 0, sizeof(msgh));
- msgh.msg_iov = &iov;
- msgh.msg_iovlen = 1;
- msgh.msg_control = &cmsg_b;
- msgh.msg_controllen = CMSG_LEN(sizeof(int));
-
- ret = recvmsg(sk, &msgh, 0);
- if (ret < 0) {
- err = -errno;
- fprintf(stderr, "%s: Unable to receive fd: %s (%d)\n",
- __FUNCTION__, strerror(-err), -err);
- errno = -err;
- return -1;
- }
-
- /* Receive auxiliary data in msgh */
- for (cmsg = CMSG_FIRSTHDR(&msgh); cmsg != NULL;
- cmsg = CMSG_NXTHDR(&msgh, cmsg)) {
- if (cmsg->cmsg_level == SOL_SOCKET
- && cmsg->cmsg_type == SCM_RIGHTS) {
- memcpy(&ret, CMSG_DATA(cmsg), sizeof(int));
- return ret;
- }
- }
-
- errno = EINVAL;
- return -1;
-}
-
-const char *bt_audio_strtype(uint8_t type)
-{
- if (type >= ARRAY_SIZE(strtypes))
- return NULL;
-
- return strtypes[type];
-}
-
-const char *bt_audio_strname(uint8_t name)
-{
- if (name >= ARRAY_SIZE(strnames))
- return NULL;
-
- return strnames[name];
-}
diff --git a/audio/ipc.h b/audio/ipc.h
deleted file mode 100644
index 61ae019..0000000
--- a/audio/ipc.h
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- *
- * BlueZ - Bluetooth protocol stack for Linux
- *
- * Copyright (C) 2004-2010 Marcel Holtmann <marcel@holtmann.org>
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-/*
- Message sequence chart of streaming sequence for A2DP transport
-
- Audio daemon User
- on snd_pcm_open
- <--BT_GET_CAPABILITIES_REQ
-
- BT_GET_CAPABILITIES_RSP-->
-
- on snd_pcm_hw_params
- <--BT_SETCONFIGURATION_REQ
-
- BT_SET_CONFIGURATION_RSP-->
-
- on snd_pcm_prepare
- <--BT_START_STREAM_REQ
-
- <Moves to streaming state>
- BT_START_STREAM_RSP-->
-
- BT_NEW_STREAM_IND -->
-
- < streams data >
- ..........
-
- on snd_pcm_drop/snd_pcm_drain
-
- <--BT_STOP_STREAM_REQ
-
- <Moves to open state>
- BT_STOP_STREAM_RSP-->
-
- on IPC close or appl crash
- <Moves to idle>
-
- */
-
-#ifndef BT_AUDIOCLIENT_H
-#define BT_AUDIOCLIENT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <errno.h>
-
-#define BT_SUGGESTED_BUFFER_SIZE 512
-#define BT_IPC_SOCKET_NAME "\0/org/bluez/audio"
-
-/* Generic message header definition, except for RESPONSE messages */
-typedef struct {
- uint8_t type;
- uint8_t name;
- uint16_t length;
-} __attribute__ ((packed)) bt_audio_msg_header_t;
-
-typedef struct {
- bt_audio_msg_header_t h;
- uint8_t posix_errno;
-} __attribute__ ((packed)) bt_audio_error_t;
-
-/* Message types */
-#define BT_REQUEST 0
-#define BT_RESPONSE 1
-#define BT_INDICATION 2
-#define BT_ERROR 3
-
-/* Messages names */
-#define BT_GET_CAPABILITIES 0
-#define BT_OPEN 1
-#define BT_SET_CONFIGURATION 2
-#define BT_NEW_STREAM 3
-#define BT_START_STREAM 4
-#define BT_STOP_STREAM 5
-#define BT_CLOSE 6
-#define BT_CONTROL 7
-#define BT_DELAY_REPORT 8
-
-#define BT_CAPABILITIES_TRANSPORT_A2DP 0
-#define BT_CAPABILITIES_TRANSPORT_SCO 1
-#define BT_CAPABILITIES_TRANSPORT_ANY 2
-
-#define BT_CAPABILITIES_ACCESS_MODE_READ 1
-#define BT_CAPABILITIES_ACCESS_MODE_WRITE 2
-#define BT_CAPABILITIES_ACCESS_MODE_READWRITE 3
-
-#define BT_FLAG_AUTOCONNECT 1
-
-struct bt_get_capabilities_req {
- bt_audio_msg_header_t h;
- char source[18]; /* Address of the local Device */
- char destination[18];/* Address of the remote Device */
- char object[128]; /* DBus object path */
- uint8_t transport; /* Requested transport */
- uint8_t flags; /* Requested flags */
- uint8_t seid; /* Requested capability configuration */
-} __attribute__ ((packed));
-
-/**
- * SBC Codec parameters as per A2DP profile 1.0 § 4.3
- */
-
-/* A2DP seid are 6 bytes long so HSP/HFP are assigned to 7-8 bits */
-#define BT_A2DP_SEID_RANGE (1 << 6) - 1
-
-#define BT_A2DP_SBC_SOURCE 0x00
-#define BT_A2DP_SBC_SINK 0x01
-#define BT_A2DP_MPEG12_SOURCE 0x02
-#define BT_A2DP_MPEG12_SINK 0x03
-#define BT_A2DP_MPEG24_SOURCE 0x04
-#define BT_A2DP_MPEG24_SINK 0x05
-#define BT_A2DP_ATRAC_SOURCE 0x06
-#define BT_A2DP_ATRAC_SINK 0x07
-#define BT_A2DP_UNKNOWN_SOURCE 0x08
-#define BT_A2DP_UNKNOWN_SINK 0x09
-
-#define BT_SBC_SAMPLING_FREQ_16000 (1 << 3)
-#define BT_SBC_SAMPLING_FREQ_32000 (1 << 2)
-#define BT_SBC_SAMPLING_FREQ_44100 (1 << 1)
-#define BT_SBC_SAMPLING_FREQ_48000 1
-
-#define BT_A2DP_CHANNEL_MODE_MONO (1 << 3)
-#define BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL (1 << 2)
-#define BT_A2DP_CHANNEL_MODE_STEREO (1 << 1)
-#define BT_A2DP_CHANNEL_MODE_JOINT_STEREO 1
-
-#define BT_A2DP_BLOCK_LENGTH_4 (1 << 3)
-#define BT_A2DP_BLOCK_LENGTH_8 (1 << 2)
-#define BT_A2DP_BLOCK_LENGTH_12 (1 << 1)
-#define BT_A2DP_BLOCK_LENGTH_16 1
-
-#define BT_A2DP_SUBBANDS_4 (1 << 1)
-#define BT_A2DP_SUBBANDS_8 1
-
-#define BT_A2DP_ALLOCATION_SNR (1 << 1)
-#define BT_A2DP_ALLOCATION_LOUDNESS 1
-
-#define BT_MPEG_SAMPLING_FREQ_16000 (1 << 5)
-#define BT_MPEG_SAMPLING_FREQ_22050 (1 << 4)
-#define BT_MPEG_SAMPLING_FREQ_24000 (1 << 3)
-#define BT_MPEG_SAMPLING_FREQ_32000 (1 << 2)
-#define BT_MPEG_SAMPLING_FREQ_44100 (1 << 1)
-#define BT_MPEG_SAMPLING_FREQ_48000 1
-
-#define BT_MPEG_LAYER_1 (1 << 2)
-#define BT_MPEG_LAYER_2 (1 << 1)
-#define BT_MPEG_LAYER_3 1
-
-#define BT_HFP_CODEC_PCM 0x00
-
-#define BT_PCM_FLAG_NREC 0x01
-#define BT_PCM_FLAG_PCM_ROUTING 0x02
-
-#define BT_WRITE_LOCK (1 << 1)
-#define BT_READ_LOCK 1
-
-typedef struct {
- uint8_t seid;
- uint8_t transport;
- uint8_t type;
- uint8_t length;
- uint8_t configured;
- uint8_t lock;
- uint8_t data[0];
-} __attribute__ ((packed)) codec_capabilities_t;
-
-typedef struct {
- codec_capabilities_t capability;
- uint8_t channel_mode;
- uint8_t frequency;
- uint8_t allocation_method;
- uint8_t subbands;
- uint8_t block_length;
- uint8_t min_bitpool;
- uint8_t max_bitpool;
-} __attribute__ ((packed)) sbc_capabilities_t;
-
-typedef struct {
- codec_capabilities_t capability;
- uint8_t channel_mode;
- uint8_t crc;
- uint8_t layer;
- uint8_t frequency;
- uint8_t mpf;
- uint16_t bitrate;
-} __attribute__ ((packed)) mpeg_capabilities_t;
-
-typedef struct {
- codec_capabilities_t capability;
- uint8_t flags;
- uint16_t sampling_rate;
-} __attribute__ ((packed)) pcm_capabilities_t;
-
-struct bt_get_capabilities_rsp {
- bt_audio_msg_header_t h;
- char source[18]; /* Address of the local Device */
- char destination[18];/* Address of the remote Device */
- char object[128]; /* DBus object path */
- uint8_t data[0]; /* First codec_capabilities_t */
-} __attribute__ ((packed));
-
-struct bt_open_req {
- bt_audio_msg_header_t h;
- char source[18]; /* Address of the local Device */
- char destination[18];/* Address of the remote Device */
- char object[128]; /* DBus object path */
- uint8_t seid; /* Requested capability configuration to lock */
- uint8_t lock; /* Requested lock */
-} __attribute__ ((packed));
-
-struct bt_open_rsp {
- bt_audio_msg_header_t h;
- char source[18]; /* Address of the local Device */
- char destination[18];/* Address of the remote Device */
- char object[128]; /* DBus object path */
-} __attribute__ ((packed));
-
-struct bt_set_configuration_req {
- bt_audio_msg_header_t h;
- codec_capabilities_t codec; /* Requested codec */
-} __attribute__ ((packed));
-
-struct bt_set_configuration_rsp {
- bt_audio_msg_header_t h;
- uint16_t link_mtu; /* Max length that transport supports */
-} __attribute__ ((packed));
-
-#define BT_STREAM_ACCESS_READ 0
-#define BT_STREAM_ACCESS_WRITE 1
-#define BT_STREAM_ACCESS_READWRITE 2
-struct bt_start_stream_req {
- bt_audio_msg_header_t h;
-} __attribute__ ((packed));
-
-struct bt_start_stream_rsp {
- bt_audio_msg_header_t h;
-} __attribute__ ((packed));
-
-/* This message is followed by one byte of data containing the stream data fd
- as ancillary data */
-struct bt_new_stream_ind {
- bt_audio_msg_header_t h;
-} __attribute__ ((packed));
-
-struct bt_stop_stream_req {
- bt_audio_msg_header_t h;
-} __attribute__ ((packed));
-
-struct bt_stop_stream_rsp {
- bt_audio_msg_header_t h;
-} __attribute__ ((packed));
-
-struct bt_close_req {
- bt_audio_msg_header_t h;
-} __attribute__ ((packed));
-
-struct bt_close_rsp {
- bt_audio_msg_header_t h;
-} __attribute__ ((packed));
-
-struct bt_suspend_stream_ind {
- bt_audio_msg_header_t h;
-} __attribute__ ((packed));
-
-struct bt_resume_stream_ind {
- bt_audio_msg_header_t h;
-} __attribute__ ((packed));
-
-#define BT_CONTROL_KEY_POWER 0x40
-#define BT_CONTROL_KEY_VOL_UP 0x41
-#define BT_CONTROL_KEY_VOL_DOWN 0x42
-#define BT_CONTROL_KEY_MUTE 0x43
-#define BT_CONTROL_KEY_PLAY 0x44
-#define BT_CONTROL_KEY_STOP 0x45
-#define BT_CONTROL_KEY_PAUSE 0x46
-#define BT_CONTROL_KEY_RECORD 0x47
-#define BT_CONTROL_KEY_REWIND 0x48
-#define BT_CONTROL_KEY_FAST_FORWARD 0x49
-#define BT_CONTROL_KEY_EJECT 0x4A
-#define BT_CONTROL_KEY_FORWARD 0x4B
-#define BT_CONTROL_KEY_BACKWARD 0x4C
-
-struct bt_control_req {
- bt_audio_msg_header_t h;
- uint8_t mode; /* Control Mode */
- uint8_t key; /* Control Key */
-} __attribute__ ((packed));
-
-struct bt_control_rsp {
- bt_audio_msg_header_t h;
- uint8_t mode; /* Control Mode */
- uint8_t key; /* Control Key */
-} __attribute__ ((packed));
-
-struct bt_control_ind {
- bt_audio_msg_header_t h;
- uint8_t mode; /* Control Mode */
- uint8_t key; /* Control Key */
-} __attribute__ ((packed));
-
-struct bt_delay_report_req {
- bt_audio_msg_header_t h;
- uint16_t delay;
-} __attribute__ ((packed));
-
-struct bt_delay_report_ind {
- bt_audio_msg_header_t h;
- uint16_t delay;
-} __attribute__ ((packed));
-
-/* Function declaration */
-
-/* Opens a connection to the audio service: return a socket descriptor */
-int bt_audio_service_open(void);
-
-/* Closes a connection to the audio service */
-int bt_audio_service_close(int sk);
-
-/* Receives stream data file descriptor : must be called after a
-BT_STREAMFD_IND message is returned */
-int bt_audio_service_get_data_fd(int sk);
-
-/* Human readable message type string */
-const char *bt_audio_strtype(uint8_t type);
-
-/* Human readable message name string */
-const char *bt_audio_strname(uint8_t name);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BT_AUDIOCLIENT_H */
diff --git a/audio/manager.c b/audio/manager.c
index 7ed39bb..faa48de 100644
--- a/audio/manager.c
+++ b/audio/manager.c
@@ -54,7 +54,6 @@
#include "../src/device.h"
#include "log.h"
-#include "ipc.h"
#include "device.h"
#include "error.h"
#include "avdtp.h"
diff --git a/test/ipctest-a2dp-easy.test b/test/ipctest-a2dp-easy.test
deleted file mode 100644
index ba62d93..0000000
--- a/test/ipctest-a2dp-easy.test
+++ /dev/null
@@ -1,8 +0,0 @@
-profile a2dp
-init_bt
-init_profile
-start_stream
-sleep 2
-stop_stream
-quit
-
diff --git a/test/ipctest-a2dp-resume-fast.test b/test/ipctest-a2dp-resume-fast.test
deleted file mode 100644
index bbc99e2..0000000
--- a/test/ipctest-a2dp-resume-fast.test
+++ /dev/null
@@ -1,82 +0,0 @@
-#!./ipctest
-
-profile a2dp
-init_bt
-
-init_profile
-
-start_stream
-sleep 1
-stop_stream
-
-stop_stream
-start_stream
-
-stop_stream
-start_stream
-
-stop_stream
-start_stream
-
-stop_stream
-start_stream
-
-stop_stream
-start_stream
-
-stop_stream
-stop_stream
-stop_stream
-
-start_stream
-start_stream
-start_stream
-
-stop_stream
-
-sleep 1
-
-start_stream
-start_stream
-start_stream
-stop_stream
-stop_stream
-
-start_stream
-sleep 1
-stop_stream
-
-start_stream
-stop_stream
-
-start_stream
-stop_stream
-
-shutdown_bt
-
-init_bt
-
-init_profile
-
-start_stream
-stop_stream
-stop_stream
-start_stream
-stop_stream
-start_stream
-stop_stream
-start_stream
-stop_stream
-start_stream
-stop_stream
-start_stream
-stop_stream
-stop_stream
-stop_stream
-
-start_stream
-start_stream
-start_stream
-stop_stream
-
-quit
diff --git a/test/ipctest-hsp-a2dp-switch.test b/test/ipctest-hsp-a2dp-switch.test
deleted file mode 100644
index e99878f..0000000
--- a/test/ipctest-hsp-a2dp-switch.test
+++ /dev/null
@@ -1,50 +0,0 @@
-init_bt
-
-profile a2dp
-init_profile
-start_stream
-sleep 2
-stop_stream
-start_stream
-sleep 2
-stop_stream
-
-shutdown_bt
-init_bt
-
-profile hsp
-init_profile
-start_stream
-sleep 2
-stop_stream
-start_stream
-sleep 2
-stop_stream
-
-shutdown_bt
-init_bt
-
-profile a2dp
-init_profile
-start_stream
-sleep 2
-stop_stream
-start_stream
-sleep 2
-stop_stream
-
-shutdown_bt
-init_bt
-
-profile hsp
-init_profile
-start_stream
-sleep 2
-stop_stream
-start_stream
-sleep 2
-stop_stream
-
-shutdown_bt
-
-quit
diff --git a/test/ipctest-hsp-easy.test b/test/ipctest-hsp-easy.test
deleted file mode 100644
index 0756a78..0000000
--- a/test/ipctest-hsp-easy.test
+++ /dev/null
@@ -1,7 +0,0 @@
-profile hsp
-init_bt
-init_profile
-start_stream
-sleep 2
-stop_stream
-quit
diff --git a/test/ipctest-init-shutdown.test b/test/ipctest-init-shutdown.test
deleted file mode 100644
index 578883a..0000000
--- a/test/ipctest-init-shutdown.test
+++ /dev/null
@@ -1,59 +0,0 @@
-#!./ipctest
-
-init_bt
-shutdown_bt
-
-init_bt
-shutdown_bt
-
-init_bt
-shutdown_bt
-
-init_bt
-shutdown_bt
-
-init_bt
-shutdown_bt
-
-init_bt
-shutdown_bt
-
-init_bt
-shutdown_bt
-
-init_bt
-shutdown_bt
-
-init_bt
-shutdown_bt
-
-init_bt
-shutdown_bt
-
-init_bt
-shutdown_bt
-
-
-init_bt
-sleep 1
-shutdown_bt
-
-init_bt
-sleep 1
-shutdown_bt
-
-init_bt
-sleep 1
-shutdown_bt
-
-init_bt
-shutdown_bt
-
-init_bt
-shutdown_bt
-
-init_bt
-shutdown_bt
-
-quit
-
diff --git a/test/ipctest.c b/test/ipctest.c
deleted file mode 100644
index cbfd78d..0000000
--- a/test/ipctest.c
+++ /dev/null
@@ -1,1133 +0,0 @@
-/*
- *
- * BlueZ - Bluetooth protocol stack for Linux
- *
- * Copyright (C) 2006-2010 Nokia Corporation
- * Copyright (C) 2004-2010 Marcel Holtmann <marcel@holtmann.org>
- * Copyright (C) 2009 Lennart Poettering
- * Copyright (C) 2008 Joao Paulo Rechi Vita
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <assert.h>
-#include <libgen.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
-
-#include <glib.h>
-
-#include "ipc.h"
-#include "sbc.h"
-
-#define DBG(fmt, arg...) \
- printf("debug %s: " fmt "\n" , __FUNCTION__ , ## arg)
-#define ERR(fmt, arg...) \
- fprintf(stderr, "ERROR %s: " fmt "\n" , __FUNCTION__ , ## arg)
-
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-
-#ifndef MIN
-# define MIN(x, y) ((x) < (y) ? (x) : (y))
-#endif
-
-#ifndef MAX
-# define MAX(x, y) ((x) > (y) ? (x) : (y))
-#endif
-
-#ifndef TRUE
-# define TRUE (1)
-#endif
-
-#ifndef FALSE
-# define FALSE (0)
-#endif
-
-#define YES_NO(t) ((t) ? "yes" : "no")
-
-#define BUFFER_SIZE 2048
-#define MAX_BITPOOL 64
-#define MIN_BITPOOL 2
-
-struct a2dp_info {
- sbc_capabilities_t sbc_capabilities;
- sbc_t sbc; /* Codec data */
- int sbc_initialized; /* Keep track if the encoder is initialized */
- size_t codesize; /* SBC codesize */
-
- void* buffer; /* Codec transfer buffer */
- size_t buffer_size; /* Size of the buffer */
-
- uint16_t seq_num; /* Cumulative packet sequence */
-};
-
-struct hsp_info {
- pcm_capabilities_t pcm_capabilities;
-};
-
-struct userdata {
- int service_fd;
- int stream_fd;
- GIOChannel *stream_channel;
- guint stream_watch;
- GIOChannel *gin; /* dude, I am thirsty now */
- guint gin_watch;
- int transport;
- uint32_t rate;
- int channels;
- char *address;
- struct a2dp_info a2dp;
- struct hsp_info hsp;
- size_t link_mtu;
- size_t block_size;
- gboolean debug_stream_read : 1;
- gboolean debug_stream_write : 1;
-};
-
-static struct userdata data = {
- .service_fd = -1,
- .stream_fd = -1,
- .transport = BT_CAPABILITIES_TRANSPORT_A2DP,
- .rate = 48000,
- .channels = 2,
- .address = NULL
-};
-
-static int start_stream(struct userdata *u);
-static int stop_stream(struct userdata *u);
-static gboolean input_cb(GIOChannel *gin, GIOCondition condition, gpointer data);
-
-static GMainLoop *main_loop;
-
-static int service_send(struct userdata *u, const bt_audio_msg_header_t *msg)
-{
- int err;
- uint16_t length;
-
- assert(u);
-
- length = msg->length ? msg->length : BT_SUGGESTED_BUFFER_SIZE;
-
- DBG("sending %s:%s", bt_audio_strtype(msg->type),
- bt_audio_strname(msg->name));
-
- if (send(u->service_fd, msg, length, 0) > 0)
- err = 0;
- else {
- err = -errno;
- ERR("Error sending data to audio service: %s(%d)",
- strerror(-err), -err);
- }
-
- return err;
-}
-
-static int service_recv(struct userdata *u, bt_audio_msg_header_t *rsp)
-{
- int err;
- const char *type, *name;
- uint16_t length;
-
- assert(u);
-
- length = rsp->length ? : BT_SUGGESTED_BUFFER_SIZE;
-
- DBG("trying to receive msg from audio service...");
- if (recv(u->service_fd, rsp, length, 0) > 0) {
- type = bt_audio_strtype(rsp->type);
- name = bt_audio_strname(rsp->name);
- if (type && name) {
- DBG("Received %s - %s", type, name);
- err = 0;
- } else {
- err = -EINVAL;
- ERR("Bogus message type %d - name %d"
- "received from audio service",
- rsp->type, rsp->name);
- }
- } else {
- err = -errno;
- ERR("Error receiving data from audio service: %s(%d)",
- strerror(-err), -err);
- }
-
- return err;
-}
-
-static ssize_t service_expect(struct userdata *u, bt_audio_msg_header_t *rsp,
- uint8_t expected_name)
-{
- int r;
-
- assert(u);
- assert(u->service_fd >= 0);
- assert(rsp);
-
- if ((r = service_recv(u, rsp)) < 0)
- return r;
-
- if ((rsp->type != BT_INDICATION && rsp->type != BT_RESPONSE) ||
- (rsp->name != expected_name)) {
- if (rsp->type == BT_ERROR && rsp->length == sizeof(bt_audio_error_t))
- ERR("Received error condition: %s",
- strerror(((bt_audio_error_t*) rsp)->posix_errno));
- else
- ERR("Bogus message %s received while %s was expected",
- bt_audio_strname(rsp->name),
- bt_audio_strname(expected_name));
- return -1;
- }
-
- return 0;
-}
-
-static int init_bt(struct userdata *u)
-{
- assert(u);
-
- if (u->service_fd != -1)
- return 0;
-
- DBG("bt_audio_service_open");
-
- u->service_fd = bt_audio_service_open();
- if (u->service_fd < 0) {
- int err = -errno;
-
- ERR("bt_audio_service_open() failed: %s (%d)", strerror(-err),
- -err);
-
- return err;
- }
-
- return 0;
-}
-
-static int parse_caps(struct userdata *u, const struct bt_get_capabilities_rsp *rsp)
-{
- unsigned char *ptr;
- uint16_t bytes_left;
- codec_capabilities_t codec;
-
- assert(u);
- assert(rsp);
-
- bytes_left = rsp->h.length - sizeof(*rsp);
-
- if (bytes_left < sizeof(codec_capabilities_t)) {
- ERR("Packet too small to store codec information.");
- return -1;
- }
-
- ptr = ((void *) rsp) + sizeof(*rsp);
-
- memcpy(&codec, ptr, sizeof(codec)); /** ALIGNMENT? **/
-
- DBG("Payload size is %lu %lu",
- (unsigned long) bytes_left, (unsigned long) sizeof(codec));
-
- if (u->transport != codec.transport) {
- ERR("Got capabilities for wrong codec.");
- return -1;
- }
-
- if (u->transport == BT_CAPABILITIES_TRANSPORT_SCO) {
-
- if (bytes_left <= 0 ||
- codec.length != sizeof(u->hsp.pcm_capabilities))
- return -1;
-
- assert(codec.type == BT_HFP_CODEC_PCM);
-
- memcpy(&u->hsp.pcm_capabilities,
- &codec, sizeof(u->hsp.pcm_capabilities));
-
- DBG("Has NREC: %s",
- YES_NO(u->hsp.pcm_capabilities.flags & BT_PCM_FLAG_NREC));
-
- } else if (u->transport == BT_CAPABILITIES_TRANSPORT_A2DP) {
-
- while (bytes_left > 0) {
- if (codec.type == BT_A2DP_SBC_SINK &&
- !(codec.lock & BT_WRITE_LOCK))
- break;
-
- bytes_left -= codec.length;
- ptr += codec.length;
- memcpy(&codec, ptr, sizeof(codec));
- }
-
- DBG("bytes_left = %d, codec.length = %d",
- bytes_left, codec.length);
-
- if (bytes_left <= 0 ||
- codec.length != sizeof(u->a2dp.sbc_capabilities))
- return -1;
-
- assert(codec.type == BT_A2DP_SBC_SINK);
-
- memcpy(&u->a2dp.sbc_capabilities, &codec,
- sizeof(u->a2dp.sbc_capabilities));
- } else {
- assert(0);
- }
-
- return 0;
-}
-
-static int get_caps(struct userdata *u)
-{
- union {
- struct bt_get_capabilities_req getcaps_req;
- struct bt_get_capabilities_rsp getcaps_rsp;
- bt_audio_error_t error;
- uint8_t buf[BT_SUGGESTED_BUFFER_SIZE];
- } msg;
-
- assert(u);
-
- memset(&msg, 0, sizeof(msg));
- msg.getcaps_req.h.type = BT_REQUEST;
- msg.getcaps_req.h.name = BT_GET_CAPABILITIES;
- msg.getcaps_req.h.length = sizeof(msg.getcaps_req);
-
- strncpy(msg.getcaps_req.destination, u->address,
- sizeof(msg.getcaps_req.destination));
- msg.getcaps_req.transport = u->transport;
- msg.getcaps_req.flags = BT_FLAG_AUTOCONNECT;
-
- if (service_send(u, &msg.getcaps_req.h) < 0)
- return -1;
-
- msg.getcaps_rsp.h.length = 0;
- if (service_expect(u, &msg.getcaps_rsp.h, BT_GET_CAPABILITIES) < 0)
- return -1;
-
- return parse_caps(u, &msg.getcaps_rsp);
-}
-
-static uint8_t a2dp_default_bitpool(uint8_t freq, uint8_t mode)
-{
- switch (freq) {
- case BT_SBC_SAMPLING_FREQ_16000:
- case BT_SBC_SAMPLING_FREQ_32000:
- return 53;
-
- case BT_SBC_SAMPLING_FREQ_44100:
-
- switch (mode) {
- case BT_A2DP_CHANNEL_MODE_MONO:
- case BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL:
- return 31;
-
- case BT_A2DP_CHANNEL_MODE_STEREO:
- case BT_A2DP_CHANNEL_MODE_JOINT_STEREO:
- return 53;
-
- default:
- DBG("Invalid channel mode %u", mode);
- return 53;
- }
-
- case BT_SBC_SAMPLING_FREQ_48000:
-
- switch (mode) {
- case BT_A2DP_CHANNEL_MODE_MONO:
- case BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL:
- return 29;
-
- case BT_A2DP_CHANNEL_MODE_STEREO:
- case BT_A2DP_CHANNEL_MODE_JOINT_STEREO:
- return 51;
-
- default:
- DBG("Invalid channel mode %u", mode);
- return 51;
- }
-
- default:
- DBG("Invalid sampling freq %u", freq);
- return 53;
- }
-}
-
-static int setup_a2dp(struct userdata *u)
-{
- sbc_capabilities_t *cap;
- int i;
-
- static const struct {
- uint32_t rate;
- uint8_t cap;
- } freq_table[] = {
- { 16000U, BT_SBC_SAMPLING_FREQ_16000 },
- { 32000U, BT_SBC_SAMPLING_FREQ_32000 },
- { 44100U, BT_SBC_SAMPLING_FREQ_44100 },
- { 48000U, BT_SBC_SAMPLING_FREQ_48000 }
- };
-
- assert(u);
- assert(u->transport == BT_CAPABILITIES_TRANSPORT_A2DP);
-
- cap = &u->a2dp.sbc_capabilities;
-
- /* Find the lowest freq that is at least as high as the requested
- * sampling rate */
- for (i = 0; (unsigned) i < ARRAY_SIZE(freq_table); i++)
- if (freq_table[i].rate >= u->rate &&
- (cap->frequency & freq_table[i].cap)) {
- u->rate = freq_table[i].rate;
- cap->frequency = freq_table[i].cap;
- break;
- }
-
- if ((unsigned) i >= ARRAY_SIZE(freq_table)) {
- for (; i >= 0; i--) {
- if (cap->frequency & freq_table[i].cap) {
- u->rate = freq_table[i].rate;
- cap->frequency = freq_table[i].cap;
- break;
- }
- }
-
- if (i < 0) {
- DBG("Not suitable sample rate");
- return -1;
- }
- }
-
- if (u->channels <= 1) {
- if (cap->channel_mode & BT_A2DP_CHANNEL_MODE_MONO) {
- cap->channel_mode = BT_A2DP_CHANNEL_MODE_MONO;
- u->channels = 1;
- } else
- u->channels = 2;
- }
-
- if (u->channels >= 2) {
- u->channels = 2;
-
- if (cap->channel_mode & BT_A2DP_CHANNEL_MODE_JOINT_STEREO)
- cap->channel_mode = BT_A2DP_CHANNEL_MODE_JOINT_STEREO;
- else if (cap->channel_mode & BT_A2DP_CHANNEL_MODE_STEREO)
- cap->channel_mode = BT_A2DP_CHANNEL_MODE_STEREO;
- else if (cap->channel_mode & BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL)
- cap->channel_mode = BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL;
- else if (cap->channel_mode & BT_A2DP_CHANNEL_MODE_MONO) {
- cap->channel_mode = BT_A2DP_CHANNEL_MODE_MONO;
- u->channels = 1;
- } else {
- DBG("No supported channel modes");
- return -1;
- }
- }
-
- if (cap->block_length & BT_A2DP_BLOCK_LENGTH_16)
- cap->block_length = BT_A2DP_BLOCK_LENGTH_16;
- else if (cap->block_length & BT_A2DP_BLOCK_LENGTH_12)
- cap->block_length = BT_A2DP_BLOCK_LENGTH_12;
- else if (cap->block_length & BT_A2DP_BLOCK_LENGTH_8)
- cap->block_length = BT_A2DP_BLOCK_LENGTH_8;
- else if (cap->block_length & BT_A2DP_BLOCK_LENGTH_4)
- cap->block_length = BT_A2DP_BLOCK_LENGTH_4;
- else {
- DBG("No supported block lengths");
- return -1;
- }
-
- if (cap->subbands & BT_A2DP_SUBBANDS_8)
- cap->subbands = BT_A2DP_SUBBANDS_8;
- else if (cap->subbands & BT_A2DP_SUBBANDS_4)
- cap->subbands = BT_A2DP_SUBBANDS_4;
- else {
- DBG("No supported subbands");
- return -1;
- }
-
- if (cap->allocation_method & BT_A2DP_ALLOCATION_LOUDNESS)
- cap->allocation_method = BT_A2DP_ALLOCATION_LOUDNESS;
- else if (cap->allocation_method & BT_A2DP_ALLOCATION_SNR)
- cap->allocation_method = BT_A2DP_ALLOCATION_SNR;
-
- cap->min_bitpool = (uint8_t) MAX(MIN_BITPOOL, cap->min_bitpool);
- cap->max_bitpool = (uint8_t) MIN(
- a2dp_default_bitpool(cap->frequency, cap->channel_mode),
- cap->max_bitpool);
-
- return 0;
-}
-
-static void setup_sbc(struct a2dp_info *a2dp)
-{
- sbc_capabilities_t *active_capabilities;
-
- assert(a2dp);
-
- active_capabilities = &a2dp->sbc_capabilities;
-
- if (a2dp->sbc_initialized)
- sbc_reinit(&a2dp->sbc, 0);
- else
- sbc_init(&a2dp->sbc, 0);
- a2dp->sbc_initialized = TRUE;
-
- switch (active_capabilities->frequency) {
- case BT_SBC_SAMPLING_FREQ_16000:
- a2dp->sbc.frequency = SBC_FREQ_16000;
- break;
- case BT_SBC_SAMPLING_FREQ_32000:
- a2dp->sbc.frequency = SBC_FREQ_32000;
- break;
- case BT_SBC_SAMPLING_FREQ_44100:
- a2dp->sbc.frequency = SBC_FREQ_44100;
- break;
- case BT_SBC_SAMPLING_FREQ_48000:
- a2dp->sbc.frequency = SBC_FREQ_48000;
- break;
- default:
- assert(0);
- }
-
- switch (active_capabilities->channel_mode) {
- case BT_A2DP_CHANNEL_MODE_MONO:
- a2dp->sbc.mode = SBC_MODE_MONO;
- break;
- case BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL:
- a2dp->sbc.mode = SBC_MODE_DUAL_CHANNEL;
- break;
- case BT_A2DP_CHANNEL_MODE_STEREO:
- a2dp->sbc.mode = SBC_MODE_STEREO;
- break;
- case BT_A2DP_CHANNEL_MODE_JOINT_STEREO:
- a2dp->sbc.mode = SBC_MODE_JOINT_STEREO;
- break;
- default:
- assert(0);
- }
-
- switch (active_capabilities->allocation_method) {
- case BT_A2DP_ALLOCATION_SNR:
- a2dp->sbc.allocation = SBC_AM_SNR;
- break;
- case BT_A2DP_ALLOCATION_LOUDNESS:
- a2dp->sbc.allocation = SBC_AM_LOUDNESS;
- break;
- default:
- assert(0);
- }
-
- switch (active_capabilities->subbands) {
- case BT_A2DP_SUBBANDS_4:
- a2dp->sbc.subbands = SBC_SB_4;
- break;
- case BT_A2DP_SUBBANDS_8:
- a2dp->sbc.subbands = SBC_SB_8;
- break;
- default:
- assert(0);
- }
-
- switch (active_capabilities->block_length) {
- case BT_A2DP_BLOCK_LENGTH_4:
- a2dp->sbc.blocks = SBC_BLK_4;
- break;
- case BT_A2DP_BLOCK_LENGTH_8:
- a2dp->sbc.blocks = SBC_BLK_8;
- break;
- case BT_A2DP_BLOCK_LENGTH_12:
- a2dp->sbc.blocks = SBC_BLK_12;
- break;
- case BT_A2DP_BLOCK_LENGTH_16:
- a2dp->sbc.blocks = SBC_BLK_16;
- break;
- default:
- assert(0);
- }
-
- a2dp->sbc.bitpool = active_capabilities->max_bitpool;
- a2dp->codesize = (uint16_t) sbc_get_codesize(&a2dp->sbc);
-}
-
-static int bt_open(struct userdata *u)
-{
- union {
- struct bt_open_req open_req;
- struct bt_open_rsp open_rsp;
- bt_audio_error_t error;
- uint8_t buf[BT_SUGGESTED_BUFFER_SIZE];
- } msg;
-
- memset(&msg, 0, sizeof(msg));
- msg.open_req.h.type = BT_REQUEST;
- msg.open_req.h.name = BT_OPEN;
- msg.open_req.h.length = sizeof(msg.open_req);
-
- strncpy(msg.open_req.destination, u->address,
- sizeof(msg.open_req.destination));
- msg.open_req.seid = u->transport == BT_CAPABILITIES_TRANSPORT_A2DP ?
- u->a2dp.sbc_capabilities.capability.seid :
- BT_A2DP_SEID_RANGE + 1;
- msg.open_req.lock = u->transport == BT_CAPABILITIES_TRANSPORT_A2DP ?
- BT_WRITE_LOCK : BT_READ_LOCK | BT_WRITE_LOCK;
-
- if (service_send(u, &msg.open_req.h) < 0)
- return -1;
-
- msg.open_rsp.h.length = sizeof(msg.open_rsp);
- if (service_expect(u, &msg.open_rsp.h, BT_OPEN) < 0)
- return -1;
-
- return 0;
-}
-
-static int set_conf(struct userdata *u)
-{
- union {
- struct bt_set_configuration_req setconf_req;
- struct bt_set_configuration_rsp setconf_rsp;
- bt_audio_error_t error;
- uint8_t buf[BT_SUGGESTED_BUFFER_SIZE];
- } msg;
-
- if (u->transport == BT_CAPABILITIES_TRANSPORT_A2DP) {
- if (setup_a2dp(u) < 0)
- return -1;
- }
-
- memset(&msg, 0, sizeof(msg));
- msg.setconf_req.h.type = BT_REQUEST;
- msg.setconf_req.h.name = BT_SET_CONFIGURATION;
- msg.setconf_req.h.length = sizeof(msg.setconf_req);
-
- if (u->transport == BT_CAPABILITIES_TRANSPORT_A2DP) {
- memcpy(&msg.setconf_req.codec, &u->a2dp.sbc_capabilities,
- sizeof(u->a2dp.sbc_capabilities));
- msg.setconf_req.h.length += msg.setconf_req.codec.length -
- sizeof(msg.setconf_req.codec);
- } else {
- msg.setconf_req.codec.transport = BT_CAPABILITIES_TRANSPORT_SCO;
- msg.setconf_req.codec.seid = BT_A2DP_SEID_RANGE + 1;
- msg.setconf_req.codec.length = sizeof(pcm_capabilities_t);
- }
-
- if (service_send(u, &msg.setconf_req.h) < 0)
- return -1;
-
- msg.setconf_rsp.h.length = sizeof(msg.setconf_rsp);
- if (service_expect(u, &msg.setconf_rsp.h, BT_SET_CONFIGURATION) < 0)
- return -1;
-
- u->link_mtu = msg.setconf_rsp.link_mtu;
-
- /* setup SBC encoder now we agree on parameters */
- if (u->transport == BT_CAPABILITIES_TRANSPORT_A2DP) {
- setup_sbc(&u->a2dp);
- u->block_size = u->a2dp.codesize;
- DBG("SBC parameters:\n\tallocation=%u\n"
- "\tsubbands=%u\n\tblocks=%u\n\tbitpool=%u\n",
- u->a2dp.sbc.allocation, u->a2dp.sbc.subbands,
- u->a2dp.sbc.blocks, u->a2dp.sbc.bitpool);
- } else
- u->block_size = u->link_mtu;
-
- return 0;
-}
-
-static int setup_bt(struct userdata *u)
-{
- assert(u);
-
- if (get_caps(u) < 0)
- return -1;
-
- DBG("Got device caps");
-
- if (bt_open(u) < 0)
- return -1;
-
- if (set_conf(u) < 0)
- return -1;
-
- return 0;
-}
-
-static int init_profile(struct userdata *u)
-{
- assert(u);
-
- return setup_bt(u);
-}
-
-static void shutdown_bt(struct userdata *u)
-{
- assert(u);
-
- if (u->stream_fd != -1) {
- stop_stream(u);
- DBG("close(stream_fd)");
- close(u->stream_fd);
- u->stream_fd = -1;
- }
-
- if (u->service_fd != -1) {
- DBG("bt_audio_service_close");
- bt_audio_service_close(u->service_fd);
- u->service_fd = -1;
- }
-}
-
-static void make_fd_nonblock(int fd)
-{
- int v;
-
- assert(fd >= 0);
- assert((v = fcntl(fd, F_GETFL)) >= 0);
-
- if (!(v & O_NONBLOCK))
- assert(fcntl(fd, F_SETFL, v|O_NONBLOCK) >= 0);
-}
-
-static void make_socket_low_delay(int fd)
-{
-/* FIXME: is this widely supported? */
-#ifdef SO_PRIORITY
- int priority;
- assert(fd >= 0);
-
- priority = 6;
- if (setsockopt(fd, SOL_SOCKET, SO_PRIORITY, (void*)&priority,
- sizeof(priority)) < 0)
- ERR("SO_PRIORITY failed: %s", strerror(errno));
-#endif
-}
-
-static int read_stream(struct userdata *u)
-{
- int ret = 0;
- ssize_t l;
- char *buf;
-
- assert(u);
- assert(u->stream_fd >= 0);
-
- buf = alloca(u->link_mtu);
-
- for (;;) {
- l = read(u->stream_fd, buf, u->link_mtu);
- if (u->debug_stream_read)
- DBG("read from socket: %lli bytes", (long long) l);
- if (l <= 0) {
- if (l < 0 && errno == EINTR)
- continue;
- else {
- ERR("Failed to read date from stream_fd: %s",
- ret < 0 ? strerror(errno) : "EOF");
- return -1;
- }
- } else {
- break;
- }
- }
-
- return ret;
-}
-
-/* It's what PulseAudio is doing, not sure it's necessary for this
- * test */
-static ssize_t pa_write(int fd, const void *buf, size_t count)
-{
- ssize_t r;
-
- if ((r = send(fd, buf, count, MSG_NOSIGNAL)) >= 0)
- return r;
-
- if (errno != ENOTSOCK)
- return r;
-
- return write(fd, buf, count);
-}
-
-static int write_stream(struct userdata *u)
-{
- int ret = 0;
- ssize_t l;
- char *buf;
-
- assert(u);
- assert(u->stream_fd >= 0);
- buf = alloca(u->link_mtu);
-
- for (;;) {
- l = pa_write(u->stream_fd, buf, u->link_mtu);
- if (u->debug_stream_write)
- DBG("written to socket: %lli bytes", (long long) l);
- assert(l != 0);
- if (l < 0) {
- if (errno == EINTR)
- continue;
- else {
- ERR("Failed to write data: %s", strerror(errno));
- ret = -1;
- break;
- }
- } else {
- assert((size_t)l <= u->link_mtu);
- break;
- }
- }
-
- return ret;
-}
-
-static gboolean stream_cb(GIOChannel *gin, GIOCondition condition, gpointer data)
-{
- struct userdata *u;
-
- assert(u = data);
-
- if (condition & G_IO_IN) {
- if (read_stream(u) < 0)
- goto fail;
- } else if (condition & G_IO_OUT) {
- if (write_stream(u) < 0)
- goto fail;
- } else {
- DBG("Got %d", condition);
- g_main_loop_quit(main_loop);
- return FALSE;
- }
-
- return TRUE;
-
-fail:
- stop_stream(u);
- return FALSE;
-}
-
-static int start_stream(struct userdata *u)
-{
- union {
- bt_audio_msg_header_t rsp;
- struct bt_start_stream_req start_req;
- struct bt_start_stream_rsp start_rsp;
- struct bt_new_stream_ind streamfd_ind;
- bt_audio_error_t error;
- uint8_t buf[BT_SUGGESTED_BUFFER_SIZE];
- } msg;
-
- assert(u);
-
- if (u->stream_fd >= 0)
- return 0;
- if (u->stream_watch != 0) {
- g_source_remove(u->stream_watch);
- u->stream_watch = 0;
- }
- if (u->stream_channel != 0) {
- g_io_channel_unref(u->stream_channel);
- u->stream_channel = NULL;
- }
-
- memset(msg.buf, 0, BT_SUGGESTED_BUFFER_SIZE);
- msg.start_req.h.type = BT_REQUEST;
- msg.start_req.h.name = BT_START_STREAM;
- msg.start_req.h.length = sizeof(msg.start_req);
-
- if (service_send(u, &msg.start_req.h) < 0)
- return -1;
-
- msg.rsp.length = sizeof(msg.start_rsp);
- if (service_expect(u, &msg.rsp, BT_START_STREAM) < 0)
- return -1;
-
- msg.rsp.length = sizeof(msg.streamfd_ind);
- if (service_expect(u, &msg.rsp, BT_NEW_STREAM) < 0)
- return -1;
-
- if ((u->stream_fd = bt_audio_service_get_data_fd(u->service_fd)) < 0) {
- DBG("Failed to get stream fd from audio service.");
- return -1;
- }
-
- make_fd_nonblock(u->stream_fd);
- make_socket_low_delay(u->stream_fd);
-
- assert(u->stream_channel = g_io_channel_unix_new(u->stream_fd));
-
- u->stream_watch = g_io_add_watch(u->stream_channel,
- G_IO_IN|G_IO_OUT|G_IO_ERR|G_IO_HUP|G_IO_NVAL,
- stream_cb, u);
-
- return 0;
-}
-
-static int stop_stream(struct userdata *u)
-{
- union {
- bt_audio_msg_header_t rsp;
- struct bt_stop_stream_req stop_req;
- struct bt_stop_stream_rsp stop_rsp;
- bt_audio_error_t error;
- uint8_t buf[BT_SUGGESTED_BUFFER_SIZE];
- } msg;
- int r = 0;
-
- if (u->stream_fd < 0)
- return 0;
-
- assert(u);
- assert(u->stream_channel);
-
- g_source_remove(u->stream_watch);
- u->stream_watch = 0;
- g_io_channel_unref(u->stream_channel);
- u->stream_channel = NULL;
-
- memset(msg.buf, 0, BT_SUGGESTED_BUFFER_SIZE);
- msg.stop_req.h.type = BT_REQUEST;
- msg.stop_req.h.name = BT_STOP_STREAM;
- msg.stop_req.h.length = sizeof(msg.stop_req);
-
- if (service_send(u, &msg.stop_req.h) < 0) {
- r = -1;
- goto done;
- }
-
- msg.rsp.length = sizeof(msg.stop_rsp);
- if (service_expect(u, &msg.rsp, BT_STOP_STREAM) < 0)
- r = -1;
-
-done:
- close(u->stream_fd);
- u->stream_fd = -1;
-
- return r;
-}
-
-static gboolean sleep_cb(gpointer data)
-{
- struct userdata *u;
-
- assert(u = data);
-
- u->gin_watch = g_io_add_watch(u->gin,
- G_IO_IN|G_IO_ERR|G_IO_HUP|G_IO_NVAL, input_cb, data);
-
- printf(">>> ");
- fflush(stdout);
-
- return FALSE;
-}
-
-static gboolean input_cb(GIOChannel *gin, GIOCondition condition, gpointer data)
-{
- char *line, *tmp;
- gsize term_pos;
- GError *error = NULL;
- struct userdata *u;
- int success;
-
- assert(u = data);
- if (!(condition & G_IO_IN)) {
- DBG("Got %d", condition);
- g_main_loop_quit(main_loop);
- return FALSE;
- }
-
- if (g_io_channel_read_line(gin, &line, NULL, &term_pos, &error) !=
- G_IO_STATUS_NORMAL)
- return FALSE;
-
- line[term_pos] = '\0';
- g_strstrip(line);
- if ((tmp = strchr(line, '#')))
- *tmp = '\0';
- success = FALSE;
-
-#define IF_CMD(cmd) \
- if (!success && (success = (strncmp(line, #cmd, strlen(#cmd)) == 0)))
-
- IF_CMD(quit) {
- g_main_loop_quit(main_loop);
- return FALSE;
- }
-
- IF_CMD(sleep) {
- unsigned int seconds;
- if (sscanf(line, "%*s %d", &seconds) != 1)
- DBG("sleep SECONDS");
- else {
- g_source_remove(u->gin_watch);
- g_timeout_add_seconds(seconds, sleep_cb, u);
- return FALSE;
- }
- }
-
- IF_CMD(debug) {
- char *what = NULL;
- int enable;
-
- if (sscanf(line, "%*s %as %d", &what, &enable) != 1)
- DBG("debug [stream_read|stream_write] [0|1]");
- if (strncmp(what, "stream_read", 12) == 0) {
- u->debug_stream_read = enable;
- } else if (strncmp(what, "stream_write", 13) == 0) {
- u->debug_stream_write = enable;
- } else {
- DBG("debug [stream_read|stream_write] [0|1]");
- }
- }
-
- IF_CMD(init_bt) {
- DBG("%d", init_bt(u));
- }
-
- IF_CMD(init_profile) {
- DBG("%d", init_profile(u));
- }
-
- IF_CMD(start_stream) {
- DBG("%d", start_stream(u));
- }
-
- IF_CMD(stop_stream) {
- DBG("%d", stop_stream(u));
- }
-
- IF_CMD(shutdown_bt) {
- shutdown_bt(u);
- }
-
- IF_CMD(rate) {
- if (sscanf(line, "%*s %d", &u->rate) != 1)
- DBG("set with rate RATE");
- DBG("rate %d", u->rate);
- }
-
- IF_CMD(bdaddr) {
- char *address;
-
- if (sscanf(line, "%*s %as", &address) != 1)
- DBG("set with bdaddr BDADDR");
-
- free(u->address);
-
- u->address = address;
- DBG("bdaddr %s", u->address);
- }
-
- IF_CMD(profile) {
- char *profile = NULL;
-
- if (sscanf(line, "%*s %as", &profile) != 1)
- DBG("set with profile [hsp|a2dp]");
- if (strncmp(profile, "hsp", 4) == 0) {
- u->transport = BT_CAPABILITIES_TRANSPORT_SCO;
- } else if (strncmp(profile, "a2dp", 5) == 0) {
- u->transport = BT_CAPABILITIES_TRANSPORT_A2DP;
- } else {
- DBG("set with profile [hsp|a2dp]");
- }
-
- free(profile);
- DBG("profile %s", u->transport == BT_CAPABILITIES_TRANSPORT_SCO ?
- "hsp" : "a2dp");
- }
-
- if (!success && strlen(line) != 0) {
- DBG("%s, unknown command", line);
- }
-
- printf(">>> ");
- fflush(stdout);
- return TRUE;
-}
-
-
-static void show_usage(char* prgname)
-{
- printf("%s: ipctest [--interactive] BDADDR\n", basename(prgname));
-}
-
-static void sig_term(int sig)
-{
- g_main_loop_quit(main_loop);
-}
-
-int main(int argc, char *argv[])
-{
- if (argc < 2) {
- show_usage(argv[0]);
- exit(EXIT_FAILURE);
- }
-
- assert(main_loop = g_main_loop_new(NULL, FALSE));
-
- if (strncmp("--interactive", argv[1], 14) == 0) {
- if (argc < 3) {
- show_usage(argv[0]);
- exit(EXIT_FAILURE);
- }
-
- data.address = strdup(argv[2]);
-
- signal(SIGTERM, sig_term);
- signal(SIGINT, sig_term);
-
- assert(data.gin = g_io_channel_unix_new(fileno(stdin)));
-
- data.gin_watch = g_io_add_watch(data.gin,
- G_IO_IN|G_IO_ERR|G_IO_HUP|G_IO_NVAL, input_cb, &data);
-
- printf(">>> ");
- fflush(stdout);
-
- g_main_loop_run(main_loop);
-
- } else {
- data.address = strdup(argv[1]);
-
- assert(init_bt(&data) == 0);
-
- assert(init_profile(&data) == 0);
-
- assert(start_stream(&data) == 0);
-
- g_main_loop_run(main_loop);
-
- assert(stop_stream(&data) == 0);
-
- shutdown_bt(&data);
- }
-
- g_main_loop_unref(main_loop);
-
- printf("\nExiting\n");
-
- exit(EXIT_SUCCESS);
-
- return 0;
-}
--
1.7.10.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH BlueZ 4/5] audio: Remove local A2DP endpoints options
2012-06-14 13:41 [PATCH BlueZ 1/5] audio: Remove unix socket support Luiz Augusto von Dentz
2012-06-14 13:41 ` [PATCH BlueZ 2/5] audio: Remove ALSA support Luiz Augusto von Dentz
2012-06-14 13:41 ` =?y?q?=5BPATCH=20BlueZ=203/5=5D=20audio=3A=20Remove=20internal=20audio=20IPC?= Luiz Augusto von Dentz
@ 2012-06-14 13:41 ` Luiz Augusto von Dentz
2012-06-14 13:47 ` Gustavo Padovan
2012-06-14 13:41 ` [PATCH BlueZ 5/5] audio: Remove remaining references to Socket Luiz Augusto von Dentz
3 siblings, 1 reply; 8+ messages in thread
From: Luiz Augusto von Dentz @ 2012-06-14 13:41 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
The local endpoints are no use without the internal IPC.
---
audio/a2dp.c | 72 +-----------------------------------------------------
audio/audio.conf | 5 ----
2 files changed, 1 insertion(+), 76 deletions(-)
diff --git a/audio/a2dp.c b/audio/a2dp.c
index 96137e4..094476e 100644
--- a/audio/a2dp.c
+++ b/audio/a2dp.c
@@ -1436,13 +1436,10 @@ static struct a2dp_server *find_server(GSList *list, const bdaddr_t *src)
int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
{
- int sbc_srcs = 0, sbc_sinks = 0;
- int mpeg12_srcs = 0, mpeg12_sinks = 0;
- gboolean source = TRUE, sink = FALSE, socket = FALSE;
+ gboolean source = TRUE, sink = FALSE;
gboolean delay_reporting = FALSE;
char *str;
GError *err = NULL;
- int i;
struct a2dp_server *server;
if (!config)
@@ -1458,8 +1455,6 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
source = TRUE;
if (strstr(str, "Source"))
sink = TRUE;
- if (strstr(str, "Socket"))
- socket = TRUE;
g_free(str);
}
@@ -1473,50 +1468,6 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
source = FALSE;
if (strstr(str, "Source"))
sink = FALSE;
- if (strstr(str, "Socket"))
- socket = FALSE;
- g_free(str);
- }
-
- /* Don't register any local sep if Socket is disabled */
- if (socket == FALSE)
- goto proceed;
-
- str = g_key_file_get_string(config, "A2DP", "SBCSources", &err);
- if (err) {
- DBG("audio.conf: %s", err->message);
- g_clear_error(&err);
- sbc_srcs = 1;
- } else {
- sbc_srcs = atoi(str);
- g_free(str);
- }
-
- str = g_key_file_get_string(config, "A2DP", "MPEG12Sources", &err);
- if (err) {
- DBG("audio.conf: %s", err->message);
- g_clear_error(&err);
- } else {
- mpeg12_srcs = atoi(str);
- g_free(str);
- }
-
- str = g_key_file_get_string(config, "A2DP", "SBCSinks", &err);
- if (err) {
- DBG("audio.conf: %s", err->message);
- g_clear_error(&err);
- sbc_sinks = 1;
- } else {
- sbc_sinks = atoi(str);
- g_free(str);
- }
-
- str = g_key_file_get_string(config, "A2DP", "MPEG12Sinks", &err);
- if (err) {
- DBG("audio.conf: %s", err->message);
- g_clear_error(&err);
- } else {
- mpeg12_sinks = atoi(str);
g_free(str);
}
@@ -1552,29 +1503,8 @@ proceed:
server->version = 0x0102;
server->source_enabled = source;
- if (source) {
- for (i = 0; i < sbc_srcs; i++)
- a2dp_add_sep(src, AVDTP_SEP_TYPE_SOURCE,
- A2DP_CODEC_SBC, delay_reporting,
- NULL, NULL, NULL, NULL);
- for (i = 0; i < mpeg12_srcs; i++)
- a2dp_add_sep(src, AVDTP_SEP_TYPE_SOURCE,
- A2DP_CODEC_MPEG12, delay_reporting,
- NULL, NULL, NULL, NULL);
- }
server->sink_enabled = sink;
- if (sink) {
- for (i = 0; i < sbc_sinks; i++)
- a2dp_add_sep(src, AVDTP_SEP_TYPE_SINK,
- A2DP_CODEC_SBC, delay_reporting,
- NULL, NULL, NULL, NULL);
-
- for (i = 0; i < mpeg12_sinks; i++)
- a2dp_add_sep(src, AVDTP_SEP_TYPE_SINK,
- A2DP_CODEC_MPEG12, delay_reporting,
- NULL, NULL, NULL, NULL);
- }
return 0;
}
diff --git a/audio/audio.conf b/audio/audio.conf
index df47418..290c36f 100644
--- a/audio/audio.conf
+++ b/audio/audio.conf
@@ -43,8 +43,3 @@ MaxConnected=1
# scan type changed to interlaced. Such allows faster connection initiated
# by a headset.
FastConnectable=false
-
-# Just an example of potential config options for the other interfaces
-#[A2DP]
-#SBCSources=1
-#MPEG12Sources=0
--
1.7.10.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH BlueZ 5/5] audio: Remove remaining references to Socket
2012-06-14 13:41 [PATCH BlueZ 1/5] audio: Remove unix socket support Luiz Augusto von Dentz
` (2 preceding siblings ...)
2012-06-14 13:41 ` [PATCH BlueZ 4/5] audio: Remove local A2DP endpoints options Luiz Augusto von Dentz
@ 2012-06-14 13:41 ` Luiz Augusto von Dentz
3 siblings, 0 replies; 8+ messages in thread
From: Luiz Augusto von Dentz @ 2012-06-14 13:41 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
audio/audio.conf | 2 +-
audio/manager.c | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/audio/audio.conf b/audio/audio.conf
index 290c36f..393cf85 100644
--- a/audio/audio.conf
+++ b/audio/audio.conf
@@ -9,7 +9,7 @@
# If we want to disable support for specific services
# Defaults to supporting all implemented services
-#Disable=Gateway,Source,Socket
+#Disable=Gateway,Source
# SCO routing. Either PCM or HCI (in which case audio is routed to/from ALSA)
# Defaults to HCI
diff --git a/audio/manager.c b/audio/manager.c
index faa48de..c242094 100644
--- a/audio/manager.c
+++ b/audio/manager.c
@@ -113,7 +113,6 @@ static struct enabled_interfaces enabled = {
.sink = TRUE,
.source = FALSE,
.control = TRUE,
- .socket = FALSE,
.media = TRUE,
};
@@ -1182,8 +1181,6 @@ int audio_manager_init(DBusConnection *conn, GKeyFile *conf,
enabled.source = TRUE;
else if (g_str_equal(list[i], "Control"))
enabled.control = TRUE;
- else if (g_str_equal(list[i], "Socket"))
- enabled.socket = TRUE;
else if (g_str_equal(list[i], "Media"))
enabled.media = TRUE;
@@ -1203,8 +1200,6 @@ int audio_manager_init(DBusConnection *conn, GKeyFile *conf,
enabled.source = FALSE;
else if (g_str_equal(list[i], "Control"))
enabled.control = FALSE;
- else if (g_str_equal(list[i], "Socket"))
- enabled.socket = FALSE;
else if (g_str_equal(list[i], "Media"))
enabled.media = FALSE;
}
--
1.7.10.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH BlueZ 4/5] audio: Remove local A2DP endpoints options
2012-06-14 13:41 ` [PATCH BlueZ 4/5] audio: Remove local A2DP endpoints options Luiz Augusto von Dentz
@ 2012-06-14 13:47 ` Gustavo Padovan
2012-06-14 13:48 ` Gustavo Padovan
2012-06-14 13:48 ` Luiz Augusto von Dentz
0 siblings, 2 replies; 8+ messages in thread
From: Gustavo Padovan @ 2012-06-14 13:47 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: linux-bluetooth
Hi Luiz,
* Luiz Augusto von Dentz <luiz.dentz@gmail.com> [2012-06-14 16:41:09 +0300]:
> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
>
> The local endpoints are no use without the internal IPC.
> ---
> audio/a2dp.c | 72 +-----------------------------------------------------
> audio/audio.conf | 5 ----
> 2 files changed, 1 insertion(+), 76 deletions(-)
>
> diff --git a/audio/a2dp.c b/audio/a2dp.c
> index 96137e4..094476e 100644
> --- a/audio/a2dp.c
> +++ b/audio/a2dp.c
> @@ -1436,13 +1436,10 @@ static struct a2dp_server *find_server(GSList *list, const bdaddr_t *src)
>
> int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
> {
> - int sbc_srcs = 0, sbc_sinks = 0;
> - int mpeg12_srcs = 0, mpeg12_sinks = 0;
> - gboolean source = TRUE, sink = FALSE, socket = FALSE;
> + gboolean source = TRUE, sink = FALSE;
You need to remove 'Socket' from
#Disable=Gateway,Source,Socket
On audio.conf too.
Gustavo
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH BlueZ 4/5] audio: Remove local A2DP endpoints options
2012-06-14 13:47 ` Gustavo Padovan
@ 2012-06-14 13:48 ` Gustavo Padovan
2012-06-14 13:48 ` Luiz Augusto von Dentz
1 sibling, 0 replies; 8+ messages in thread
From: Gustavo Padovan @ 2012-06-14 13:48 UTC (permalink / raw)
To: Luiz Augusto von Dentz, linux-bluetooth
* Gustavo Padovan <gustavo@padovan.org> [2012-06-14 10:47:33 -0300]:
> Hi Luiz,
>
> * Luiz Augusto von Dentz <luiz.dentz@gmail.com> [2012-06-14 16:41:09 +0300]:
>
> > From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> >
> > The local endpoints are no use without the internal IPC.
> > ---
> > audio/a2dp.c | 72 +-----------------------------------------------------
> > audio/audio.conf | 5 ----
> > 2 files changed, 1 insertion(+), 76 deletions(-)
> >
> > diff --git a/audio/a2dp.c b/audio/a2dp.c
> > index 96137e4..094476e 100644
> > --- a/audio/a2dp.c
> > +++ b/audio/a2dp.c
> > @@ -1436,13 +1436,10 @@ static struct a2dp_server *find_server(GSList *list, const bdaddr_t *src)
> >
> > int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
> > {
> > - int sbc_srcs = 0, sbc_sinks = 0;
> > - int mpeg12_srcs = 0, mpeg12_sinks = 0;
> > - gboolean source = TRUE, sink = FALSE, socket = FALSE;
> > + gboolean source = TRUE, sink = FALSE;
>
> You need to remove 'Socket' from
>
> #Disable=Gateway,Source,Socket
>
> On audio.conf too.
The following patch do this, forget about this comment.
Gustavo
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH BlueZ 4/5] audio: Remove local A2DP endpoints options
2012-06-14 13:47 ` Gustavo Padovan
2012-06-14 13:48 ` Gustavo Padovan
@ 2012-06-14 13:48 ` Luiz Augusto von Dentz
1 sibling, 0 replies; 8+ messages in thread
From: Luiz Augusto von Dentz @ 2012-06-14 13:48 UTC (permalink / raw)
To: Gustavo Padovan, Luiz Augusto von Dentz, linux-bluetooth
Hi,
On Thu, Jun 14, 2012 at 4:47 PM, Gustavo Padovan <gustavo@padovan.org> wrote:
> Hi Luiz,
>
> * Luiz Augusto von Dentz <luiz.dentz@gmail.com> [2012-06-14 16:41:09 +0300]:
>
>> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
>>
>> The local endpoints are no use without the internal IPC.
>> ---
>> audio/a2dp.c | 72 +-----------------------------------------------------
>> audio/audio.conf | 5 ----
>> 2 files changed, 1 insertion(+), 76 deletions(-)
>>
>> diff --git a/audio/a2dp.c b/audio/a2dp.c
>> index 96137e4..094476e 100644
>> --- a/audio/a2dp.c
>> +++ b/audio/a2dp.c
>> @@ -1436,13 +1436,10 @@ static struct a2dp_server *find_server(GSList *list, const bdaddr_t *src)
>>
>> int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
>> {
>> - int sbc_srcs = 0, sbc_sinks = 0;
>> - int mpeg12_srcs = 0, mpeg12_sinks = 0;
>> - gboolean source = TRUE, sink = FALSE, socket = FALSE;
>> + gboolean source = TRUE, sink = FALSE;
>
> You need to remove 'Socket' from
>
> #Disable=Gateway,Source,Socket
>
> On audio.conf too.
It is removed on 5/5
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-06-14 13:48 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-14 13:41 [PATCH BlueZ 1/5] audio: Remove unix socket support Luiz Augusto von Dentz
2012-06-14 13:41 ` [PATCH BlueZ 2/5] audio: Remove ALSA support Luiz Augusto von Dentz
2012-06-14 13:41 ` =?y?q?=5BPATCH=20BlueZ=203/5=5D=20audio=3A=20Remove=20internal=20audio=20IPC?= Luiz Augusto von Dentz
2012-06-14 13:41 ` [PATCH BlueZ 4/5] audio: Remove local A2DP endpoints options Luiz Augusto von Dentz
2012-06-14 13:47 ` Gustavo Padovan
2012-06-14 13:48 ` Gustavo Padovan
2012-06-14 13:48 ` Luiz Augusto von Dentz
2012-06-14 13:41 ` [PATCH BlueZ 5/5] audio: Remove remaining references to Socket Luiz Augusto von Dentz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox