diff options
Diffstat (limited to 'src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h')
-rw-r--r-- | src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h b/src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h index 11b305d27..e8f61afe0 100644 --- a/src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h +++ b/src/multimedia/gsttools_headers/qvideosurfacegstsink_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$ @@ -45,6 +45,18 @@ // We mean it. // +#include <gst/gst.h> + +#if GST_CHECK_VERSION(1,0,0) + +#include "qgstvideorenderersink_p.h" + +QT_BEGIN_NAMESPACE +typedef QGstVideoRendererSink QVideoSurfaceGstSink; +QT_END_NAMESPACE + +#else + #include <gst/video/gstvideosink.h> #include <QtCore/qlist.h> @@ -76,6 +88,8 @@ public: bool start(const QVideoSurfaceFormat &format, int bytesPerLine); void stop(); + void unlock(); + bool isActive(); QGstBufferPoolInterface *pool() { return m_pool; } @@ -116,10 +130,6 @@ public: GstVideoSink parent; static QVideoSurfaceGstSink *createSink(QAbstractVideoSurface *surface); - static QVideoSurfaceFormat formatForCaps(GstCaps *caps, - int *bytesPerLine = 0, - QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle); - static void setFrameTimeStamps(QVideoFrame *frame, GstBuffer *buffer); private: static GType get_type(); @@ -140,6 +150,8 @@ private: static gboolean start(GstBaseSink *sink); static gboolean stop(GstBaseSink *sink); + static gboolean unlock(GstBaseSink *sink); + static GstFlowReturn show_frame(GstVideoSink *sink, GstBuffer *buffer); private: @@ -150,7 +162,6 @@ private: QVideoSurfaceFormat *lastSurfaceFormat; }; - class QVideoSurfaceGstSinkClass { public: @@ -160,3 +171,5 @@ public: QT_END_NAMESPACE #endif + +#endif |