Files
qtmultimedia/src/plugins/avfoundation/mediaplayer/avfvideowidget.mm
Yoann Lopes 5f0f81bcc1 AVFoundation: fix some controls not being correctly destroyed on iOS.
This patch also makes sure AVF video layers are removed from their
parent layer when their corresponding Qt video outputs are destroyed.

Task-number: QTBUG-39385
Change-Id: I164cd0da7084f84c0473ed3e396e734acce2a22e
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2014-08-25 17:30:31 +02:00

179 lines
5.3 KiB
Plaintext

/****************************************************************************
**
** Copyright (C) 2013 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 "avfvideowidget.h"
#include <QtCore/QDebug>
#include <AVFoundation/AVFoundation.h>
#include <QtGui/QResizeEvent>
#include <QtGui/QPaintEvent>
#include <QtGui/QPainter>
QT_USE_NAMESPACE
AVFVideoWidget::AVFVideoWidget(QWidget *parent)
: QWidget(parent)
, m_aspectRatioMode(Qt::KeepAspectRatio)
, m_playerLayer(0)
, m_nativeView(0)
{
setAutoFillBackground(false);
}
AVFVideoWidget::~AVFVideoWidget()
{
#ifdef QT_DEBUG_AVF
qDebug() << Q_FUNC_INFO;
#endif
if (m_playerLayer) {
[m_playerLayer removeFromSuperlayer];
[m_playerLayer release];
}
}
QSize AVFVideoWidget::sizeHint() const
{
return m_nativeSize;
}
Qt::AspectRatioMode AVFVideoWidget::aspectRatioMode() const
{
return m_aspectRatioMode;
}
void AVFVideoWidget::setAspectRatioMode(Qt::AspectRatioMode mode)
{
if (m_aspectRatioMode != mode) {
m_aspectRatioMode = mode;
updateAspectRatio();
}
}
void AVFVideoWidget::setPlayerLayer(AVPlayerLayer *layer)
{
if (m_playerLayer == layer)
return;
if (!m_nativeView) {
//make video widget a native window
#if defined(Q_OS_OSX)
m_nativeView = (NSView*)this->winId();
[m_nativeView setWantsLayer:YES];
#else
m_nativeView = (UIView*)this->winId();
#endif
}
if (m_playerLayer) {
[m_playerLayer removeFromSuperlayer];
[m_playerLayer release];
}
m_playerLayer = layer;
CALayer *nativeLayer = [m_nativeView layer];
if (layer) {
[layer retain];
m_nativeSize = QSize(m_playerLayer.bounds.size.width,
m_playerLayer.bounds.size.height);
updateAspectRatio();
[nativeLayer addSublayer:m_playerLayer];
updatePlayerLayerBounds(this->size());
}
#ifdef QT_DEBUG_AVF
NSArray *sublayers = [nativeLayer sublayers];
qDebug() << "playerlayer: " << "at z:" << [m_playerLayer zPosition]
<< " frame: " << m_playerLayer.frame.size.width << "x" << m_playerLayer.frame.size.height;
qDebug() << "superlayer: " << "at z:" << [nativeLayer zPosition]
<< " frame: " << nativeLayer.frame.size.width << "x" << nativeLayer.frame.size.height;
int i = 0;
for (CALayer *layer in sublayers) {
qDebug() << "layer " << i << ": at z:" << [layer zPosition]
<< " frame: " << layer.frame.size.width << "x" << layer.frame.size.height;
i++;
}
#endif
}
void AVFVideoWidget::resizeEvent(QResizeEvent *event)
{
updatePlayerLayerBounds(event->size());
QWidget::resizeEvent(event);
}
void AVFVideoWidget::paintEvent(QPaintEvent *event)
{
QPainter painter(this);
painter.fillRect(rect(), Qt::black);
QWidget::paintEvent(event);
}
void AVFVideoWidget::updateAspectRatio()
{
if (m_playerLayer) {
switch (m_aspectRatioMode) {
case Qt::IgnoreAspectRatio:
[m_playerLayer setVideoGravity:AVLayerVideoGravityResize];
break;
case Qt::KeepAspectRatio:
[m_playerLayer setVideoGravity:AVLayerVideoGravityResizeAspect];
break;
case Qt::KeepAspectRatioByExpanding:
[m_playerLayer setVideoGravity:AVLayerVideoGravityResizeAspectFill];
break;
default:
break;
}
}
}
void AVFVideoWidget::updatePlayerLayerBounds(const QSize &size)
{
m_playerLayer.bounds = CGRectMake(0.0f, 0.0f, (float)size.width(), (float)size.height());
}