diff options
Diffstat (limited to 'src/multimedia/qmediametadata.cpp')
| -rw-r--r-- | src/multimedia/qmediametadata.cpp | 112 |
1 files changed, 64 insertions, 48 deletions
diff --git a/src/multimedia/qmediametadata.cpp b/src/multimedia/qmediametadata.cpp index 129889095..afbaea5b7 100644 --- a/src/multimedia/qmediametadata.cpp +++ b/src/multimedia/qmediametadata.cpp @@ -1,51 +1,16 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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) 2017 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 "qmediametadata.h" + #include <QtCore/qcoreapplication.h> -#include <qvariant.h> -#include <qobject.h> -#include <qdatetime.h> -#include <qmediaformat.h> -#include <qsize.h> -#include <qurl.h> -#include <qimage.h> +#include <QtCore/qdatetime.h> +#include <QtCore/qobject.h> +#include <QtCore/qsize.h> +#include <QtCore/qurl.h> +#include <QtCore/qvariant.h> +#include <QtGui/qimage.h> +#include <QtMultimedia/qmediaformat.h> QT_BEGIN_NAMESPACE @@ -77,7 +42,7 @@ QT_BEGIN_NAMESPACE Media attributes \row \li MediaType \li The type of the media (audio, video, etc). \li QString \row \li FileFormat \li The file format of the media. \li QMediaFormat::FileFormat - \row \li Duration \li The duration in millseconds of the media. \li qint64 + \row \li Duration \li The duration in milliseconds of the media. \li qint64 \header \li {3,1} Audio attributes @@ -89,6 +54,7 @@ QT_BEGIN_NAMESPACE \row \li VideoFrameRate \li The frame rate of the media's video stream. \li qreal \row \li VideoBitRate \li The bit rate of the media's video stream in bits per second. \li int \row \li VideoCodec \li The codec of the media's video stream. \li QMediaFormat::VideoCodec + \row \li HasHdrContent \li True if video is intended for HDR display (FFmpeg media backend only). \li bool \header \li {3,1} Music attributes @@ -99,7 +65,7 @@ QT_BEGIN_NAMESPACE \row \li Composer \li The composer of the media. \li QStringList \row \li LeadPerformer \li The lead performer in the media. \li QStringList - \row \li ThumbnailImage \li An embedded thumbnail image. \li QImage + \row \li ThumbnailImage \li An embedded thumbnail image if present in metadata. \li QImage \row \li CoverArtImage \li An embedded cover art image. \li QImage \header \li {3,1} @@ -165,6 +131,10 @@ QMetaType QMediaMetaData::keyType(Key key) case Resolution: return QMetaType::fromType<QSize>(); + + case HasHdrContent: + return QMetaType::fromType<bool>(); + default: return QMetaType::fromType<void>(); } @@ -280,6 +250,47 @@ QMetaType QMediaMetaData::keyType(Key key) */ /*! + \enum QMediaMetaData::Key + + The following meta data keys can be used: + + \value Title Media title + \value Author Media author + \value Comment Comment + \value Description Brief desripttion + \value Genre Genre the media belongs to + \value Date Creation date + \value Language Media language + \value Publisher Media publisher info. + \value Copyright Media copyright info. + \value Url Publisher's website URL + \value Duration Media playback duration + \value MediaType Type of the media + \value FileFormat File format + \value AudioBitRate + \value AudioCodec + \value VideoBitRate + \value VideoCodec + \value VideoFrameRate + \value AlbumTitle Album's title + \value AlbumArtist Artist's info. + \value ContributingArtist + \value TrackNumber + \value Composer Media composer's info. + \value LeadPerformer + \value ThumbnailImage Media thumbnail image (if embedded in metadata) + \value CoverArtImage Media cover art + \value Orientation + \value Resolution + \value [since 6.8] HasHdrContent Video may have HDR content (read only, FFmpeg media backend only) +*/ + +/*! + \variable QMediaMetaData::NumMetaData + \internal +*/ + +/*! \qmlmethod variant QtMultimedia::mediaMetaData::value(Key key) Returns the meta data value for Key \a key, or a null QVariant if no @@ -381,6 +392,7 @@ QString QMediaMetaData::stringValue(QMediaMetaData::Key key) const case Composer: case Orientation: case LeadPerformer: + case HasHdrContent: return value.toString(); case Language: { auto l = value.value<QLocale::Language>(); @@ -398,7 +410,7 @@ QString QMediaMetaData::stringValue(QMediaMetaData::Key key) const return QMediaFormat::videoCodecName(value.value<QMediaFormat::VideoCodec>()); case Resolution: { QSize size = value.toSize(); - return QString::fromUtf8("%1 x %2").arg(size.width()).arg(size.height()); + return QStringLiteral("%1 x %2").arg(size.width()).arg(size.height()); } case ThumbnailImage: case CoverArtImage: @@ -475,6 +487,8 @@ QString QMediaMetaData::metaDataKeyToString(QMediaMetaData::Key key) return (QCoreApplication::translate("QMediaMetaData", "Resolution")); case QMediaMetaData::LeadPerformer: return (QCoreApplication::translate("QMediaMetaData", "Lead performer")); + case QMediaMetaData::HasHdrContent: + return (QCoreApplication::translate("QMediaMetaData", "Has HDR content")); } return QString(); } @@ -508,3 +522,5 @@ QString QMediaMetaData::metaDataKeyToString(QMediaMetaData::Key key) */ QT_END_NAMESPACE + +#include "moc_qmediametadata.cpp" |