summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-02-18 20:57:54 +0100
committerLiang Qi <liang.qi@qt.io>2018-02-18 20:57:54 +0100
commit0354fdda8b430f7749082ca55ad6c1dc781f3918 (patch)
treed480a0b1ba868ea16d5649ca540b97b0e8369077
parent51914a22de1232913f8e4be4468d676b300aed7c (diff)
parentc98c346d12b1a6ba99d18059db5b941d6138b081 (diff)
Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta1
Conflicts: .qmake.conf Change-Id: I2af17ff905c26466fa1ea8b612dff3b505a3d33a
-rw-r--r--src/multimedia/camera/qcameraimageprocessing.cpp2
-rw-r--r--src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp13
2 files changed, 11 insertions, 4 deletions
diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp
index 91ba1d56..737b74b7 100644
--- a/src/multimedia/camera/qcameraimageprocessing.cpp
+++ b/src/multimedia/camera/qcameraimageprocessing.cpp
@@ -314,7 +314,7 @@ qreal QCameraImageProcessing::denoisingLevel() const
/*!
Sets the denoising adjustment \a level.
- Valid sharpening values range between -1.0 and 1.0, with a default of 0.
+ Valid denoising values range between -1.0 and 1.0, with a default of 0.
If the parameter value is set to 0, the amount of denoising applied
is selected by camera and depends on camera capabilities and settings.
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
index cc7aef36..a96da66f 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
@@ -1541,10 +1541,17 @@ void QGstreamerPlayerSession::playbinNotifySource(GObject *o, GParamSpec *p, gpo
//set timeout property to 30 seconds
const int timeout = 30;
if (qstrcmp(G_OBJECT_CLASS_NAME(G_OBJECT_GET_CLASS(source)), "GstUDPSrc") == 0) {
- //udpsrc timeout unit = microsecond
- //The udpsrc is always a live source.
- g_object_set(G_OBJECT(source), "timeout", G_GUINT64_CONSTANT(timeout*1000000), NULL);
+ quint64 convertedTimeout = timeout;
+#if GST_CHECK_VERSION(1,0,0)
+ // Gst 1.x -> nanosecond
+ convertedTimeout *= 1000000000;
+#else
+ // Gst 0.10 -> microsecond
+ convertedTimeout *= 1000000;
+#endif
+ g_object_set(G_OBJECT(source), "timeout", convertedTimeout, NULL);
self->m_sourceType = UDPSrc;
+ //The udpsrc is always a live source.
self->m_isLiveSource = true;
} else if (qstrcmp(G_OBJECT_CLASS_NAME(G_OBJECT_GET_CLASS(source)), "GstSoupHTTPSrc") == 0) {
//souphttpsrc timeout unit = second