From c932134637dbf02af7db88c598e8dc95cdab7dc0 Mon Sep 17 00:00:00 2001 From: Carlos Rafael Giani Date: Mon, 15 May 2023 13:47:16 +0200 Subject: avdtputil: Use int instead of int range for fixed bitpool values Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1698 Part-of: --- subprojects/gst-plugins-bad/sys/bluez/gstavdtputil.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/subprojects/gst-plugins-bad/sys/bluez/gstavdtputil.c b/subprojects/gst-plugins-bad/sys/bluez/gstavdtputil.c index 5bf135fb6b..9897a0910b 100644 --- a/subprojects/gst-plugins-bad/sys/bluez/gstavdtputil.c +++ b/subprojects/gst-plugins-bad/sys/bluez/gstavdtputil.c @@ -372,10 +372,22 @@ gst_avdtp_util_parse_sbc_raw (void *config) g_value_reset (list); /* 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)); + /* The reported bitpool can be a fixed value instead + * of a range, but GStreamer ranges do not allow for + * the min == max case, so use int as value in such + * cases instead. The bitpool value is used by + * sbcenc, sbcdec, rtpsbcpay, and all of them use + * a fixated version of that value, so there is no + * problem with int vs. int-range type mismatches. */ + if (sbc->min_bitpool == sbc->max_bitpool) { + value = g_value_init (value, G_TYPE_INT); + g_value_set_int (value, MIN (sbc->max_bitpool, TEMPLATE_MAX_BITPOOL)); + } else { + 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); -- cgit v1.2.1