diff options
Diffstat (limited to 'src/multimedia/darwin/qcoreaudioutils.mm')
| -rw-r--r-- | src/multimedia/darwin/qcoreaudioutils.mm | 72 |
1 files changed, 23 insertions, 49 deletions
diff --git a/src/multimedia/darwin/qcoreaudioutils.mm b/src/multimedia/darwin/qcoreaudioutils.mm index c8ee541cf..46f98dcc9 100644 --- a/src/multimedia/darwin/qcoreaudioutils.mm +++ b/src/multimedia/darwin/qcoreaudioutils.mm @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins 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 and/or its subsidiary(-ies). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qcoreaudioutils_p.h" #include <qdebug.h> @@ -260,7 +224,9 @@ QAudioFormat::ChannelConfig CoreAudioUtils::fromAudioChannelLayout(const AudioCh quint32 channels = 0; if (layout->mChannelLayoutTag == kAudioChannelLayoutTag_UseChannelDescriptions) { // special case 1 and 2 channel configs, as they are often reported without proper descriptions - if (layout->mNumberChannelDescriptions == 1 && layout->mChannelDescriptions[0].mChannelLabel == kAudioChannelLabel_Unknown) + if (layout->mNumberChannelDescriptions == 1 + && (layout->mChannelDescriptions[0].mChannelLabel == kAudioChannelLabel_Unknown + || layout->mChannelDescriptions[0].mChannelLabel == kAudioChannelLabel_Mono)) return QAudioFormat::ChannelConfigMono; if (layout->mNumberChannelDescriptions == 2 && layout->mChannelDescriptions[0].mChannelLabel == kAudioChannelLabel_Unknown && @@ -268,19 +234,27 @@ QAudioFormat::ChannelConfig CoreAudioUtils::fromAudioChannelLayout(const AudioCh return QAudioFormat::ChannelConfigStereo; for (uint i = 0; i < layout->mNumberChannelDescriptions; ++i) { - bool found = false; - for (const auto &m : channelMap) { - if (layout->mChannelDescriptions[i].mChannelLabel == m.label) { - channels |= QAudioFormat::channelConfig(m.pos); - found = true; - break; - } + const auto channelLabel = layout->mChannelDescriptions[i].mChannelLabel; + if (channelLabel == kAudioChannelLabel_Unknown) { + // Any number of unknown channel labels occurs for loopback audio devices. + // E.g. the case is reproduced with installed software Soundflower. + continue; } - if (!found) - qWarning() << "audio device has unknown channel" << layout->mChannelDescriptions[i].mChannelLabel; + + const auto found = std::find_if(channelMap, std::end(channelMap), + [channelLabel](const auto &labelWithPos) { + return labelWithPos.label == channelLabel; + }); + + if (found == std::end(channelMap)) + qWarning() << "audio device has unrecognized channel, index:" << i + << "label:" << channelLabel; + else + channels |= QAudioFormat::channelConfig(found->pos); } } else { - qWarning() << "Channel layout uses unimplemented format"; + qWarning() << "Channel layout uses unimplemented format, channelLayoutTag:" + << layout->mChannelLayoutTag; } return QAudioFormat::ChannelConfig(channels); } |