diff options
Diffstat (limited to 'src/plugins/multimedia/darwin/mediaplayer/avfmediaplayer_p.h')
-rw-r--r-- | src/plugins/multimedia/darwin/mediaplayer/avfmediaplayer_p.h | 45 |
1 files changed, 4 insertions, 41 deletions
diff --git a/src/plugins/multimedia/darwin/mediaplayer/avfmediaplayer_p.h b/src/plugins/multimedia/darwin/mediaplayer/avfmediaplayer_p.h index 6993a28d7..d04ab0818 100644 --- a/src/plugins/multimedia/darwin/mediaplayer/avfmediaplayer_p.h +++ b/src/plugins/multimedia/darwin/mediaplayer/avfmediaplayer_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef AVFMEDIAPLAYER_H #define AVFMEDIAPLAYER_H @@ -110,7 +74,7 @@ public: QMediaMetaData metaData() const override; static void videoOrientationForAssetTrack(AVAssetTrack *track, - QVideoFrame::RotationAngle &angle, + QtVideo::Rotation &angle, bool &mirrored); public Q_SLOTS: @@ -157,7 +121,7 @@ private: void setSeekable(bool seekable); void resetStream(QIODevice *stream = nullptr); - void orientationChanged(QVideoFrame::RotationAngle rotation, bool mirrored); + void orientationChanged(QtVideo::Rotation rotation, bool mirrored); AVFVideoRendererControl *m_videoOutput = nullptr; AVFVideoSink *m_videoSink = nullptr; @@ -168,7 +132,6 @@ private: QUrl m_resources; QMediaMetaData m_metaData; - bool m_tryingAsync; qreal m_rate; qint64 m_requestedPosition; |