diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-11 18:48:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-09-12 08:50:30 +0000 |
commit | 38e49d060d13ef592f457a5d6640d68a2d9c6b06 (patch) | |
tree | b6fccceb55f338a8c53e31afb88a4fce965d305b /src/gsttools/qvideosurfacegstsink_p.h | |
parent | c9058d90d0b08781f14a494780c3094594c81f22 (diff) | |
parent | 324471ef9054911422f8f2d40a243c67b501c8f0 (diff) |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
Diffstat (limited to 'src/gsttools/qvideosurfacegstsink_p.h')
-rw-r--r-- | src/gsttools/qvideosurfacegstsink_p.h | 18 |
1 files changed, 9 insertions, 9 deletions
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 |