slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed QVideoSurfaceGstSink to take pools from plugins

Browse Source 
Change-Id: Iec743efc52513e2000276b9a18d1d9639c270699
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
This commit is contained in:
Jonas Rabbe
2011-11-08 12:38:02 +10:00
committed by Qt by Nokia
parent 34cdc41a93
commit 956526a9fb
6 changed files with 118 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gsttools/gsttools.pro
View File

@@ -2,7 +2,7 @@ TEMPLATE = lib
TARGET = qgsttools_p
QPRO_PWD = $$PWD
QT = core multimedia
QT = core multimedia-private
!static:DEFINES += QT_MAKEDLL
@@ -36,14 +36,16 @@ INCLUDEPATH += ../multimedia/gsttools_headers/
DEPENDPATH += ../multimedia/gsttools_headers/
PRIVATE_HEADERS += \
qabstractgstbufferpool_p.h \
qgstbufferpoolinterface_p.h \
qgstreamerbushelper_p.h \
qgstreamermessage_p.h \
qgstutils_p.h \
qgstvideobuffer_p.h \
qvideosurfacegstsink_p.h \
SOURCES += \
qgstbufferpoolinterface.cpp \
qgstreamerbushelper.cpp \
qgstreamermessage.cpp \
qgstutils.cpp \

54
src/gsttools/qgstbufferpoolinterface.cpp Normal file
View File

@@ -0,0 +1,54 @@
/****************************************************************************
**
** 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$
**
****************************************************************************/
#include "qgstbufferpoolinterface_p.h"
QT_BEGIN_NAMESPACE
QGstBufferPoolPlugin::QGstBufferPoolPlugin(QObject *parent) :
QObject(parent)
{
}
#include "moc_qgstbufferpoolinterface_p.cpp"
QT_END_NAMESPACE

17
src/gsttools/qvideosurfacegstsink.cpp
View File

@@ -46,6 +46,7 @@
#include <QDebug>
#include <QThread>
#include <private/qmediapluginloader_p.h>
#include "qgstvideobuffer_p.h"
#if defined(Q_WS_X11) && !defined(QT_NO_XVIDEO)
@@ -57,6 +58,10 @@
//#define DEBUG_VIDEO_SURFACE_SINK
Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, bufferPoolLoader,
(QGstBufferPoolInterface_iid, QLatin1String("video"), Qt::CaseInsensitive))
QVideoSurfaceGstDelegate::QVideoSurfaceGstDelegate(
QAbstractVideoSurface *surface)
: m_surface(surface)
@@ -66,6 +71,12 @@ QVideoSurfaceGstDelegate::QVideoSurfaceGstDelegate(
, m_startCanceled(false)
{
if (m_surface) {
foreach (QObject *instance, bufferPoolLoader()->instances(QGstBufferPoolPluginKey)) {
QGstBufferPoolInterface* plugin = qobject_cast<QGstBufferPoolInterface*>(instance);
if (plugin) {
m_pools.append(plugin);
}
}
#if defined(Q_WS_X11) && !defined(QT_NO_XVIDEO)
m_pools.append(new QGstXvImageBufferPool());
#endif
@@ -258,8 +269,8 @@ void QVideoSurfaceGstDelegate::queuedRender()
void QVideoSurfaceGstDelegate::updateSupportedFormats()
{
QAbstractGstBufferPool *newPool = 0;
foreach (QAbstractGstBufferPool *pool, m_pools) {
QGstBufferPoolInterface *newPool = 0;
foreach (QGstBufferPoolInterface *pool, m_pools) {
if (!m_surface->supportedPixelFormats(pool->handleType()).isEmpty()) {
newPool = pool;
break;
@@ -669,7 +680,7 @@ GstFlowReturn QVideoSurfaceGstSink::buffer_alloc(
return GST_FLOW_OK;
QMutexLocker poolLock(sink->delegate->poolMutex());
QAbstractGstBufferPool *pool = sink->delegate->pool();
QGstBufferPoolInterface *pool = sink->delegate->pool();
if (!pool)
return GST_FLOW_OK;