From 8846e6fb9f41bd283dd754a87bb704026f0f12cf Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Sun, 28 Jan 2018 21:26:36 +0100 Subject: GStreamer: fix udpsrc timeout setting The timeout's time unit has changed between 0.10 and 1.0, from microseconds to nanoseconds, but we were always passing the value in microseconds. This would cause an UDP stream to always timeout with GStreamer 1.0. Change-Id: I69786480d29854d3a030f9dbea15c69ee89f3dd5 Reviewed-by: Christian Stromme --- .../gstreamer/mediaplayer/qgstreamerplayersession.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp index cc7aef367..a96da66f8 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 -- cgit v1.2.3 From fb477cdb126848e416845df348ca4031ccc2f87b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 2 Feb 2018 15:12:04 +0100 Subject: Bump version Change-Id: I92c2c4abd8df9bd07949d488dcac44038a70931d --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 4f571fb57..7e0ad0e1b 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.9.4 +MODULE_VERSION = 5.9.5 -- cgit v1.2.3 From c98c346d12b1a6ba99d18059db5b941d6138b081 Mon Sep 17 00:00:00 2001 From: Jochen Seemann Date: Wed, 22 Nov 2017 15:49:25 +0100 Subject: fix typo in QCameraImageProcessing documentation Task-number: QTBUG-55660 Change-Id: I444bef63c0b8d9a9f9fdbce8e3ceabb067c1fe84 Reviewed-by: VaL Doroshchuk Reviewed-by: Christian Stromme --- src/multimedia/camera/qcameraimageprocessing.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp index 91ba1d566..737b74b73 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. -- cgit v1.2.3