From 956526a9fb769acc66b376be0b051c0108a06f21 Mon Sep 17 00:00:00 2001 From: Jonas Rabbe Date: Tue, 8 Nov 2011 12:38:02 +1000 Subject: Changed QVideoSurfaceGstSink to take pools from plugins Change-Id: Iec743efc52513e2000276b9a18d1d9639c270699 Reviewed-by: Dmytro Poplavskiy --- .../gsttools_headers/qabstractgstbufferpool_p.h | 86 --------------- .../gsttools_headers/qgstbufferpoolinterface_p.h | 121 +++++++++++++++++++++ .../gsttools_headers/qgstxvimagebuffer_p.h | 4 +- .../gsttools_headers/qvideosurfacegstsink_p.h | 8 +- 4 files changed, 127 insertions(+), 92 deletions(-) delete mode 100644 src/multimedia/gsttools_headers/qabstractgstbufferpool_p.h create mode 100644 src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h (limited to 'src/multimedia/gsttools_headers') diff --git a/src/multimedia/gsttools_headers/qabstractgstbufferpool_p.h b/src/multimedia/gsttools_headers/qabstractgstbufferpool_p.h deleted file mode 100644 index 40c75ad32..000000000 --- a/src/multimedia/gsttools_headers/qabstractgstbufferpool_p.h +++ /dev/null @@ -1,86 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QGSTBUFFERPOOL_P_H -#define QGSTBUFFERPOOL_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include - -#include - -/*! - Abstract interface for video buffers allocation. -*/ -class QAbstractGstBufferPool -{ -public: - virtual ~QAbstractGstBufferPool() {} - - virtual bool isFormatSupported(const QVideoSurfaceFormat &format) const = 0; - - virtual GType bufferType() const = 0; - virtual GstBuffer *takeBuffer(const QVideoSurfaceFormat &format, GstCaps *caps) = 0; - virtual void clear() = 0; - - virtual QAbstractVideoBuffer::HandleType handleType() const = 0; - - /*! - Build an QAbstractVideoBuffer instance from compatible (mathcing gst buffer type) - GstBuffer. - - This method is called from gstreamer video sink thread. - */ - virtual QAbstractVideoBuffer *prepareVideoBuffer(GstBuffer *buffer, int bytesPerLine) = 0; -}; - -#endif diff --git a/src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h b/src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h new file mode 100644 index 000000000..7dbccfdbc --- /dev/null +++ b/src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h @@ -0,0 +1,121 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QGSTBUFFERPOOLINTERFACE_P_H +#define QGSTBUFFERPOOLINTERFACE_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include +#include +#include +#include +#include + +#include + +const QLatin1String QGstBufferPoolPluginKey("bufferpool"); + +/*! + Abstract interface for video buffers allocation. +*/ +class QGstBufferPoolInterface : public QFactoryInterface +{ +public: + virtual ~QGstBufferPoolInterface() {} + + virtual bool isFormatSupported(const QVideoSurfaceFormat &format) const = 0; + + virtual GType bufferType() const = 0; + virtual GstBuffer *takeBuffer(const QVideoSurfaceFormat &format, GstCaps *caps) = 0; + virtual void clear() = 0; + + virtual QAbstractVideoBuffer::HandleType handleType() const = 0; + + /*! + Build an QAbstractVideoBuffer instance from compatible (mathcing gst buffer type) + GstBuffer. + + This method is called from gstreamer video sink thread. + */ + virtual QAbstractVideoBuffer *prepareVideoBuffer(GstBuffer *buffer, int bytesPerLine) = 0; +}; + +#define QGstBufferPoolInterface_iid "com.nokia.Qt.QGstBufferPoolInterface" +Q_DECLARE_INTERFACE(QGstBufferPoolInterface, QGstBufferPoolInterface_iid) + +class QGstBufferPoolPlugin : public QObject, public QGstBufferPoolInterface +{ + Q_OBJECT + Q_INTERFACES(QGstBufferPoolInterface:QFactoryInterface) +public: + explicit QGstBufferPoolPlugin(QObject *parent = 0); + virtual ~QGstBufferPoolPlugin() {} + + virtual bool isFormatSupported(const QVideoSurfaceFormat &format) const = 0; + + virtual GType bufferType() const = 0; + virtual GstBuffer *takeBuffer(const QVideoSurfaceFormat &format, GstCaps *caps) = 0; + virtual void clear() = 0; + + virtual QAbstractVideoBuffer::HandleType handleType() const = 0; + + /*! + Build an QAbstractVideoBuffer instance from compatible (mathcing gst buffer type) + GstBuffer. + + This method is called from gstreamer video sink thread. + */ + virtual QAbstractVideoBuffer *prepareVideoBuffer(GstBuffer *buffer, int bytesPerLine) = 0; + + virtual QStringList keys() const = 0; +}; + +#endif diff --git a/src/multimedia/gsttools_headers/qgstxvimagebuffer_p.h b/src/multimedia/gsttools_headers/qgstxvimagebuffer_p.h index c6f74373e..6fd7eb769 100644 --- a/src/multimedia/gsttools_headers/qgstxvimagebuffer_p.h +++ b/src/multimedia/gsttools_headers/qgstxvimagebuffer_p.h @@ -71,7 +71,7 @@ #include -#include "qabstractgstbufferpool_p.h" +#include "qgstbufferpoolinterface_p.h" class QGstXvImageBufferPool; @@ -91,7 +91,7 @@ struct QGstXvImageBuffer { Q_DECLARE_METATYPE(XvImage*) -class QGstXvImageBufferPool : public QObject, public QAbstractGstBufferPool { +class QGstXvImageBufferPool : public QObject, public QGstBufferPoolInterface { Q_OBJECT friend class QGstXvImageBuffer; public: diff --git a/src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h b/src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h index 438b796cf..55147ef38 100644 --- a/src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h +++ b/src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h @@ -64,7 +64,7 @@ #include #include -#include "qabstractgstbufferpool_p.h" +#include "qgstbufferpoolinterface_p.h" QT_BEGIN_NAMESPACE class QAbstractVideoSurface; @@ -92,7 +92,7 @@ public: bool isActive(); - QAbstractGstBufferPool *pool() { return m_pool; } + QGstBufferPoolInterface *pool() { return m_pool; } QMutex *poolMutex() { return &m_poolMutex; } GstFlowReturn render(GstBuffer *buffer); @@ -109,8 +109,8 @@ private: QList m_supportedPixelFormats; //pixel formats of buffers pool native type QList m_supportedPoolPixelFormats; - QAbstractGstBufferPool *m_pool; - QList m_pools; + QGstBufferPoolInterface *m_pool; + QList m_pools; QMutex m_poolMutex; QMutex m_mutex; QWaitCondition m_setupCondition; -- cgit v1.2.3