Merge remote-tracking branch 'origin/5.13' into 5.14

 Conflicts:
	src/gsttools/qgstvideorenderersink.cpp
	src/gsttools/qgstvideorenderersink_p.h

Change-Id: I7fe29161d568fa3f7688abfd2f993d1b16ac3fb9

6 files changed, 21 insertions, 29 deletions

diff --git a/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp b/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp
index 46b9e4616..5b0c0d234 100644
--- a/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp
@@ -146,7 +146,7 @@ QVariant CameraBinV4LImageProcessing::parameter(
     qt_safe_close(fd);
 
     if (!ret) {
-        qWarning() << "Unable to get the parameter value:" << qt_error_string(errno);
+        qWarning() << "Unable to get the parameter value:" << parameter << ":" << qt_error_string(errno);
         return QVariant();
     }
 
@@ -229,7 +229,7 @@ void CameraBinV4LImageProcessing::setParameter(
     }
 
     if (::ioctl(fd, VIDIOC_S_CTRL, &control) != 0)
-        qWarning() << "Unable to set the parameter value:" << qt_error_string(errno);
+        qWarning() << "Unable to set the parameter value:" << parameter << ":" << qt_error_string(errno);
 
     qt_safe_close(fd);
 }
@@ -266,7 +266,8 @@ void CameraBinV4LImageProcessing::updateParametersInfo(
             queryControl.id = supportedParametersEntries[i].cid;
 
             if (::ioctl(fd, VIDIOC_QUERYCTRL, &queryControl) != 0) {
-                qWarning() << "Unable to query the parameter info:" << qt_error_string(errno);
+                qWarning() << "Unable to query the parameter info:" << supportedParametersEntries[i].parameter
+                    << ":" << qt_error_string(errno);
                 continue;
             }
 
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreameravailabilitycontrol.h b/src/plugins/gstreamer/mediaplayer/qgstreameravailabilitycontrol.h
index 78299b608..e100fccc8 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreameravailabilitycontrol.h
+++ b/src/plugins/gstreamer/mediaplayer/qgstreameravailabilitycontrol.h
@@ -57,7 +57,7 @@ private Q_SLOTS:
     void handleAvailabilityChanged();
 
 private:
-    QMediaPlayerResourceSetInterface *m_resources;
+    QMediaPlayerResourceSetInterface *m_resources = nullptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h
index bf8f7e842..691453a42 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h
@@ -63,7 +63,7 @@ private slots:
     void updateTags();
 
 private:
-    QGstreamerPlayerSession *m_session;
+    QGstreamerPlayerSession *m_session = nullptr;
     QVariantMap m_tags;
 };
 
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp
index a28968145..4bf4a0a57 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp
@@ -67,17 +67,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QGstreamerPlayerService::QGstreamerPlayerService(QObject *parent):
-     QMediaService(parent)
-     , m_audioProbeControl(0)
-     , m_videoProbeControl(0)
-     , m_videoOutput(0)
-     , m_videoRenderer(0)
-     , m_videoWindow(0)
-#if defined(HAVE_WIDGETS)
-     , m_videoWidget(0)
-#endif
-     , m_videoReferenceCount(0)
+QGstreamerPlayerService::QGstreamerPlayerService(QObject *parent)
+    : QMediaService(parent)
 {
     m_session = new QGstreamerPlayerSession(this);
     m_control = new QGstreamerPlayerControl(m_session, this);
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h
index ec0c0944b..f88f0ae38 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h
@@ -73,25 +73,25 @@ public:
     void releaseControl(QMediaControl *control) override;
 
 private:
-    QGstreamerPlayerControl *m_control;
-    QGstreamerPlayerSession *m_session;
-    QGstreamerMetaDataProvider *m_metaData;
-    QGstreamerStreamsControl *m_streamsControl;
-    QGStreamerAvailabilityControl *m_availabilityControl;
+    QGstreamerPlayerControl *m_control = nullptr;
+    QGstreamerPlayerSession *m_session = nullptr;
+    QGstreamerMetaDataProvider *m_metaData = nullptr;
+    QGstreamerStreamsControl *m_streamsControl = nullptr;
+    QGStreamerAvailabilityControl *m_availabilityControl = nullptr;
 
-    QGstreamerAudioProbeControl *m_audioProbeControl;
-    QGstreamerVideoProbeControl *m_videoProbeControl;
+    QGstreamerAudioProbeControl *m_audioProbeControl = nullptr;
+    QGstreamerVideoProbeControl *m_videoProbeControl = nullptr;
 
-    QMediaControl *m_videoOutput;
-    QMediaControl *m_videoRenderer;
-    QGstreamerVideoWindow *m_videoWindow;
+    QMediaControl *m_videoOutput = nullptr;
+    QMediaControl *m_videoRenderer = nullptr;
+    QGstreamerVideoWindow *m_videoWindow = nullptr;
 #if defined(HAVE_WIDGETS)
-    QGstreamerVideoWidgetControl *m_videoWidget;
+    QGstreamerVideoWidgetControl *m_videoWidget = nullptr;
 #endif
 
     void increaseVideoRef();
     void decreaseVideoRef();
-    int m_videoReferenceCount;
+    int m_videoReferenceCount = 0;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h b/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h
index 6f332c160..41932095c 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h
@@ -62,7 +62,7 @@ public:
     void setActive(int streamNumber, bool state) override;
 
 private:
-    QGstreamerPlayerSession *m_session;
+    QGstreamerPlayerSession *m_session = nullptr;
 };
 
 QT_END_NAMESPACE