diff options
Diffstat (limited to 'src/gsttools/qgstreamervideoprobecontrol.cpp')
| -rw-r--r-- | src/gsttools/qgstreamervideoprobecontrol.cpp | 72 |
1 files changed, 44 insertions, 28 deletions
diff --git a/src/gsttools/qgstreamervideoprobecontrol.cpp b/src/gsttools/qgstreamervideoprobecontrol.cpp index a78a9dad0..976f4187c 100644 --- a/src/gsttools/qgstreamervideoprobecontrol.cpp +++ b/src/gsttools/qgstreamervideoprobecontrol.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -32,7 +32,8 @@ ****************************************************************************/ #include "qgstreamervideoprobecontrol_p.h" -#include <private/qvideosurfacegstsink_p.h> + +#include "qgstutils_p.h" #include <private/qgstvideobuffer_p.h> QGstreamerVideoProbeControl::QGstreamerVideoProbeControl(QObject *parent) @@ -40,12 +41,10 @@ QGstreamerVideoProbeControl::QGstreamerVideoProbeControl(QObject *parent) , m_flushing(false) , m_frameProbed(false) { - } QGstreamerVideoProbeControl::~QGstreamerVideoProbeControl() { - } void QGstreamerVideoProbeControl::startFlushing() @@ -67,33 +66,49 @@ void QGstreamerVideoProbeControl::stopFlushing() m_flushing = false; } -void QGstreamerVideoProbeControl::bufferProbed(GstBuffer* buffer) +void QGstreamerVideoProbeControl::probeCaps(GstCaps *caps) { - if (m_flushing) - return; - - GstCaps* caps = gst_buffer_get_caps(buffer); - if (!caps) - return; +#if GST_CHECK_VERSION(1,0,0) + GstVideoInfo videoInfo; + QVideoSurfaceFormat format = QGstUtils::formatForCaps(caps, &videoInfo); + QMutexLocker locker(&m_frameMutex); + m_videoInfo = videoInfo; +#else int bytesPerLine = 0; - QVideoSurfaceFormat format = QVideoSurfaceGstSink::formatForCaps(caps, &bytesPerLine); - gst_caps_unref(caps); - if (!format.isValid() || !bytesPerLine) - return; + QVideoSurfaceFormat format = QGstUtils::formatForCaps(caps, &bytesPerLine); + + QMutexLocker locker(&m_frameMutex); + m_bytesPerLine = bytesPerLine; +#endif + m_format = format; +} + +bool QGstreamerVideoProbeControl::probeBuffer(GstBuffer *buffer) +{ + QMutexLocker locker(&m_frameMutex); + + if (m_flushing || !m_format.isValid()) + return true; - QVideoFrame frame = QVideoFrame(new QGstVideoBuffer(buffer, bytesPerLine), - format.frameSize(), format.pixelFormat()); + QVideoFrame frame( +#if GST_CHECK_VERSION(1,0,0) + new QGstVideoBuffer(buffer, m_videoInfo), +#else + new QGstVideoBuffer(buffer, m_bytesPerLine), +#endif + m_format.frameSize(), + m_format.pixelFormat()); - QVideoSurfaceGstSink::setFrameTimeStamps(&frame, buffer); + QGstUtils::setFrameTimeStamps(&frame, buffer); m_frameProbed = true; - { - QMutexLocker locker(&m_frameMutex); - m_pendingFrame = frame; + if (!m_pendingFrame.isValid()) QMetaObject::invokeMethod(this, "frameProbed", Qt::QueuedConnection); - } + m_pendingFrame = frame; + + return true; } void QGstreamerVideoProbeControl::frameProbed() @@ -104,6 +119,7 @@ void QGstreamerVideoProbeControl::frameProbed() if (!m_pendingFrame.isValid()) return; frame = m_pendingFrame; + m_pendingFrame = QVideoFrame(); } emit videoFrameProbed(frame); } |