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

Use QVideoGraphicsItem in the videographicsitem example.

Browse Source 
The videographicsitem example now uses QVideoGraphicsItem instead of a
custom QAbstractVideoSurface.
The old code has been moved to a new example:
"customvideosurface/customvideoitem".

Change-Id: I83212f36168ef94d670b447eb1a742a39753939d
Reviewed-by: Jason Barron <jason.barron@digia.com>
This commit is contained in:
Yoann Lopes
2012-10-01 17:50:55 +02:00
committed by The Qt Project
parent 439d5b0e53
commit b616dd5165
18 changed files with 366 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/videographicsitem/videographicsitem.pro
View File

@@ -5,12 +5,10 @@ QT += multimedia multimediawidgets
contains(QT_CONFIG, opengl): QT += opengl
HEADERS += videoplayer.h \
videoitem.h
HEADERS += videoplayer.h
SOURCES += main.cpp \
videoplayer.cpp \
videoitem.cpp
videoplayer.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/videographicsitem
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro

144
examples/videographicsitem/videoitem.cpp
View File

@@ -1,144 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
** You may use this file under the terms of the BSD license as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
** met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
** of its contributors may be used to endorse or promote products derived
** from this software without specific prior written permission.
**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "videoitem.h"
#include <QtWidgets>
#include <qvideosurfaceformat.h>
VideoItem::VideoItem(QGraphicsItem *parent)
: QGraphicsItem(parent)
, imageFormat(QImage::Format_Invalid)
, framePainted(false)
{
}
VideoItem::~VideoItem()
{
}
QRectF VideoItem::boundingRect() const
{
return QRectF(QPointF(0,0), surfaceFormat().sizeHint());
}
void VideoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
{
Q_UNUSED(option);
Q_UNUSED(widget);
if (currentFrame.map(QAbstractVideoBuffer::ReadOnly)) {
const QTransform oldTransform = painter->transform();
if (surfaceFormat().scanLineDirection() == QVideoSurfaceFormat::BottomToTop) {
painter->scale(1, -1);
painter->translate(0, -boundingRect().height());
}
painter->drawImage(boundingRect(), QImage(
currentFrame.bits(),
imageSize.width(),
imageSize.height(),
imageFormat));
painter->setTransform(oldTransform);
framePainted = true;
currentFrame.unmap();
}
}
QList<QVideoFrame::PixelFormat> VideoItem::supportedPixelFormats(
QAbstractVideoBuffer::HandleType handleType) const
{
if (handleType == QAbstractVideoBuffer::NoHandle) {
return QList<QVideoFrame::PixelFormat>()
<< QVideoFrame::Format_RGB32
<< QVideoFrame::Format_ARGB32
<< QVideoFrame::Format_ARGB32_Premultiplied
<< QVideoFrame::Format_RGB565
<< QVideoFrame::Format_RGB555;
} else {
return QList<QVideoFrame::PixelFormat>();
}
}
bool VideoItem::start(const QVideoSurfaceFormat &format)
{
if (isFormatSupported(format)) {
imageFormat = QVideoFrame::imageFormatFromPixelFormat(format.pixelFormat());
imageSize = format.frameSize();
framePainted = true;
QAbstractVideoSurface::start(format);
prepareGeometryChange();
return true;
} else {
return false;
}
}
void VideoItem::stop()
{
currentFrame = QVideoFrame();
framePainted = false;
QAbstractVideoSurface::stop();
}
bool VideoItem::present(const QVideoFrame &frame)
{
if (!framePainted) {
if (!QAbstractVideoSurface::isActive())
setError(StoppedError);
return false;
} else {
currentFrame = frame;
framePainted = false;
update();
return true;
}
}

78
examples/videographicsitem/videoitem.h
View File

@@ -1,78 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
** You may use this file under the terms of the BSD license as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
** met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
** of its contributors may be used to endorse or promote products derived
** from this software without specific prior written permission.
**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef VIDEOITEM_H
#define VIDEOITEM_H
#include <qabstractvideosurface.h>
#include <QtWidgets/QGraphicsItem>
class VideoItem
: public QAbstractVideoSurface,
public QGraphicsItem
{
Q_OBJECT
Q_INTERFACES(QGraphicsItem)
public:
explicit VideoItem(QGraphicsItem *parentItem = 0);
~VideoItem();
QRectF boundingRect() const;
void paint(
QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
//video surface
QList<QVideoFrame::PixelFormat> supportedPixelFormats(
QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle) const;
bool start(const QVideoSurfaceFormat &format);
void stop();
bool present(const QVideoFrame &frame);
private:
QImage::Format imageFormat;
QSize imageSize;
QVideoFrame currentFrame;
bool framePainted;
};
#endif

5
examples/videographicsitem/videoplayer.cpp
View File

@@ -39,10 +39,10 @@
****************************************************************************/
#include "videoplayer.h"
#include "videoitem.h"
#include <QtWidgets>
#include <qvideosurfaceformat.h>
#include <qgraphicsvideoitem.h>
#if !defined(QT_NO_OPENGL)
# include <QtOpenGL/QGLWidget>
@@ -55,7 +55,8 @@ VideoPlayer::VideoPlayer(QWidget *parent, Qt::WindowFlags flags)
, playButton(0)
, positionSlider(0)
{
videoItem = new VideoItem;
videoItem = new QGraphicsVideoItem;
videoItem->setSize(QSizeF(640, 480));
QGraphicsScene *scene = new QGraphicsScene(this);
QGraphicsView *graphicsView = new QGraphicsView(scene);

6
examples/videographicsitem/videoplayer.h
View File

@@ -49,11 +49,9 @@
QT_BEGIN_NAMESPACE
class QAbstractButton;
class QSlider;
class QGraphicsVideoItem;
QT_END_NAMESPACE
class VideoItem;
class VideoPlayer : public QWidget
{
Q_OBJECT
@@ -76,7 +74,7 @@ private slots:
private:
QMediaPlayer mediaPlayer;
VideoItem *videoItem;
QGraphicsVideoItem *videoItem;
QAbstractButton *playButton;
QSlider *positionSlider;
};