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

Restructure the source code a little.

Browse Source 
Change-Id: I995b0fb33bdda7f01bf6266c1c50a1b17eba6760
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2012-01-04 16:05:55 +10:00
committed by Qt by Nokia
parent 6ee1977d60
commit 502d3c8eb3
123 changed files with 198 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/multimedia/video/qvideosurfaceoutput.cpp Normal file
View File

@@ -0,0 +1,100 @@
/****************************************************************************
**
** 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$
**
****************************************************************************/
#include "qvideosurfaceoutput_p.h"
#include <qabstractvideosurface.h>
#include <qmediaservice.h>
#include <qvideorenderercontrol.h>
QVideoSurfaceOutput::QVideoSurfaceOutput(QObject*parent)
: QObject(parent)
{
}
QVideoSurfaceOutput::~QVideoSurfaceOutput()
{
if (m_control) {
m_control.data()->setSurface(0);
m_service.data()->releaseControl(m_control.data());
}
}
QMediaObject *QVideoSurfaceOutput::mediaObject() const
{
return m_object.data();
}
void QVideoSurfaceOutput::setVideoSurface(QAbstractVideoSurface *surface)
{
m_surface = surface;
if (m_control)
m_control.data()->setSurface(surface);
}
bool QVideoSurfaceOutput::setMediaObject(QMediaObject *object)
{
if (m_control) {
m_control.data()->setSurface(0);
m_service.data()->releaseControl(m_control.data());
}
m_control.clear();
m_service.clear();
m_object.clear();
if (object) {
if (QMediaService *service = object->service()) {
if (QMediaControl *control = service->requestControl(QVideoRendererControl_iid)) {
if ((m_control = qobject_cast<QVideoRendererControl *>(control))) {
m_service = service;
m_object = object;
m_control.data()->setSurface(m_surface.data());
return true;
}
service->releaseControl(control);
}
}
}
return false;
}

86
src/multimedia/video/qvideosurfaceoutput_p.h Normal file
View File

@@ -0,0 +1,86 @@
/****************************************************************************
**
** 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 QVIDEOSURFACEOUTPUT_P_H
#define QVIDEOSURFACEOUTPUT_P_H
#include <qmediabindableinterface.h>
#include <QtCore/qsharedpointer.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QAbstractVideoSurface;
class QVideoRendererControl;
class QVideoSurfaceOutput : public QObject, public QMediaBindableInterface
{
Q_OBJECT
Q_INTERFACES(QMediaBindableInterface)
public:
QVideoSurfaceOutput(QObject*parent = 0);
~QVideoSurfaceOutput();
QMediaObject *mediaObject() const;
void setVideoSurface(QAbstractVideoSurface *surface);
protected:
bool setMediaObject(QMediaObject *object);
private:
QWeakPointer<QAbstractVideoSurface> m_surface;
QWeakPointer<QVideoRendererControl> m_control;
QWeakPointer<QMediaService> m_service;
QWeakPointer<QMediaObject> m_object;
};
QT_END_NAMESPACE
QT_END_HEADER
#endif

6
src/multimedia/video/video.pri
View File

@@ -10,7 +10,8 @@ PUBLIC_HEADERS += \
PRIVATE_HEADERS += \
video/qabstractvideobuffer_p.h \
video/qimagevideobuffer_p.h \
video/qmemoryvideobuffer_p.h
video/qmemoryvideobuffer_p.h \
video/qvideosurfaceoutput_p.h
SOURCES += \
video/qabstractvideobuffer.cpp \
@@ -18,5 +19,6 @@ SOURCES += \
video/qimagevideobuffer.cpp \
video/qmemoryvideobuffer.cpp \
video/qvideoframe.cpp \
video/qvideosurfaceformat.cpp
video/qvideosurfaceformat.cpp \
video/qvideosurfaceoutput.cpp