diff options
Diffstat (limited to 'src/multimedia/gsttools_headers/qgstreamervideoprobecontrol_p.h')
-rw-r--r-- | src/multimedia/gsttools_headers/qgstreamervideoprobecontrol_p.h | 37 |
1 files changed, 26 insertions, 11 deletions
diff --git a/src/multimedia/gsttools_headers/qgstreamervideoprobecontrol_p.h b/src/multimedia/gsttools_headers/qgstreamervideoprobecontrol_p.h index 49064f977..c77dae7a2 100644 --- a/src/multimedia/gsttools_headers/qgstreamervideoprobecontrol_p.h +++ b/src/multimedia/gsttools_headers/qgstreamervideoprobecontrol_p.h @@ -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$ @@ -35,20 +35,29 @@ #define QGSTREAMERVIDEOPROBECONTROL_H #include <gst/gst.h> +#include <gst/video/video.h> #include <qmediavideoprobecontrol.h> #include <QtCore/qmutex.h> #include <qvideoframe.h> +#include <qvideosurfaceformat.h> + +#include <private/qgstreamerbufferprobe_p.h> QT_BEGIN_NAMESPACE -class QGstreamerVideoProbeControl : public QMediaVideoProbeControl +class QGstreamerVideoProbeControl + : public QMediaVideoProbeControl + , public QGstreamerBufferProbe + , public QSharedData { Q_OBJECT public: explicit QGstreamerVideoProbeControl(QObject *parent); virtual ~QGstreamerVideoProbeControl(); - void bufferProbed(GstBuffer* buffer); + void probeCaps(GstCaps *caps); + bool probeBuffer(GstBuffer *buffer); + void startFlushing(); void stopFlushing(); @@ -56,10 +65,16 @@ private slots: void frameProbed(); private: - bool m_flushing; - bool m_frameProbed; // true if at least one frame was probed + QVideoSurfaceFormat m_format; QVideoFrame m_pendingFrame; QMutex m_frameMutex; +#if GST_CHECK_VERSION(1,0,0) + GstVideoInfo m_videoInfo; +#else + int m_bytesPerLine; +#endif + bool m_flushing; + bool m_frameProbed; // true if at least one frame was probed }; QT_END_NAMESPACE |