[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v1.0-dev-48-g8c0e3ef

[Colin Guthrie]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  26c64fb54e3376564a76c4bfbd9f56b110d58c30 (commit)

- Log -----------------------------------------------------------------
8c0e3ef Merge commit 'e4979ab5cff84ef64c88bba3a1b6b4c5e02f7777'
e4979ab bluetooth: detect when bitpool has changed on sbc codec
96338ee bluetooth: fix build for libdbus < 1.3
07eea95 bluetooth: fix case of profile UUIDs to match what BlueZ uses
-----------------------------------------------------------------------

Summary of changes:
 src/modules/bluetooth/bluetooth-util.c |    2 ++
 src/modules/bluetooth/bluetooth-util.h |   16 ++++++++--------
 src/modules/bluetooth/sbc.c            |    8 ++++++--
 3 files changed, 16 insertions(+), 10 deletions(-)

-----------------------------------------------------------------------

commit 07eea95dc100e9494fc3af2298488af14f394c9c
Author: Luiz Augusto von Dentz <luiz.dentz-von at nokia.com>
Date:   Wed Nov 3 14:44:28 2010 +0200

    bluetooth: fix case of profile UUIDs to match what BlueZ uses

diff --git a/src/modules/bluetooth/bluetooth-util.h b/src/modules/bluetooth/bluetooth-util.h
index ce55196..f141209 100644
--- a/src/modules/bluetooth/bluetooth-util.h
+++ b/src/modules/bluetooth/bluetooth-util.h
@@ -30,18 +30,18 @@
 #include <pulsecore/core-util.h>
 
 /* UUID copied from bluez/audio/device.h */
-#define GENERIC_AUDIO_UUID      "00001203-0000-1000-8000-00805F9B34FB"
+#define GENERIC_AUDIO_UUID      "00001203-0000-1000-8000-00805f9b34fb"
 
-#define HSP_HS_UUID             "00001108-0000-1000-8000-00805F9B34FB"
-#define HSP_AG_UUID             "00001112-0000-1000-8000-00805F9B34FB"
+#define HSP_HS_UUID             "00001108-0000-1000-8000-00805f9b34fb"
+#define HSP_AG_UUID             "00001112-0000-1000-8000-00805f9b34fb"
 
-#define HFP_HS_UUID             "0000111E-0000-1000-8000-00805F9B34FB"
-#define HFP_AG_UUID             "0000111F-0000-1000-8000-00805F9B34FB"
+#define HFP_HS_UUID             "0000111e-0000-1000-8000-00805f9b34fb"
+#define HFP_AG_UUID             "0000111f-0000-1000-8000-00805f9b34fb"
 
-#define ADVANCED_AUDIO_UUID     "0000110D-0000-1000-8000-00805F9B34FB"
+#define ADVANCED_AUDIO_UUID     "0000110d-0000-1000-8000-00805f9b34fb"
 
-#define A2DP_SOURCE_UUID        "0000110A-0000-1000-8000-00805F9B34FB"
-#define A2DP_SINK_UUID          "0000110B-0000-1000-8000-00805F9B34FB"
+#define A2DP_SOURCE_UUID        "0000110a-0000-1000-8000-00805f9b34fb"
+#define A2DP_SINK_UUID          "0000110b-0000-1000-8000-00805f9b34fb"
 
 typedef struct pa_bluetooth_uuid pa_bluetooth_uuid;
 typedef struct pa_bluetooth_device pa_bluetooth_device;

commit 96338eec28ce9af97965a177eeecd6daebd208f5
Author: Luiz Augusto von Dentz <luiz.dentz-von at nokia.com>
Date:   Mon Nov 8 14:37:37 2010 +0200

    bluetooth: fix build for libdbus < 1.3

diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c
index 5354520..47e0fd5 100644
--- a/src/modules/bluetooth/bluetooth-util.c
+++ b/src/modules/bluetooth/bluetooth-util.c
@@ -955,12 +955,14 @@ int pa_bluetooth_transport_acquire(const pa_bluetooth_transport *t, const char *
         return -1;
     }
 
+#ifdef DBUS_TYPE_UNIX_FD
     if (!dbus_message_get_args(r, &err, DBUS_TYPE_UNIX_FD, &ret, DBUS_TYPE_INVALID)) {
         pa_log("Failed to parse org.bluez.MediaTransport.Acquire(): %s", err.message);
         ret = -1;
         dbus_error_free(&err);
         goto fail;
     }
+#endif
 
 fail:
     dbus_message_unref(r);

commit e4979ab5cff84ef64c88bba3a1b6b4c5e02f7777
Author: Luiz Augusto von Dentz <luiz.dentz-von at nokia.com>
Date:   Thu Dec 23 13:13:28 2010 +0200

    bluetooth: detect when bitpool has changed on sbc codec
    
    A2DP spec allow bitpool changes midstream which is why sbc configuration
    has a range of values for bitpool that the encoder can use and decoder
    must support.
    
    Bitpool changes do not affect the state of encoder/decoder so they don't
    need to be reinitialize when this happens, so the impact is fairly small,
    what it does change is the frame length so encoders may change the
    bitpool to use the link more efficiently.

diff --git a/src/modules/bluetooth/sbc.c b/src/modules/bluetooth/sbc.c
index 779be4b..5157c70 100644
--- a/src/modules/bluetooth/sbc.c
+++ b/src/modules/bluetooth/sbc.c
@@ -1005,7 +1005,8 @@ ssize_t sbc_decode(sbc_t *sbc, const void *input, size_t input_len,
 
 		priv->frame.codesize = sbc_get_codesize(sbc);
 		priv->frame.length = framelen;
-	}
+	} else if (priv->frame.bitpool != sbc->bitpool)
+		sbc->bitpool = priv->frame.bitpool;
 
 	if (!output)
 		return framelen;
@@ -1076,6 +1077,9 @@ ssize_t sbc_encode(sbc_t *sbc, const void *input, size_t input_len,
 
 		sbc_encoder_init(&priv->enc_state, &priv->frame);
 		priv->init = 1;
+	} else if (priv->frame.bitpool != sbc->bitpool) {
+		priv->frame.length = sbc_get_frame_length(sbc);
+		priv->frame.bitpool = sbc->bitpool;
 	}
 
 	/* input must be large enough to encode a complete frame */
@@ -1140,7 +1144,7 @@ size_t sbc_get_frame_length(sbc_t *sbc)
 	struct sbc_priv *priv;
 
 	priv = sbc->priv;
-	if (priv->init)
+	if (priv->init && priv->frame.bitpool == sbc->bitpool)
 		return priv->frame.length;
 
 	subbands = sbc->subbands ? 8 : 4;

commit 8c0e3efbf8fcd500048b1c1b21d21a4ea8c09fd3
Merge: 26c64fb e4979ab
Author: Colin Guthrie <cguthrie at mandriva.org>
Date:   Mon Jan 17 22:19:10 2011 +0000

    Merge commit 'e4979ab5cff84ef64c88bba3a1b6b4c5e02f7777'


-- 
hooks/post-receive
PulseAudio Sound Server