8 files changed, 22 insertions, 45 deletions
diff --git a/src/plugins/directshow/camera/dscameracontrol.cpp b/src/plugins/directshow/camera/dscameracontrol.cpp
index 67971d1b5..3f60ec848 100644
--- a/src/plugins/directshow/camera/dscameracontrol.cpp
+++ b/src/plugins/directshow/camera/dscameracontrol.cpp
@@ -47,8 +47,6 @@ QT_BEGIN_NAMESPACE
 
 DSCameraControl::DSCameraControl(QObject *parent)
     : QCameraControl(parent)
-    , m_state(QCamera::UnloadedState)
-    , m_captureMode(QCamera::CaptureStillImage)
 {
     m_session = qobject_cast<DSCameraSession*>(parent);
     connect(m_session, &DSCameraSession::statusChanged, this,
diff --git a/src/plugins/directshow/camera/dscameracontrol.h b/src/plugins/directshow/camera/dscameracontrol.h
index b9fb2766d..2ad737008 100644
--- a/src/plugins/directshow/camera/dscameracontrol.h
+++ b/src/plugins/directshow/camera/dscameracontrol.h
@@ -69,8 +69,8 @@ public:
 
 private:
     DSCameraSession *m_session;
-    QCamera::State m_state;
-    QCamera::CaptureModes m_captureMode;
+    QCamera::State m_state = QCamera::UnloadedState;
+    QCamera::CaptureModes m_captureMode = QCamera::CaptureStillImage;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/directshow/camera/dscameraservice.cpp b/src/plugins/directshow/camera/dscameraservice.cpp
index 8115ef385..bb1691c20 100644
--- a/src/plugins/directshow/camera/dscameraservice.cpp
+++ b/src/plugins/directshow/camera/dscameraservice.cpp
@@ -62,14 +62,12 @@ DSCameraService::DSCameraService(QObject *parent):
   , m_session(new DSCameraSession(this))
   , m_control(new DSCameraControl(m_session))
   , m_videoDevice(new DSVideoDeviceControl(m_session))
-  , m_videoRenderer(0)
   , m_imageCapture(new DSImageCaptureControl(m_session))
   , m_viewfinderSettings(new DSCameraViewfinderSettingsControl(m_session))
   , m_imageProcessingControl(new DSCameraImageProcessingControl(m_session))
   , m_exposureControl(new DirectShowCameraExposureControl(m_session))
   , m_captureDestinationControl(new DirectShowCameraCaptureDestinationControl(m_session))
   , m_captureBufferFormatControl(new DirectShowCameraCaptureBufferFormatControl)
-  , m_videoProbeControl(nullptr)
   , m_zoomControl(new DirectShowCameraZoomControl(m_session))
   , m_imageEncoderControl(new DirectShowCameraImageEncoderControl(m_session))
 {
diff --git a/src/plugins/directshow/camera/dscameraservice.h b/src/plugins/directshow/camera/dscameraservice.h
index 9a8f745f6..239a9b55e 100644
--- a/src/plugins/directshow/camera/dscameraservice.h
+++ b/src/plugins/directshow/camera/dscameraservice.h
@@ -74,14 +74,14 @@ private:
     DSCameraSession        *m_session;
     DSCameraControl        *m_control;
     DSVideoDeviceControl   *m_videoDevice;
-    QMediaControl          *m_videoRenderer;
+    QMediaControl          *m_videoRenderer = nullptr;
     DSImageCaptureControl  *m_imageCapture;
     DSCameraViewfinderSettingsControl *m_viewfinderSettings;
     DSCameraImageProcessingControl *m_imageProcessingControl;
     DirectShowCameraExposureControl *m_exposureControl;
     DirectShowCameraCaptureDestinationControl *m_captureDestinationControl;
     DirectShowCameraCaptureBufferFormatControl *m_captureBufferFormatControl;
-    DirectShowVideoProbeControl *m_videoProbeControl;
+    DirectShowVideoProbeControl *m_videoProbeControl = nullptr;
     DirectShowCameraZoomControl *m_zoomControl;
     DirectShowCameraImageEncoderControl *m_imageEncoderControl;
 };
diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp
index 4c9100282..c3fa8d226 100644
--- a/src/plugins/directshow/camera/dscamerasession.cpp
+++ b/src/plugins/directshow/camera/dscamerasession.cpp
@@ -58,23 +58,6 @@ QT_BEGIN_NAMESPACE
 
 DSCameraSession::DSCameraSession(QObject *parent)
     : QObject(parent)
-    , m_graphBuilder(nullptr)
-    , m_filterGraph(nullptr)
-    , m_sourceDeviceName(QLatin1String("default"))
-    , m_sourceFilter(nullptr)
-    , m_needsHorizontalMirroring(false)
-    , m_previewSampleGrabber(nullptr)
-    , m_nullRendererFilter(nullptr)
-    , m_previewStarted(false)
-    , m_surface(nullptr)
-    , m_previewPixelFormat(QVideoFrame::Format_Invalid)
-    , m_stride(-1)
-    , m_readyForCapture(false)
-    , m_imageIdCounter(0)
-    , m_currentImageId(-1)
-    , m_captureDestinations(QCameraImageCapture::CaptureToFile)
-    , m_videoProbeControl(nullptr)
-    , m_status(QCamera::UnloadedStatus)
 {
     connect(this, SIGNAL(statusChanged(QCamera::Status)),
             this, SLOT(updateReadyForCapture()));
diff --git a/src/plugins/directshow/camera/dscamerasession.h b/src/plugins/directshow/camera/dscamerasession.h
index 18fc0cca7..a19345777 100644
--- a/src/plugins/directshow/camera/dscamerasession.h
+++ b/src/plugins/directshow/camera/dscamerasession.h
@@ -185,49 +185,48 @@ private:
     QMutex m_presentMutex;
     QMutex m_captureMutex;
 
-    // Capture Graph
-    ICaptureGraphBuilder2* m_graphBuilder;
-    IGraphBuilder* m_filterGraph;
+    ICaptureGraphBuilder2* m_graphBuilder = nullptr;
+    IGraphBuilder* m_filterGraph = nullptr;
 
     // Source (camera)
-    QString m_sourceDeviceName;
-    IBaseFilter* m_sourceFilter;
-    bool m_needsHorizontalMirroring;
+    QString m_sourceDeviceName = QLatin1String("default");
+    IBaseFilter* m_sourceFilter = nullptr;
+    bool m_needsHorizontalMirroring = false;
     QList<DirectShowMediaType> m_supportedFormats;
     QList<QCameraViewfinderSettings> m_supportedViewfinderSettings;
     DirectShowMediaType m_sourceFormat;
     QMap<QCameraImageProcessingControl::ProcessingParameter, ImageProcessingParameterInfo> m_imageProcessingParametersInfos;
 
     // Preview
-    DirectShowSampleGrabber *m_previewSampleGrabber;
-    IBaseFilter *m_nullRendererFilter;
+    DirectShowSampleGrabber *m_previewSampleGrabber = nullptr;
+    IBaseFilter *m_nullRendererFilter = nullptr;
     QVideoFrame m_currentFrame;
-    bool m_previewStarted;
-    QAbstractVideoSurface* m_surface;
+    bool m_previewStarted = false;
+    QAbstractVideoSurface* m_surface = nullptr;
     QVideoSurfaceFormat m_previewSurfaceFormat;
-    QVideoFrame::PixelFormat m_previewPixelFormat;
+    QVideoFrame::PixelFormat m_previewPixelFormat = QVideoFrame::Format_RGB32;
     QSize m_previewSize;
-    int m_stride;
+    int m_stride = -1;
     QCameraViewfinderSettings m_viewfinderSettings;
     QCameraViewfinderSettings m_actualViewfinderSettings;
 
     // Image capture
     QString m_imageCaptureFileName;
     QMediaStorageLocation m_fileNameGenerator;
-    bool m_readyForCapture;
-    int m_imageIdCounter;
-    int m_currentImageId;
+    bool m_readyForCapture = false;
+    int m_imageIdCounter = 0;
+    int m_currentImageId = -1;
     QVideoFrame m_capturedFrame;
-    QCameraImageCapture::CaptureDestinations m_captureDestinations;
+    QCameraImageCapture::CaptureDestinations m_captureDestinations = QCameraImageCapture::CaptureToFile;
 
     // Video probe
     QMutex m_probeMutex;
-    DirectShowVideoProbeControl *m_videoProbeControl;
+    DirectShowVideoProbeControl *m_videoProbeControl = nullptr;
 
     QImageEncoderSettings m_imageEncoderSettings;
 
     // Internal state
-    QCamera::Status m_status;
+    QCamera::Status m_status = QCamera::UnloadedStatus;
     QTimer m_deviceLostEventTimer;
 
     QMap<QCameraImageProcessingControl::ProcessingParameter, QVariant> m_pendingImageProcessingParametrs;
diff --git a/src/plugins/directshow/camera/dsvideorenderer.cpp b/src/plugins/directshow/camera/dsvideorenderer.cpp
index bf0aa2684..cde63af65 100644
--- a/src/plugins/directshow/camera/dsvideorenderer.cpp
+++ b/src/plugins/directshow/camera/dsvideorenderer.cpp
@@ -45,7 +45,6 @@ QT_BEGIN_NAMESPACE
 
 DSVideoRendererControl::DSVideoRendererControl(DSCameraSession* session, QObject *parent)
     :QVideoRendererControl(parent),
-    m_surface(0),
     m_session(session)
 {
 }
diff --git a/src/plugins/directshow/camera/dsvideorenderer.h b/src/plugins/directshow/camera/dsvideorenderer.h
index 3a4570b4c..96cf74483 100644
--- a/src/plugins/directshow/camera/dsvideorenderer.h
+++ b/src/plugins/directshow/camera/dsvideorenderer.h
@@ -59,7 +59,7 @@ public:
     void setSession(DSCameraSession* session);
 
 private:
-    QAbstractVideoSurface* m_surface;
+    QAbstractVideoSurface* m_surface = nullptr;
     DSCameraSession* m_session;
 };