summaryrefslogtreecommitdiffstats
path: root/audio/unix.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2007-08-30 00:45:53 +0000
committerMarcel Holtmann <marcel@holtmann.org>2007-08-30 00:45:53 +0000
commit4183300934043b1038c84652848c271a235bc5df (patch)
tree291e4284f9a642672b872d6474dd1fb2e4fc3fbb /audio/unix.c
parent31bd0bed86998f29e89061e5a3b0925c0d2f52a5 (diff)
Disable the broken optional codec parameters setup
Diffstat (limited to 'audio/unix.c')
-rw-r--r--audio/unix.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/audio/unix.c b/audio/unix.c
index 5d049dbc..d980861f 100644
--- a/audio/unix.c
+++ b/audio/unix.c
@@ -405,10 +405,12 @@ static void create_stream(struct device *dev, struct unix_client *client)
goto failed;
}
+ /* FIXME: The provided media_codec breaks bitpool
+ selection. So disable it. This needs fixing */
id = a2dp_source_request_stream(a2dp->session, dev,
TRUE, a2dp_setup_complete,
client, &a2dp->sep,
- client->media_codec);
+ NULL/*client->media_codec*/);
client->cancel_stream = a2dp_source_cancel_stream;
break;
@@ -533,21 +535,18 @@ static int cfg_to_caps(struct ipc_data_cfg *cfg, struct sbc_codec_cap *sbc_cap)
break;
}
- if (sbc->bitpool > 250)
- return -EINVAL;
- else if (sbc->bitpool > 0)
- sbc_cap->min_bitpool = sbc_cap->max_bitpool = sbc->bitpool;
- else {
- sbc->bitpool = 32;
- sbc_cap->min_bitpool = 2;
+ if (sbc->bitpool != 0) {
+ if (sbc->bitpool > 250)
+ return -EINVAL;
+
+ sbc_cap->min_bitpool = sbc->bitpool;
sbc_cap->max_bitpool = sbc->bitpool;
}
return 0;
}
-static void cfg_event(struct unix_client *client, struct ipc_packet *pkt,
- int len)
+static void cfg_event(struct unix_client *client, struct ipc_packet *pkt, int len)
{
struct device *dev;
bdaddr_t bdaddr;