summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Palus <jpalus@fastmail.com>2022-06-17 14:36:36 +0200
committerTanu Kaskinen <tanuk@iki.fi>2022-06-20 14:02:29 +0300
commite4d54dae918da447705cd2cd6c61e65e86658aa2 (patch)
tree03a96977f7493f3d96798ef747fc9eb05f9b4260
parent0e896eb51812dbee2076193145ca47516d243f4d (diff)
downloadpulseaudio-e4d54dae918da447705cd2cd6c61e65e86658aa2.tar.gz
bluetooth/gst: Correct var type for GST_TYPE_BITMASK
GST_TYPE_BITMASK is 64-bit bit mask while corresponding channel_mask in pulseaudio is int therefore usually 32-bit. Switch to uint64_t instead to match internal representation in gstreamer. Fixes pulseaudio crash on ARM 32-bit when pulseaudio is compiled with gstreamer and either LDAC or aptX support is available. Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/723>
-rw-r--r--src/modules/bluetooth/a2dp-codec-gst.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/bluetooth/a2dp-codec-gst.c b/src/modules/bluetooth/a2dp-codec-gst.c
index 8ef74be9c..11839c580 100644
--- a/src/modules/bluetooth/a2dp-codec-gst.c
+++ b/src/modules/bluetooth/a2dp-codec-gst.c
@@ -22,6 +22,7 @@
#endif
#include <arpa/inet.h>
+#include <stdint.h>
#include <pulsecore/log.h>
#include <pulsecore/macro.h>
@@ -82,7 +83,7 @@ fail:
static GstCaps *gst_create_caps_from_sample_spec(const pa_sample_spec *ss) {
gchar *sample_format;
GstCaps *caps;
- int channel_mask;
+ uint64_t channel_mask;
switch (ss->format) {
case PA_SAMPLE_S16LE: