summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Rafael Giani <crg7475@mailbox.org>2023-05-15 13:47:16 +0200
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>2023-05-17 09:27:04 +0000
commitc932134637dbf02af7db88c598e8dc95cdab7dc0 (patch)
tree435039177abed0026dd19d2e36f5cea1246eedeb
parent556449a9177b86b755840118ea6eedcd649b8732 (diff)
downloadgstreamer-c932134637dbf02af7db88c598e8dc95cdab7dc0.tar.gz
avdtputil: Use int instead of int range for fixed bitpool values
Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1698 Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4655>
-rw-r--r--subprojects/gst-plugins-bad/sys/bluez/gstavdtputil.c20
1 files 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);