summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-10-19 20:16:08 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-10-20 10:10:50 +0000
commit2afcd6e1b9ddceaf55f4b716c5ac05d88a53c496 (patch)
tree14ac7243332d9ffb6d28c50aa344153bc7ef61db
parentd6e4f86c28b28bed684b9d79fbb4598163e6c2ce (diff)
Fix a wrong g_object_set() call on 32 bit platforms
The max-size-time property of GstQueue expects a 64 bit value. Passing in a 32 bit value on 32 bit platforms would lead to the following nullptr to get mangled in there leading to bad errors. Fixes: QTBUG-97379 Change-Id: I24c4f6081b5d7eaa6c70d946b5aa9e0a12266da4 Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 77e7a763ea4ae3e9e3191e0f05fd0bbaf9b090bc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/multimedia/platform/gstreamer/common/qgstreamervideooutput.cpp6
-rw-r--r--src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/multimedia/platform/gstreamer/common/qgstreamervideooutput.cpp b/src/multimedia/platform/gstreamer/common/qgstreamervideooutput.cpp
index 56cf0a9a4..81fefdfe3 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreamervideooutput.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreamervideooutput.cpp
@@ -161,9 +161,9 @@ void QGstreamerVideoOutput::setIsPreview()
// also avoids blocking the queue in case we have an encodebin attached to the tee as well
videoQueue.set("leaky", 2 /*downstream*/);
videoQueue.set("silent", true);
- videoQueue.set("max-size-buffers", 1);
- videoQueue.set("max-size-bytes", 0);
- videoQueue.set("max-size-time", 0);
+ videoQueue.set("max-size-buffers", uint(1));
+ videoQueue.set("max-size-bytes", uint(0));
+ videoQueue.set("max-size-time", quint64(0));
}
void QGstreamerVideoOutput::flushSubtitles()
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture.cpp
index 1afa5fee1..157bf25a3 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture.cpp
@@ -66,9 +66,9 @@ QGstreamerImageCapture::QGstreamerImageCapture(QImageCapture *parent)
// configures the queue to be fast, lightweight and non blocking
queue.set("leaky", 2 /*downstream*/);
queue.set("silent", true);
- queue.set("max-size-buffers", 1);
- queue.set("max-size-bytes", 0);
- queue.set("max-size-time", 0);
+ queue.set("max-size-buffers", uint(1));
+ queue.set("max-size-bytes", uint(0));
+ queue.set("max-size-time", quint64(0));
videoConvert = QGstElement("videoconvert", "imageCaptureConvert");
encoder = QGstElement("jpegenc", "jpegEncoder");