diff options
Diffstat (limited to 'src/multimedia/windows/qwindowsmultimediautils.cpp')
-rw-r--r-- | src/multimedia/windows/qwindowsmultimediautils.cpp | 51 |
1 files changed, 13 insertions, 38 deletions
diff --git a/src/multimedia/windows/qwindowsmultimediautils.cpp b/src/multimedia/windows/qwindowsmultimediautils.cpp index b83233893..258cb3e96 100644 --- a/src/multimedia/windows/qwindowsmultimediautils.cpp +++ b/src/multimedia/windows/qwindowsmultimediautils.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 #if defined(WINVER) && WINVER < _WIN32_WINNT_WIN10 # undef WINVER @@ -46,9 +10,11 @@ #include "qwindowsmultimediautils_p.h" +#include <initguid.h> #include <mfapi.h> #include <mfidl.h> #include <qwindowsmfdefs_p.h> +#include <system_error> QT_BEGIN_NAMESPACE @@ -86,6 +52,8 @@ QVideoFrameFormat::PixelFormat QWindowsMultimediaUtils::pixelFormatFromMediaSubt return QVideoFrameFormat::Format_Y8; if (subtype == MFVideoFormat_L16) return QVideoFrameFormat::Format_Y16; + if (subtype == MFVideoFormat_MJPG) + return QVideoFrameFormat::Format_Jpeg; return QVideoFrameFormat::Format_Invalid; } @@ -237,4 +205,11 @@ GUID QWindowsMultimediaUtils::containerForAudioFileFormat(QMediaFormat::FileForm } } +QString QWindowsMultimediaUtils::errorString(HRESULT hr) +{ + return QStringLiteral("%1 %2") + .arg(quint32(hr), 8, 16) + .arg(QString::fromStdString(std::system_category().message(hr))); +} + QT_END_NAMESPACE |