Add MediaPlayer support to AVFoundation plugin
This plugin would be used on Mac 10.7+ where without the QuickTime C API our QT7 media player performance was crippled. Change-Id: Iaadb1990a8f63393c4cd02d096624e0fed42b40f Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Jason Barron <jason.barron@digia.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
This commit is contained in:
Andy Nichols
committed by
The Qt Project
The Qt Project
parent
7f25187774
commit
700b4cdf42
219
src/plugins/avfoundation/mediaplayer/avfvideowidgetcontrol.mm
Normal file
219
src/plugins/avfoundation/mediaplayer/avfvideowidgetcontrol.mm
Normal file
@@ -0,0 +1,219 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** 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.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, 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, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia 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.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "avfvideowidgetcontrol.h"
|
||||
|
||||
#include "avfvideowidget.h"
|
||||
#include "avfvideoframerenderer.h"
|
||||
#include "avfdisplaylink.h"
|
||||
|
||||
#ifdef QT_DEBUG_AVF
|
||||
#include <QtCore/QDebug>
|
||||
#endif
|
||||
|
||||
#import <AVFoundation/AVFoundation.h>
|
||||
|
||||
QT_USE_NAMESPACE
|
||||
|
||||
AVFVideoWidgetControl::AVFVideoWidgetControl(QObject *parent)
|
||||
: QVideoWidgetControl(parent)
|
||||
, m_frameRenderer(0)
|
||||
, m_aspectRatioMode(Qt::KeepAspectRatio)
|
||||
, m_fullscreen(false)
|
||||
, m_brightness(0)
|
||||
, m_contrast(0)
|
||||
, m_hue(0)
|
||||
, m_saturation(0)
|
||||
, m_playerLayer(0)
|
||||
{
|
||||
QGLFormat format = QGLFormat::defaultFormat();
|
||||
format.setSwapInterval(1); // Vertical sync (avoid tearing)
|
||||
format.setDoubleBuffer(true);
|
||||
m_videoWidget = new AVFVideoWidget(0, format);
|
||||
|
||||
m_displayLink = new AVFDisplayLink(this);
|
||||
connect(m_displayLink, SIGNAL(tick(CVTimeStamp)), this, SLOT(updateVideoFrame(CVTimeStamp)));
|
||||
}
|
||||
|
||||
AVFVideoWidgetControl::~AVFVideoWidgetControl()
|
||||
{
|
||||
#ifdef QT_DEBUG_AVF
|
||||
qDebug() << Q_FUNC_INFO;
|
||||
#endif
|
||||
m_displayLink->stop();
|
||||
if (m_playerLayer)
|
||||
[(AVPlayerLayer*)m_playerLayer release];
|
||||
|
||||
delete m_videoWidget;
|
||||
}
|
||||
|
||||
void AVFVideoWidgetControl::setLayer(void *playerLayer)
|
||||
{
|
||||
#ifdef QT_DEBUG_AVF
|
||||
qDebug() << Q_FUNC_INFO << playerLayer;
|
||||
#endif
|
||||
|
||||
if (m_playerLayer == playerLayer)
|
||||
return;
|
||||
|
||||
[(AVPlayerLayer*)playerLayer retain];
|
||||
[(AVPlayerLayer*)m_playerLayer release];
|
||||
|
||||
m_playerLayer = playerLayer;
|
||||
|
||||
//If there is no layer to render, stop scheduling updates
|
||||
if (m_playerLayer == 0) {
|
||||
m_displayLink->stop();
|
||||
return;
|
||||
}
|
||||
|
||||
setupVideoOutput();
|
||||
|
||||
//make sure we schedule updates
|
||||
if (!m_displayLink->isActive()) {
|
||||
m_displayLink->start();
|
||||
}
|
||||
}
|
||||
|
||||
QWidget *AVFVideoWidgetControl::videoWidget()
|
||||
{
|
||||
return m_videoWidget;
|
||||
}
|
||||
|
||||
bool AVFVideoWidgetControl::isFullScreen() const
|
||||
{
|
||||
return m_fullscreen;
|
||||
}
|
||||
|
||||
void AVFVideoWidgetControl::setFullScreen(bool fullScreen)
|
||||
{
|
||||
m_fullscreen = fullScreen;
|
||||
}
|
||||
|
||||
Qt::AspectRatioMode AVFVideoWidgetControl::aspectRatioMode() const
|
||||
{
|
||||
return m_aspectRatioMode;
|
||||
}
|
||||
|
||||
void AVFVideoWidgetControl::setAspectRatioMode(Qt::AspectRatioMode mode)
|
||||
{
|
||||
m_aspectRatioMode = mode;
|
||||
m_videoWidget->setAspectRatioMode(mode);
|
||||
}
|
||||
|
||||
int AVFVideoWidgetControl::brightness() const
|
||||
{
|
||||
return m_brightness;
|
||||
}
|
||||
|
||||
void AVFVideoWidgetControl::setBrightness(int brightness)
|
||||
{
|
||||
m_brightness = brightness;
|
||||
}
|
||||
|
||||
int AVFVideoWidgetControl::contrast() const
|
||||
{
|
||||
return m_contrast;
|
||||
}
|
||||
|
||||
void AVFVideoWidgetControl::setContrast(int contrast)
|
||||
{
|
||||
m_contrast = contrast;
|
||||
}
|
||||
|
||||
int AVFVideoWidgetControl::hue() const
|
||||
{
|
||||
return m_hue;
|
||||
}
|
||||
|
||||
void AVFVideoWidgetControl::setHue(int hue)
|
||||
{
|
||||
m_hue = hue;
|
||||
}
|
||||
|
||||
int AVFVideoWidgetControl::saturation() const
|
||||
{
|
||||
return m_saturation;
|
||||
}
|
||||
|
||||
void AVFVideoWidgetControl::setSaturation(int saturation)
|
||||
{
|
||||
m_saturation = saturation;
|
||||
}
|
||||
|
||||
void AVFVideoWidgetControl::updateVideoFrame(const CVTimeStamp &ts)
|
||||
{
|
||||
Q_UNUSED(ts)
|
||||
|
||||
AVPlayerLayer *playerLayer = (AVPlayerLayer*)m_playerLayer;
|
||||
|
||||
if (!playerLayer) {
|
||||
qWarning("updateVideoFrame called without AVPlayerLayer (which shouldn't happen)");
|
||||
return;
|
||||
}
|
||||
|
||||
//Don't try to render a layer that is not ready
|
||||
if (!playerLayer.readyForDisplay)
|
||||
return;
|
||||
|
||||
GLuint textureId = m_frameRenderer->renderLayerToTexture(playerLayer);
|
||||
|
||||
//Make sure we have a valid texture
|
||||
if (textureId == 0) {
|
||||
qWarning("renderLayerToTexture failed");
|
||||
return;
|
||||
}
|
||||
|
||||
m_videoWidget->setTexture(textureId);
|
||||
}
|
||||
|
||||
void AVFVideoWidgetControl::setupVideoOutput()
|
||||
{
|
||||
NSRect layerBounds = [(AVPlayerLayer*)m_playerLayer bounds];
|
||||
m_nativeSize = QSize(layerBounds.size.width, layerBounds.size.height);
|
||||
m_videoWidget->setNativeSize(m_nativeSize);
|
||||
|
||||
if (m_frameRenderer)
|
||||
delete m_frameRenderer;
|
||||
|
||||
m_frameRenderer = new AVFVideoFrameRenderer(m_videoWidget, m_nativeSize, this);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user