diff options
30 files changed, 116 insertions, 207 deletions
diff --git a/src/gsttools/qgstappsrc.cpp b/src/gsttools/qgstappsrc.cpp index 823f95655..3e8b8b9b3 100644 --- a/src/gsttools/qgstappsrc.cpp +++ b/src/gsttools/qgstappsrc.cpp @@ -42,15 +42,7 @@ #include "qgstappsrc_p.h" QGstAppSrc::QGstAppSrc(QObject *parent) - :QObject(parent) - ,m_stream(0) - ,m_appSrc(0) - ,m_sequential(false) - ,m_maxBytes(0) - ,m_dataRequestSize(~0) - ,m_dataRequested(false) - ,m_enoughData(false) - ,m_forceData(false) + : QObject(parent) { m_callbacks.need_data = &QGstAppSrc::on_need_data; m_callbacks.enough_data = &QGstAppSrc::on_enough_data; diff --git a/src/gsttools/qgstappsrc_p.h b/src/gsttools/qgstappsrc_p.h index c7e87037d..c1c8cdabe 100644 --- a/src/gsttools/qgstappsrc_p.h +++ b/src/gsttools/qgstappsrc_p.h @@ -104,16 +104,16 @@ private: void sendEOS(); - QIODevice *m_stream; - GstAppSrc *m_appSrc; - bool m_sequential; - GstAppStreamType m_streamType; + QIODevice *m_stream = nullptr; + GstAppSrc *m_appSrc = nullptr; + bool m_sequential = false; + GstAppStreamType m_streamType = GST_APP_STREAM_TYPE_RANDOM_ACCESS; GstAppSrcCallbacks m_callbacks; - qint64 m_maxBytes; - unsigned int m_dataRequestSize; - bool m_dataRequested; - bool m_enoughData; - bool m_forceData; + qint64 m_maxBytes = 0; + unsigned int m_dataRequestSize = ~0; + bool m_dataRequested = false; + bool m_enoughData = false; + bool m_forceData = false; }; QT_END_NAMESPACE diff --git a/src/gsttools/qgstreamerbufferprobe.cpp b/src/gsttools/qgstreamerbufferprobe.cpp index f420290ce..d95de4c63 100644 --- a/src/gsttools/qgstreamerbufferprobe.cpp +++ b/src/gsttools/qgstreamerbufferprobe.cpp @@ -43,13 +43,7 @@ QT_BEGIN_NAMESPACE QGstreamerBufferProbe::QGstreamerBufferProbe(Flags flags) -#if GST_CHECK_VERSION(1,0,0) - : m_capsProbeId(-1) -#else - : m_caps(0) -#endif - , m_bufferProbeId(-1) - , m_flags(flags) + : m_flags(flags) { } diff --git a/src/gsttools/qgstreamerbufferprobe_p.h b/src/gsttools/qgstreamerbufferprobe_p.h index 35644f934..2dda73e40 100644 --- a/src/gsttools/qgstreamerbufferprobe_p.h +++ b/src/gsttools/qgstreamerbufferprobe_p.h @@ -83,12 +83,12 @@ private: #if GST_CHECK_VERSION(1,0,0) static GstPadProbeReturn capsProbe(GstPad *pad, GstPadProbeInfo *info, gpointer user_data); static GstPadProbeReturn bufferProbe(GstPad *pad, GstPadProbeInfo *info, gpointer user_data); - int m_capsProbeId; + int m_capsProbeId = -1; #else static gboolean bufferProbe(GstElement *element, GstBuffer *buffer, gpointer user_data); - GstCaps *m_caps; + GstCaps *m_caps = nullptr; #endif - int m_bufferProbeId; + int m_bufferProbeId = -1; const Flags m_flags; }; diff --git a/src/gsttools/qgstreamerbushelper_p.h b/src/gsttools/qgstreamerbushelper_p.h index c7d06faf8..e784f6e41 100644 --- a/src/gsttools/qgstreamerbushelper_p.h +++ b/src/gsttools/qgstreamerbushelper_p.h @@ -96,7 +96,7 @@ signals: void message(QGstreamerMessage const& message); private: - QGstreamerBusHelperPrivate* d; + QGstreamerBusHelperPrivate *d = nullptr; }; QT_END_NAMESPACE diff --git a/src/gsttools/qgstreamermessage.cpp b/src/gsttools/qgstreamermessage.cpp index 6855c285c..7191565e1 100644 --- a/src/gsttools/qgstreamermessage.cpp +++ b/src/gsttools/qgstreamermessage.cpp @@ -51,12 +51,6 @@ static int wuchi = qRegisterMetaType<QGstreamerMessage>(); \internal */ -QGstreamerMessage::QGstreamerMessage(): - m_message(0) -{ - Q_UNUSED(wuchi); -} - QGstreamerMessage::QGstreamerMessage(GstMessage* message): m_message(message) { diff --git a/src/gsttools/qgstreamermessage_p.h b/src/gsttools/qgstreamermessage_p.h index 2f9d1745c..baeecc360 100644 --- a/src/gsttools/qgstreamermessage_p.h +++ b/src/gsttools/qgstreamermessage_p.h @@ -64,7 +64,7 @@ class QString; class Q_GSTTOOLS_EXPORT QGstreamerMessage { public: - QGstreamerMessage(); + QGstreamerMessage() = default; QGstreamerMessage(GstMessage* message); QGstreamerMessage(QGstreamerMessage const& m); ~QGstreamerMessage(); @@ -74,7 +74,7 @@ public: QGstreamerMessage& operator=(QGstreamerMessage const& rhs); private: - GstMessage* m_message; + GstMessage* m_message = nullptr; }; QT_END_NAMESPACE diff --git a/src/gsttools/qgstreamerplayercontrol.cpp b/src/gsttools/qgstreamerplayercontrol.cpp index d49b09af4..9c7aa3102 100644 --- a/src/gsttools/qgstreamerplayercontrol.cpp +++ b/src/gsttools/qgstreamerplayercontrol.cpp @@ -60,13 +60,6 @@ QT_BEGIN_NAMESPACE QGstreamerPlayerControl::QGstreamerPlayerControl(QGstreamerPlayerSession *session, QObject *parent) : QMediaPlayerControl(parent) , m_session(session) - , m_userRequestedState(QMediaPlayer::StoppedState) - , m_currentState(QMediaPlayer::StoppedState) - , m_mediaStatus(QMediaPlayer::NoMedia) - , m_bufferProgress(-1) - , m_pendingSeekPosition(-1) - , m_setMediaPending(false) - , m_stream(0) { m_resources = QMediaResourcePolicy::createResourceSet<QMediaPlayerResourceSetInterface>(); Q_ASSERT(m_resources); diff --git a/src/gsttools/qgstreamerplayercontrol_p.h b/src/gsttools/qgstreamerplayercontrol_p.h index e2252ea52..ef94df925 100644 --- a/src/gsttools/qgstreamerplayercontrol_p.h +++ b/src/gsttools/qgstreamerplayercontrol_p.h @@ -124,20 +124,20 @@ private: void pushState(); void popAndNotifyState(); - QGstreamerPlayerSession *m_session; - QMediaPlayer::State m_userRequestedState; - QMediaPlayer::State m_currentState; - QMediaPlayer::MediaStatus m_mediaStatus; + QGstreamerPlayerSession *m_session = nullptr; + QMediaPlayer::State m_userRequestedState = QMediaPlayer::StoppedState; + QMediaPlayer::State m_currentState = QMediaPlayer::StoppedState; + QMediaPlayer::MediaStatus m_mediaStatus = QMediaPlayer::NoMedia; QStack<QMediaPlayer::State> m_stateStack; QStack<QMediaPlayer::MediaStatus> m_mediaStatusStack; - int m_bufferProgress; - qint64 m_pendingSeekPosition; - bool m_setMediaPending; + int m_bufferProgress = -1; + qint64 m_pendingSeekPosition = -1; + bool m_setMediaPending = false; QMediaContent m_currentResource; - QIODevice *m_stream; + QIODevice *m_stream = nullptr; - QMediaPlayerResourceSetInterface *m_resources; + QMediaPlayerResourceSetInterface *m_resources = nullptr; }; QT_END_NAMESPACE diff --git a/src/gsttools/qgstreamerplayersession.cpp b/src/gsttools/qgstreamerplayersession.cpp index 15587f0ce..ff171f4b2 100644 --- a/src/gsttools/qgstreamerplayersession.cpp +++ b/src/gsttools/qgstreamerplayersession.cpp @@ -111,39 +111,7 @@ static GstStaticCaps static_RawCaps = GST_STATIC_CAPS(DEFAULT_RAW_CAPS); #endif QGstreamerPlayerSession::QGstreamerPlayerSession(QObject *parent) - :QObject(parent), - m_state(QMediaPlayer::StoppedState), - m_pendingState(QMediaPlayer::StoppedState), - m_busHelper(0), - m_videoSink(0), -#if !GST_CHECK_VERSION(1,0,0) - m_usingColorspaceElement(false), -#endif - m_pendingVideoSink(0), - m_nullVideoSink(0), - m_audioSink(0), - m_volumeElement(0), - m_bus(0), - m_videoOutput(0), - m_renderer(0), -#if QT_CONFIG(gstreamer_app) - m_appSrc(0), -#endif - m_videoProbe(0), - m_audioProbe(0), - m_volume(100), - m_playbackRate(1.0), - m_muted(false), - m_audioAvailable(false), - m_videoAvailable(false), - m_seekable(false), - m_lastPosition(0), - m_duration(0), - m_durationQueries(0), - m_displayPrerolledFrame(true), - m_sourceType(UnknownSrc), - m_everPlayed(false), - m_isLiveSource(false) + : QObject(parent) { m_playbin = gst_element_factory_make(QT_GSTREAMER_PLAYBIN_ELEMENT_NAME, NULL); if (m_playbin) { diff --git a/src/gsttools/qgstreamerplayersession_p.h b/src/gsttools/qgstreamerplayersession_p.h index d4b050272..69027eeb2 100644 --- a/src/gsttools/qgstreamerplayersession_p.h +++ b/src/gsttools/qgstreamerplayersession_p.h @@ -212,32 +212,32 @@ private: bool setPipeline(GstElement *pipeline); QNetworkRequest m_request; - QMediaPlayer::State m_state; - QMediaPlayer::State m_pendingState; - QGstreamerBusHelper* m_busHelper; - GstElement *m_playbin = nullptr; // Can be null - GstElement *m_pipeline = nullptr; // Never null + QMediaPlayer::State m_state = QMediaPlayer::StoppedState; + QMediaPlayer::State m_pendingState = QMediaPlayer::StoppedState; + QGstreamerBusHelper *m_busHelper = nullptr; + GstElement *m_playbin = nullptr; + GstElement *m_pipeline = nullptr; - GstElement* m_videoSink; + GstElement *m_videoSink = nullptr; - GstElement* m_videoOutputBin; - GstElement* m_videoIdentity; + GstElement *m_videoOutputBin = nullptr; + GstElement *m_videoIdentity = nullptr; #if !GST_CHECK_VERSION(1,0,0) - GstElement* m_colorSpace; - bool m_usingColorspaceElement; + GstElement *m_colorSpace = nullptr; + bool m_usingColorspaceElement = false; #endif - GstElement* m_pendingVideoSink; - GstElement* m_nullVideoSink; + GstElement *m_pendingVideoSink = nullptr; + GstElement *m_nullVideoSink = nullptr; - GstElement* m_audioSink; - GstElement* m_volumeElement; + GstElement *m_audioSink = nullptr; + GstElement *m_volumeElement = nullptr; - GstBus* m_bus; - QObject *m_videoOutput; - QGstreamerVideoRendererInterface *m_renderer; + GstBus *m_bus = nullptr; + QObject *m_videoOutput = nullptr; + QGstreamerVideoRendererInterface *m_renderer = nullptr; #if QT_CONFIG(gstreamer_app) - QGstAppSrc *m_appSrc; + QGstAppSrc *m_appSrc = nullptr; #endif QMap<QByteArray, QVariant> m_tags; @@ -245,21 +245,21 @@ private: QList<QMediaStreamsControl::StreamType> m_streamTypes; QMap<QMediaStreamsControl::StreamType, int> m_playbin2StreamOffset; - QGstreamerVideoProbeControl *m_videoProbe; - QGstreamerAudioProbeControl *m_audioProbe; + QGstreamerVideoProbeControl *m_videoProbe = nullptr; + QGstreamerAudioProbeControl *m_audioProbe = nullptr; - int m_volume; - qreal m_playbackRate; - bool m_muted; - bool m_audioAvailable; - bool m_videoAvailable; - bool m_seekable; + int m_volume = 100; + qreal m_playbackRate = 1.0; + bool m_muted = false; + bool m_audioAvailable = false; + bool m_videoAvailable = false; + bool m_seekable = false; - mutable qint64 m_lastPosition; - qint64 m_duration; - int m_durationQueries; + mutable qint64 m_lastPosition = 0; + qint64 m_duration = 0; + int m_durationQueries = 0; - bool m_displayPrerolledFrame; + bool m_displayPrerolledFrame = true; enum SourceType { @@ -269,11 +269,11 @@ private: MMSSrc, RTSPSrc, }; - SourceType m_sourceType; - bool m_everPlayed; - bool m_isLiveSource; + SourceType m_sourceType = UnknownSrc; + bool m_everPlayed = false; + bool m_isLiveSource = false; - gulong pad_probe_id; + gulong pad_probe_id = 0; }; QT_END_NAMESPACE diff --git a/src/gsttools/qgstreamervideoinputdevicecontrol.cpp b/src/gsttools/qgstreamervideoinputdevicecontrol.cpp index 86e6772b7..4d98afa62 100644 --- a/src/gsttools/qgstreamervideoinputdevicecontrol.cpp +++ b/src/gsttools/qgstreamervideoinputdevicecontrol.cpp @@ -45,13 +45,14 @@ #include <private/qgstutils_p.h> QGstreamerVideoInputDeviceControl::QGstreamerVideoInputDeviceControl(QObject *parent) - :QVideoDeviceSelectorControl(parent), m_factory(0), m_selectedDevice(0) + : QVideoDeviceSelectorControl(parent) { } QGstreamerVideoInputDeviceControl::QGstreamerVideoInputDeviceControl( GstElementFactory *factory, QObject *parent) - : QVideoDeviceSelectorControl(parent), m_factory(factory), m_selectedDevice(0) + : QVideoDeviceSelectorControl(parent) + , m_factory(factory) { if (m_factory) gst_object_ref(GST_OBJECT(m_factory)); diff --git a/src/gsttools/qgstreamervideoinputdevicecontrol_p.h b/src/gsttools/qgstreamervideoinputdevicecontrol_p.h index b660cc7b3..9d8dffd72 100644 --- a/src/gsttools/qgstreamervideoinputdevicecontrol_p.h +++ b/src/gsttools/qgstreamervideoinputdevicecontrol_p.h @@ -83,9 +83,9 @@ public Q_SLOTS: void setSelectedDevice(int index) override; private: - GstElementFactory *m_factory; + GstElementFactory *m_factory = nullptr; - int m_selectedDevice; + int m_selectedDevice = 0; }; QT_END_NAMESPACE diff --git a/src/gsttools/qgstreamervideoprobecontrol.cpp b/src/gsttools/qgstreamervideoprobecontrol.cpp index e18da2b4d..f9ce4e412 100644 --- a/src/gsttools/qgstreamervideoprobecontrol.cpp +++ b/src/gsttools/qgstreamervideoprobecontrol.cpp @@ -44,8 +44,6 @@ QGstreamerVideoProbeControl::QGstreamerVideoProbeControl(QObject *parent) : QMediaVideoProbeControl(parent) - , m_flushing(false) - , m_frameProbed(false) { } diff --git a/src/gsttools/qgstreamervideoprobecontrol_p.h b/src/gsttools/qgstreamervideoprobecontrol_p.h index b15b6099c..8f2101d74 100644 --- a/src/gsttools/qgstreamervideoprobecontrol_p.h +++ b/src/gsttools/qgstreamervideoprobecontrol_p.h @@ -89,10 +89,10 @@ private: #if GST_CHECK_VERSION(1,0,0) GstVideoInfo m_videoInfo; #else - int m_bytesPerLine; + int m_bytesPerLine = 0; #endif - bool m_flushing; - bool m_frameProbed; // true if at least one frame was probed + bool m_flushing = false; + bool m_frameProbed = false; // true if at least one frame was probed }; QT_END_NAMESPACE diff --git a/src/gsttools/qgstreamervideowidget.cpp b/src/gsttools/qgstreamervideowidget.cpp index bb85e1eb7..46432a0a1 100644 --- a/src/gsttools/qgstreamervideowidget.cpp +++ b/src/gsttools/qgstreamervideowidget.cpp @@ -95,10 +95,6 @@ protected: QGstreamerVideoWidgetControl::QGstreamerVideoWidgetControl(QObject *parent, const QByteArray &elementName) : QVideoWidgetControl(parent) , m_videoOverlay(this, !elementName.isEmpty() ? elementName : qgetenv("QT_GSTREAMER_WIDGET_VIDEOSINK")) - , m_widget(0) - , m_stopped(false) - , m_windowId(0) - , m_fullScreen(false) { connect(&m_videoOverlay, &QGstreamerVideoOverlay::activeChanged, this, &QGstreamerVideoWidgetControl::onOverlayActiveChanged); diff --git a/src/gsttools/qgstreamervideowidget_p.h b/src/gsttools/qgstreamervideowidget_p.h index 1ddb738df..6eec6ae52 100644 --- a/src/gsttools/qgstreamervideowidget_p.h +++ b/src/gsttools/qgstreamervideowidget_p.h @@ -117,10 +117,10 @@ private: bool processBusMessage(const QGstreamerMessage &message) override; QGstreamerVideoOverlay m_videoOverlay; - QGstreamerVideoWidget *m_widget; - bool m_stopped; - WId m_windowId; - bool m_fullScreen; + QGstreamerVideoWidget *m_widget = nullptr; + bool m_stopped = false; + WId m_windowId = 0; + bool m_fullScreen = false; }; QT_END_NAMESPACE diff --git a/src/gsttools/qgstreamervideowindow.cpp b/src/gsttools/qgstreamervideowindow.cpp index f872df964..e7e3c5044 100644 --- a/src/gsttools/qgstreamervideowindow.cpp +++ b/src/gsttools/qgstreamervideowindow.cpp @@ -45,9 +45,6 @@ QGstreamerVideoWindow::QGstreamerVideoWindow(QObject *parent, const QByteArray &elementName) : QVideoWindowControl(parent) , m_videoOverlay(this, !elementName.isEmpty() ? elementName : qgetenv("QT_GSTREAMER_WINDOW_VIDEOSINK")) - , m_windowId(0) - , m_fullScreen(false) - , m_colorKey(QColor::Invalid) { connect(&m_videoOverlay, &QGstreamerVideoOverlay::nativeVideoSizeChanged, this, &QGstreamerVideoWindow::nativeSizeChanged); diff --git a/src/gsttools/qgstreamervideowindow_p.h b/src/gsttools/qgstreamervideowindow_p.h index 5f893f10e..a0ed8599b 100644 --- a/src/gsttools/qgstreamervideowindow_p.h +++ b/src/gsttools/qgstreamervideowindow_p.h @@ -116,10 +116,10 @@ signals: private: QGstreamerVideoOverlay m_videoOverlay; - WId m_windowId; + WId m_windowId = 0; QRect m_displayRect; - bool m_fullScreen; - mutable QColor m_colorKey; + bool m_fullScreen = false; + mutable QColor m_colorKey = QColor::Invalid; }; QT_END_NAMESPACE diff --git a/src/gsttools/qgstvideobuffer.cpp b/src/gsttools/qgstvideobuffer.cpp index e174ab75d..245b7e024 100644 --- a/src/gsttools/qgstvideobuffer.cpp +++ b/src/gsttools/qgstvideobuffer.cpp @@ -51,7 +51,6 @@ QGstVideoBuffer::QGstVideoBuffer(GstBuffer *buffer, int bytesPerLine) , m_bytesPerLine(bytesPerLine) #endif , m_buffer(buffer) - , m_mode(NotMapped) { gst_buffer_ref(m_buffer); } @@ -70,7 +69,6 @@ QGstVideoBuffer::QGstVideoBuffer(GstBuffer *buffer, int bytesPerLine, , m_bytesPerLine(bytesPerLine) #endif , m_buffer(buffer) - , m_mode(NotMapped) , m_handle(handle) { gst_buffer_ref(m_buffer); diff --git a/src/gsttools/qgstvideobuffer_p.h b/src/gsttools/qgstvideobuffer_p.h index 6681070da..b7de17e19 100644 --- a/src/gsttools/qgstvideobuffer_p.h +++ b/src/gsttools/qgstvideobuffer_p.h @@ -95,10 +95,10 @@ private: GstVideoInfo m_videoInfo; GstVideoFrame m_frame; #else - int m_bytesPerLine; + int m_bytesPerLine = 0; #endif - GstBuffer *m_buffer; - MapMode m_mode; + GstBuffer *m_buffer = nullptr; + MapMode m_mode = NotMapped; QVariant m_handle; }; diff --git a/src/gsttools/qgstvideorenderersink.cpp b/src/gsttools/qgstvideorenderersink.cpp index 597b97410..119fc55a1 100644 --- a/src/gsttools/qgstvideorenderersink.cpp +++ b/src/gsttools/qgstvideorenderersink.cpp @@ -59,7 +59,6 @@ QT_BEGIN_NAMESPACE QGstDefaultVideoRenderer::QGstDefaultVideoRenderer() - : m_flushed(true) { } @@ -116,14 +115,6 @@ Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, rendererLoader, QVideoSurfaceGstDelegate::QVideoSurfaceGstDelegate(QAbstractVideoSurface *surface) : m_surface(surface) - , m_renderer(0) - , m_activeRenderer(0) - , m_surfaceCaps(0) - , m_startCaps(0) - , m_renderBuffer(0) - , m_notified(false) - , m_stop(false) - , m_flush(false) { const auto instances = rendererLoader()->instances(QGstVideoRendererPluginKey); for (QObject *instance : instances) { diff --git a/src/gsttools/qgstvideorenderersink_p.h b/src/gsttools/qgstvideorenderersink_p.h index d2417a7c9..b1e333566 100644 --- a/src/gsttools/qgstvideorenderersink_p.h +++ b/src/gsttools/qgstvideorenderersink_p.h @@ -88,7 +88,7 @@ public: private: QVideoSurfaceFormat m_format; GstVideoInfo m_videoInfo; - bool m_flushed; + bool m_flushed = true; }; class QVideoSurfaceGstDelegate : public QObject @@ -124,18 +124,18 @@ private: QMutex m_mutex; QWaitCondition m_setupCondition; QWaitCondition m_renderCondition; - GstFlowReturn m_renderReturn; + GstFlowReturn m_renderReturn = GST_FLOW_OK; QList<QGstVideoRenderer *> m_renderers; - QGstVideoRenderer *m_renderer; - QGstVideoRenderer *m_activeRenderer; + QGstVideoRenderer *m_renderer = nullptr; + QGstVideoRenderer *m_activeRenderer = nullptr; - GstCaps *m_surfaceCaps; - GstCaps *m_startCaps; - GstBuffer *m_renderBuffer; + GstCaps *m_surfaceCaps = nullptr; + GstCaps *m_startCaps = nullptr; + GstBuffer *m_renderBuffer = nullptr; - bool m_notified; - bool m_stop; - bool m_flush; + bool m_notified = false; + bool m_stop = false; + bool m_flush = false; }; class Q_GSTTOOLS_EXPORT QGstVideoRendererSink @@ -170,7 +170,7 @@ private: static GstFlowReturn show_frame(GstVideoSink *sink, GstBuffer *buffer); private: - QVideoSurfaceGstDelegate *delegate; + QVideoSurfaceGstDelegate *delegate = nullptr; }; diff --git a/src/gsttools/qvideosurfacegstsink.cpp b/src/gsttools/qvideosurfacegstsink.cpp index 9655a2191..c63eea9a6 100644 --- a/src/gsttools/qvideosurfacegstsink.cpp +++ b/src/gsttools/qvideosurfacegstsink.cpp @@ -65,10 +65,6 @@ Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, bufferPoolLoader, QVideoSurfaceGstDelegate::QVideoSurfaceGstDelegate( QAbstractVideoSurface *surface) : m_surface(surface) - , m_pool(0) - , m_renderReturn(GST_FLOW_ERROR) - , m_bytesPerLine(0) - , m_startCanceled(false) { if (m_surface) { const auto instances = bufferPoolLoader()->instances(QGstBufferPoolPluginKey); diff --git a/src/gsttools/qvideosurfacegstsink_p.h b/src/gsttools/qvideosurfacegstsink_p.h index 961cf91d2..dd758ff82 100644 --- a/src/gsttools/qvideosurfacegstsink_p.h +++ b/src/gsttools/qvideosurfacegstsink_p.h @@ -119,7 +119,7 @@ private: QList<QVideoFrame::PixelFormat> m_supportedPixelFormats; //pixel formats of buffers pool native type QList<QVideoFrame::PixelFormat> m_supportedPoolPixelFormats; - QGstBufferPoolInterface *m_pool; + QGstBufferPoolInterface *m_pool = nullptr; QList<QGstBufferPoolInterface *> m_pools; QMutex m_poolMutex; QMutex m_mutex; @@ -127,10 +127,10 @@ private: QWaitCondition m_renderCondition; QVideoSurfaceFormat m_format; QVideoFrame m_frame; - GstFlowReturn m_renderReturn; - int m_bytesPerLine; - bool m_started; - bool m_startCanceled; + GstFlowReturn m_renderReturn = GST_FLOW_ERROR; + int m_bytesPerLine = 0; + bool m_started = false; + bool m_startCanceled = false; }; class QVideoSurfaceGstSink @@ -172,11 +172,11 @@ private: #endif private: - QVideoSurfaceGstDelegate *delegate; + QVideoSurfaceGstDelegate *delegate = nullptr; - GstCaps *lastRequestedCaps; - GstCaps *lastBufferCaps; - QVideoSurfaceFormat *lastSurfaceFormat; + GstCaps *lastRequestedCaps = nullptr; + GstCaps *lastBufferCaps = nullptr; + QVideoSurfaceFormat *lastSurfaceFormat = nullptr; }; class QVideoSurfaceGstSinkClass 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 0712f6e6c..44cb5439b 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp @@ -71,17 +71,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 |