AVFoundation: Add QVideoWindowControl support
This adds the capability to render videos directly to native window surfaces when using the AVFoundation plugin. This adds limited support for displaying videos from QML on iOS. These videos are displayed in a CALayer above the QQuickWindow, so it will not be possible to render any QtQuick items on top of a video using the QVideoWindowControl to provide video. [ChangeLog][QtMultimedia][iOS] Add limited support for playing videos in QtQuick on iOS (Videos are played on top of scene with limited transform support). Change-Id: I80381d9a07b45b6fa1959678166e6da0004f8c19 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
This commit is contained in:
committed by
The Qt Project
parent
ec3d65aecf
commit
ea5d56c5ab
120
src/plugins/avfoundation/mediaplayer/avfvideowindowcontrol.h
Normal file
120
src/plugins/avfoundation/mediaplayer/avfvideowindowcontrol.h
Normal file
@@ -0,0 +1,120 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2014 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$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef AVFVIDEOWINDOWCONTROL_H
|
||||
#define AVFVIDEOWINDOWCONTROL_H
|
||||
|
||||
#include <QVideoWindowControl>
|
||||
|
||||
@class AVPlayerLayer;
|
||||
#if defined(Q_OS_OSX)
|
||||
@class NSView;
|
||||
typedef NSView NativeView;
|
||||
#else
|
||||
@class UIView;
|
||||
typedef UIView NativeView;
|
||||
#endif
|
||||
|
||||
#include "avfvideooutput.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class AVFVideoWindowControl : public QVideoWindowControl, public AVFVideoOutput
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_INTERFACES(AVFVideoOutput)
|
||||
|
||||
public:
|
||||
AVFVideoWindowControl(QObject *parent = 0);
|
||||
virtual ~AVFVideoWindowControl();
|
||||
|
||||
// QVideoWindowControl interface
|
||||
public:
|
||||
WId winId() const;
|
||||
void setWinId(WId id);
|
||||
|
||||
QRect displayRect() const;
|
||||
void setDisplayRect(const QRect &rect);
|
||||
|
||||
bool isFullScreen() const;
|
||||
void setFullScreen(bool fullScreen);
|
||||
|
||||
void repaint();
|
||||
QSize nativeSize() const;
|
||||
|
||||
Qt::AspectRatioMode aspectRatioMode() const;
|
||||
void setAspectRatioMode(Qt::AspectRatioMode mode);
|
||||
|
||||
int brightness() const;
|
||||
void setBrightness(int brightness);
|
||||
|
||||
int contrast() const;
|
||||
void setContrast(int contrast);
|
||||
|
||||
int hue() const;
|
||||
void setHue(int hue);
|
||||
|
||||
int saturation() const;
|
||||
void setSaturation(int saturation);
|
||||
|
||||
// AVFVideoOutput interface
|
||||
void setLayer(void *playerLayer);
|
||||
|
||||
private:
|
||||
void updateAspectRatio();
|
||||
void updatePlayerLayerBounds();
|
||||
|
||||
WId m_winId;
|
||||
QRect m_displayRect;
|
||||
bool m_fullscreen;
|
||||
int m_brightness;
|
||||
int m_contrast;
|
||||
int m_hue;
|
||||
int m_saturation;
|
||||
Qt::AspectRatioMode m_aspectRatioMode;
|
||||
QSize m_nativeSize;
|
||||
AVPlayerLayer *m_playerLayer;
|
||||
NativeView *m_nativeView;
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // AVFVIDEOWINDOWCONTROL_H
|
||||
Reference in New Issue
Block a user