diff options
Diffstat (limited to 'src/multimedia/audio/qaudioformat.h')
| -rw-r--r-- | src/multimedia/audio/qaudioformat.h | 55 |
1 files changed, 12 insertions, 43 deletions
diff --git a/src/multimedia/audio/qaudioformat.h b/src/multimedia/audio/qaudioformat.h index 40e8ed8eb..a04ab6e1a 100644 --- a/src/multimedia/audio/qaudioformat.h +++ b/src/multimedia/audio/qaudioformat.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 QAUDIOFORMAT_H @@ -81,28 +45,31 @@ public: FrontLeftOfCenter, FrontRightOfCenter, BackCenter, - LFE2, SideLeft, SideRight, + TopCenter, TopFrontLeft, - TopFrontRight, TopFrontCenter, - TopCenter, + TopFrontRight, TopBackLeft, + TopBackCenter, TopBackRight, + LFE2, TopSideLeft, TopSideRight, - TopBackCenter, BottomFrontCenter, BottomFrontLeft, BottomFrontRight }; + static constexpr int NChannelPositions = BottomFrontRight + 1; enum ChannelConfig : quint32 { ChannelConfigUnknown = 0, ChannelConfigMono = QtPrivate::channelConfig(FrontCenter), ChannelConfigStereo = QtPrivate::channelConfig(FrontLeft, FrontRight), ChannelConfig2Dot1 = QtPrivate::channelConfig(FrontLeft, FrontRight, LFE), + ChannelConfig3Dot0 = QtPrivate::channelConfig(FrontLeft, FrontRight, FrontCenter), + ChannelConfig3Dot1 = QtPrivate::channelConfig(FrontLeft, FrontRight, FrontCenter, LFE), ChannelConfigSurround5Dot0 = QtPrivate::channelConfig(FrontLeft, FrontRight, FrontCenter, BackLeft, BackRight), ChannelConfigSurround5Dot1 = QtPrivate::channelConfig(FrontLeft, FrontRight, FrontCenter, LFE, BackLeft, BackRight), ChannelConfigSurround7Dot0 = QtPrivate::channelConfig(FrontLeft, FrontRight, FrontCenter, BackLeft, BackRight, SideLeft, SideRight), @@ -110,7 +77,7 @@ public: }; template <typename... Args> - static ChannelConfig channelConfig(Args... channels) + static constexpr ChannelConfig channelConfig(Args... channels) { return ChannelConfig(QtPrivate::channelConfig(channels...)); } @@ -171,6 +138,8 @@ public: return !(a == b); } + static Q_MULTIMEDIA_EXPORT ChannelConfig defaultChannelConfigForChannelCount(int channelCount); + private: SampleFormat m_sampleFormat = SampleFormat::Unknown; short m_channelCount = 0; |