diff options
Diffstat (limited to 'src/multimedia/qmediaformat.cpp')
| -rw-r--r-- | src/multimedia/qmediaformat.cpp | 91 |
1 files changed, 39 insertions, 52 deletions
diff --git a/src/multimedia/qmediaformat.cpp b/src/multimedia/qmediaformat.cpp index 27dd913cf..a05648636 100644 --- a/src/multimedia/qmediaformat.cpp +++ b/src/multimedia/qmediaformat.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 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) 2021 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 #include "qmediaformat.h" #include "private/qplatformmediaintegration_p.h" @@ -403,6 +367,11 @@ QMediaFormat::~QMediaFormat() = default; QMediaFormat::QMediaFormat(const QMediaFormat &other) noexcept = default; /*! + \fn void QMediaFormat::swap(QMediaFormat &other) noexcept + + Swaps the media format with \a other. +*/ +/*! Copies \a other into this QMediaFormat object. */ QMediaFormat &QMediaFormat::operator=(const QMediaFormat &other) noexcept = default; @@ -486,14 +455,6 @@ QMimeType QMediaFormat::mimeType() const return QMimeDatabase().mimeTypeForName(QString::fromLatin1(mimeTypeForFormat[fmt + 1])); } -static QPlatformMediaFormatInfo *formatInfo() -{ - QPlatformMediaFormatInfo *result = nullptr; - if (auto *pi = QPlatformMediaIntegration::instance()) - result = pi->formatInfo(); - return result; -} - /*! \enum QMediaFormat::ConversionMode @@ -532,8 +493,7 @@ static QPlatformMediaFormatInfo *formatInfo() */ QList<QMediaFormat::FileFormat> QMediaFormat::supportedFileFormats(QMediaFormat::ConversionMode m) { - auto *fi = formatInfo(); - return fi != nullptr ? fi->supportedFileFormats(*this, m) : QList<QMediaFormat::FileFormat>{}; + return QPlatformMediaIntegration::instance()->formatInfo()->supportedFileFormats(*this, m); } /*! @@ -559,8 +519,7 @@ QList<QMediaFormat::FileFormat> QMediaFormat::supportedFileFormats(QMediaFormat: */ QList<QMediaFormat::VideoCodec> QMediaFormat::supportedVideoCodecs(QMediaFormat::ConversionMode m) { - auto *fi = formatInfo(); - return fi != nullptr ? fi->supportedVideoCodecs(*this, m) : QList<QMediaFormat::VideoCodec>{}; + return QPlatformMediaIntegration::instance()->formatInfo()->supportedVideoCodecs(*this, m); } /*! @@ -586,8 +545,7 @@ QList<QMediaFormat::VideoCodec> QMediaFormat::supportedVideoCodecs(QMediaFormat: */ QList<QMediaFormat::AudioCodec> QMediaFormat::supportedAudioCodecs(QMediaFormat::ConversionMode m) { - auto *fi = formatInfo(); - return fi != nullptr ? fi->supportedAudioCodecs(*this, m) : QList<QMediaFormat::AudioCodec>{}; + return QPlatformMediaIntegration::instance()->formatInfo()->supportedAudioCodecs(*this, m); } /*! @@ -758,6 +716,17 @@ QString QMediaFormat::videoCodecDescription(QMediaFormat::VideoCodec codec) return QString::fromUtf8(descriptions[int(codec) + 1]); } +/*! + \fn bool QMediaFormat::operator!=(const QMediaFormat &other) const + + Returns \c true if \a other is not equal to the current media format, + otherwise returns \c false. +*/ + +/*! + Returns \c true if \a other is equal to the current media format, otherwise + returns \c false. +*/ bool QMediaFormat::operator==(const QMediaFormat &other) const { Q_ASSERT(!d); @@ -893,4 +862,22 @@ void QMediaFormat::resolveForEncoding(ResolveFlags flags) } } +/*! + \variable QMediaFormat::audio + \internal +*/ +/*! + \variable QMediaFormat::d + \internal +*/ +/*! + \variable QMediaFormat::video + \internal +*/ +/*! + \variable QMediaFormat::fmt + \internal +*/ QT_END_NAMESPACE + +#include "moc_qmediaformat.cpp" |