diff options
Diffstat (limited to 'src/multimedia/platform/gstreamer/common/qgstvideorenderersink.cpp')
| -rw-r--r-- | src/multimedia/platform/gstreamer/common/qgstvideorenderersink.cpp | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/src/multimedia/platform/gstreamer/common/qgstvideorenderersink.cpp b/src/multimedia/platform/gstreamer/common/qgstvideorenderersink.cpp index 0f930cf02..9afd79a80 100644 --- a/src/multimedia/platform/gstreamer/common/qgstvideorenderersink.cpp +++ b/src/multimedia/platform/gstreamer/common/qgstvideorenderersink.cpp @@ -77,13 +77,9 @@ QT_BEGIN_NAMESPACE -QGstDefaultVideoRenderer::QGstDefaultVideoRenderer() -{ -} +QGstDefaultVideoRenderer::QGstDefaultVideoRenderer() = default; -QGstDefaultVideoRenderer::~QGstDefaultVideoRenderer() -{ -} +QGstDefaultVideoRenderer::~QGstDefaultVideoRenderer() = default; GstCaps *QGstDefaultVideoRenderer::getCaps(QAbstractVideoSurface *surface) { @@ -245,10 +241,10 @@ bool QVideoSurfaceGstDelegate::start(GstCaps *caps) if (!waitForAsyncEvent(&locker, &m_setupCondition, 1000) && m_startCaps) { qWarning() << "Failed to start video surface due to main thread blocked."; gst_caps_unref(m_startCaps); - m_startCaps = 0; + m_startCaps = nullptr; } - return m_activeRenderer != 0; + return m_activeRenderer != nullptr; } void QVideoSurfaceGstDelegate::stop() @@ -263,7 +259,7 @@ void QVideoSurfaceGstDelegate::stop() if (m_startCaps) { gst_caps_unref(m_startCaps); - m_startCaps = 0; + m_startCaps = nullptr; } waitForAsyncEvent(&locker, &m_setupCondition, 500); @@ -295,7 +291,7 @@ void QVideoSurfaceGstDelegate::flush() QMutexLocker locker(&m_mutex); m_flush = true; - m_renderBuffer = 0; + m_renderBuffer = nullptr; m_renderCondition.wakeAll(); notify(); @@ -310,7 +306,7 @@ GstFlowReturn QVideoSurfaceGstDelegate::render(GstBuffer *buffer) waitForAsyncEvent(&locker, &m_renderCondition, 300); - m_renderBuffer = 0; + m_renderBuffer = nullptr; return m_renderReturn; } @@ -449,7 +445,7 @@ bool QVideoSurfaceGstDelegate::handleEvent(QMutexLocker<QMutex> *locker) m_stop = false; if (QGstVideoRenderer * const activePool = m_activeRenderer) { - m_activeRenderer = 0; + m_activeRenderer = nullptr; locker->unlock(); activePool->stop(m_surface); @@ -460,7 +456,7 @@ bool QVideoSurfaceGstDelegate::handleEvent(QMutexLocker<QMutex> *locker) Q_ASSERT(!m_activeRenderer); GstCaps * const startCaps = m_startCaps; - m_startCaps = 0; + m_startCaps = nullptr; if (m_renderer && m_surface) { locker->unlock(); @@ -471,9 +467,9 @@ bool QVideoSurfaceGstDelegate::handleEvent(QMutexLocker<QMutex> *locker) m_activeRenderer = started ? m_renderer - : 0; + : nullptr; } else if (QGstVideoRenderer * const activePool = m_activeRenderer) { - m_activeRenderer = 0; + m_activeRenderer = nullptr; locker->unlock(); activePool->stop(m_surface); @@ -484,7 +480,7 @@ bool QVideoSurfaceGstDelegate::handleEvent(QMutexLocker<QMutex> *locker) gst_caps_unref(startCaps); } else if (m_renderBuffer) { GstBuffer *buffer = m_renderBuffer; - m_renderBuffer = 0; + m_renderBuffer = nullptr; m_renderReturn = GST_FLOW_ERROR; if (m_activeRenderer && m_surface) { @@ -538,7 +534,7 @@ void QVideoSurfaceGstDelegate::updateSupportedFormats() { if (m_surfaceCaps) { gst_caps_unref(m_surfaceCaps); - m_surfaceCaps = 0; + m_surfaceCaps = nullptr; } for (QGstVideoRenderer *pool : qAsConst(m_renderers)) { @@ -567,7 +563,7 @@ QGstVideoRendererSink *QGstVideoRendererSink::createSink(QAbstractVideoSurface * { setSurface(surface); QGstVideoRendererSink *sink = reinterpret_cast<QGstVideoRendererSink *>( - g_object_new(QGstVideoRendererSink::get_type(), 0)); + g_object_new(QGstVideoRendererSink::get_type(), nullptr)); g_signal_connect(G_OBJECT(sink), "notify::show-preroll-frame", G_CALLBACK(handleShowPrerollChange), sink); @@ -596,7 +592,7 @@ GType QGstVideoRendererSink::get_type() sizeof(QGstVideoRendererSink), // instance_size 0, // n_preallocs instance_init, // instance_init - 0 // value_table + nullptr // value_table }; type = g_type_register_static( |