diff options
Diffstat (limited to 'src/multimedia')
301 files changed, 11258 insertions, 16833 deletions
diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt index 4c295072c..8ccf81c0c 100644 --- a/src/multimedia/CMakeLists.txt +++ b/src/multimedia/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from multimedia.pro. ##################################################################### @@ -15,37 +18,49 @@ qt_internal_find_apple_system_framework(FWAudioToolbox AudioToolbox) # special c qt_internal_add_module(Multimedia PLUGIN_TYPES multimedia SOURCES - audio/qaudio.cpp audio/qaudio.h + audio/qtaudio.cpp audio/qtaudio.h audio/qaudio.h audio/qaudiobuffer.cpp audio/qaudiobuffer.h - audio/qaudiodecoder.cpp audio/qaudiodecoder.h + audio/qaudiodecoder.cpp audio/qaudiodecoder.h audio/qaudiodecoder_p.h audio/qaudiodevice.cpp audio/qaudiodevice.h audio/qaudiodevice_p.h audio/qaudioinput.cpp audio/qaudioinput.h + audio/qaudiobufferinput.cpp audio/qaudiobufferinput.h + audio/qaudiobufferoutput.cpp audio/qaudiobufferoutput.h audio/qaudiobufferoutput_p.h audio/qaudiooutput.cpp audio/qaudiooutput.h audio/qaudioformat.cpp audio/qaudioformat.h audio/qaudiohelpers.cpp audio/qaudiohelpers_p.h audio/qaudiosource.cpp audio/qaudiosource.h audio/qaudiosink.cpp audio/qaudiosink.h audio/qaudiosystem.cpp audio/qaudiosystem_p.h + audio/qaudiostatemachine.cpp audio/qaudiostatemachine_p.h + audio/qaudiostatemachineutils_p.h audio/qsamplecache_p.cpp audio/qsamplecache_p.h audio/qsoundeffect.cpp audio/qsoundeffect.h audio/qwavedecoder.cpp audio/qwavedecoder.h camera/qcamera.cpp camera/qcamera.h camera/qcamera_p.h camera/qcameradevice.cpp camera/qcameradevice.h camera/qcameradevice_p.h camera/qimagecapture.cpp camera/qimagecapture.h + compat/removed_api.cpp + platform/qgstreamer_platformspecificinterface.cpp platform/qgstreamer_platformspecificinterface_p.h platform/qplatformaudiodecoder.cpp platform/qplatformaudiodecoder_p.h platform/qplatformaudioinput_p.h platform/qplatformaudiooutput_p.h + platform/qplatformaudioresampler_p.h platform/qplatformcamera.cpp platform/qplatformcamera_p.h + platform/qplatformcapturablewindows_p.h platform/qplatformimagecapture.cpp platform/qplatformimagecapture_p.h platform/qplatformmediacapture.cpp platform/qplatformmediacapture_p.h platform/qplatformmediadevices.cpp platform/qplatformmediadevices_p.h - platform/qplatformmediarecorder.cpp platform/qplatformmediarecorder_p.h platform/qplatformmediaformatinfo.cpp platform/qplatformmediaformatinfo_p.h platform/qplatformmediaintegration.cpp platform/qplatformmediaintegration_p.h platform/qplatformmediaplayer.cpp platform/qplatformmediaplayer_p.h - platform/qplatformmediaplugin_p.h + platform/qplatformmediaplugin.cpp platform/qplatformmediaplugin_p.h + platform/qplatformmediarecorder.cpp platform/qplatformmediarecorder_p.h + platform/qplatformsurfacecapture.cpp platform/qplatformsurfacecapture_p.h platform/qplatformvideodevices.cpp platform/qplatformvideodevices_p.h platform/qplatformvideosink.cpp platform/qplatformvideosink_p.h + platform/qplatformvideosource.cpp platform/qplatformvideosource_p.h + platform/qplatformvideoframeinput.cpp platform/qplatformvideoframeinput_p.h + platform/qplatformaudiobufferinput.cpp platform/qplatformaudiobufferinput_p.h playback/qmediaplayer.cpp playback/qmediaplayer.h playback/qmediaplayer_p.h qmediadevices.cpp qmediadevices.h qmediaenumdebug.h @@ -54,12 +69,22 @@ qt_internal_add_module(Multimedia qmediastoragelocation.cpp qmediastoragelocation_p.h qmediatimerange.cpp qmediatimerange.h qmultimediautils.cpp qmultimediautils_p.h + qmediaframeinput.cpp qmediaframeinput_p.h + qmaybe_p.h qtmultimediaglobal.h qtmultimediaglobal_p.h - recording/qmediacapturesession.cpp recording/qmediacapturesession.h + qerrorinfo_p.h + qmediainputencoderinterface_p.h + recording/qmediacapturesession.cpp recording/qmediacapturesession.h recording/qmediacapturesession_p.h recording/qmediarecorder.cpp recording/qmediarecorder.h recording/qmediarecorder_p.h - video/qabstractvideobuffer.cpp video/qabstractvideobuffer_p.h + recording/qscreencapture.cpp recording/qscreencapture.h + recording/qwindowcapture.cpp recording/qwindowcapture.h + recording/qcapturablewindow.cpp recording/qcapturablewindow.h recording/qcapturablewindow_p.h + recording/qvideoframeinput.cpp recording/qvideoframeinput.h + video/qabstractvideobuffer.cpp video/qabstractvideobuffer.h + video/qhwvideobuffer.cpp video/qhwvideobuffer_p.h video/qmemoryvideobuffer.cpp video/qmemoryvideobuffer_p.h - video/qvideoframe.cpp video/qvideoframe.h + video/qimagevideobuffer.cpp video/qimagevideobuffer_p.h + video/qvideoframe.cpp video/qvideoframe.h video/qvideoframe_p.h video/qvideosink.cpp video/qvideosink.h video/qvideotexturehelper.cpp video/qvideotexturehelper_p.h video/qvideoframeconversionhelper.cpp video/qvideoframeconversionhelper_p.h @@ -67,6 +92,7 @@ qt_internal_add_module(Multimedia video/qvideoframeconverter.cpp video/qvideoframeconverter_p.h video/qvideoframeformat.cpp video/qvideoframeformat.h video/qvideowindow.cpp video/qvideowindow_p.h + video/qtvideo.cpp video/qtvideo.h INCLUDE_DIRECTORIES audio camera @@ -74,7 +100,6 @@ qt_internal_add_module(Multimedia platform playback recording - spatial video LIBRARIES Qt::CorePrivate @@ -86,27 +111,13 @@ qt_internal_add_module(Multimedia PRIVATE_MODULE_INTERFACE Qt::CorePrivate Qt::GuiPrivate - GENERATE_CPP_EXPORTS + NO_PCH_SOURCES + compat/removed_api.cpp ) - -qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_spatialaudio - SOURCES - spatial/qambisonicdecoder.cpp spatial/qambisonicdecoder_p.h spatial/qambisonicdecoderdata_p.h -# spatial/qacousticgeometry.cpp spatial/qacousticgeometry_p.h - spatial/qspatialaudioengine.cpp spatial/qspatialaudioengine.h spatial/qspatialaudioengine_p.h - spatial/qspatialaudiolistener.cpp spatial/qspatialaudiolistener.h - spatial/qspatialaudioroom.cpp spatial/qspatialaudioroom.h spatial/qspatialaudioroom_p.h - spatial/qspatialaudiosoundsource.cpp spatial/qspatialaudiosoundsource.h spatial/qspatialaudiosoundsource_p.h - spatial/qspatialaudiostereosource.cpp spatial/qspatialaudiostereosource.h - INCLUDE_DIRECTORIES - "../3rdparty/resonance-audio/resonance_audio" - "../3rdparty/resonance-audio" - "../resonance-audio" - "../3rdparty/eigen" - LIBRARIES - Qt::BundledResonanceAudio -) +qt_internal_extend_target(Multimedia + CONDITION LINUX OR ANDROID + SOURCES qsymbolsresolveutils.cpp qsymbolsresolveutils_p.h) qt_internal_add_simd_part(Multimedia SIMD sse2 SOURCES @@ -168,7 +179,7 @@ qt_internal_extend_target(Multimedia CONDITION ANDROID OpenSLES ) -if (ANDROID) +if(ANDROID) set_property(TARGET Multimedia APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES jar/Qt${QtMultimedia_VERSION_MAJOR}AndroidMultimedia.jar:org.qtproject.qt.android.multimedia.QtAudioDeviceManager ) @@ -190,6 +201,11 @@ qt_internal_extend_target(Multimedia CONDITION APPLE ${FWCoreFoundation} ) +qt_internal_extend_target(Multimedia CONDITION MACOS + SOURCES + darwin/qmacosaudiodatautils_p.h +) + qt_internal_extend_target(Multimedia CONDITION IOS OR TVOS SOURCES darwin/qcoreaudiosessionmanager.mm darwin/qcoreaudiosessionmanager_p.h @@ -218,20 +234,36 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_wmf windows/qwindowsaudiosink.cpp windows/qwindowsaudiosink_p.h windows/qwindowsaudioutils.cpp windows/qwindowsaudioutils_p.h windows/qwindowsmediadevices.cpp windows/qwindowsmediadevices_p.h + windows/qwindowsmediafoundation.cpp windows/qwindowsmediafoundation_p.h windows/qwindowsresampler.cpp windows/qwindowsresampler_p.h windows/qwindowsmultimediautils.cpp windows/qwindowsmultimediautils_p.h windows/qwindowsmfdefs.cpp windows/qwindowsmfdefs_p.h - windows/qwindowsiupointer_p.h + windows/qcomptr_p.h + windows/qcomtaskresource_p.h INCLUDE_DIRECTORIES windows LIBRARIES - WMF::WMF - mfreadwrite winmm - wmcodecdspuuid ksuser ) +# Only on Windows' MinGW/LLVM build, symbols from `strmif.h` and `ddraw.h` conflicts +# with symbols defined in `ksmedia.h`. +qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_wmf AND MINGW + NO_UNITY_BUILD_SOURCES + windows/qwindowsaudiodevice.cpp windows/qwindowsaudiodevice_p.h + windows/qwindowsaudiosource.cpp windows/qwindowsaudiosource_p.h + windows/qwindowsaudiosink.cpp windows/qwindowsaudiosink_p.h + windows/qwindowsaudioutils.cpp windows/qwindowsaudioutils_p.h + windows/qwindowsmediadevices.cpp windows/qwindowsmediadevices_p.h + windows/qwindowsmediafoundation.cpp windows/qwindowsmediafoundation_p.h + windows/qwindowsresampler.cpp windows/qwindowsresampler_p.h + windows/qwindowsmultimediautils.cpp windows/qwindowsmultimediautils_p.h + windows/qwindowsmfdefs.cpp windows/qwindowsmfdefs_p.h + windows/qcomptr_p.h + windows/qcomtaskresource_p.h +) + qt_internal_extend_target(Multimedia CONDITION WASM SOURCES wasm/qwasmmediadevices.cpp wasm/qwasmmediadevices_p.h @@ -242,6 +274,9 @@ qt_internal_extend_target(Multimedia CONDITION WASM wasm PUBLIC_LIBRARIES openal + NO_UNITY_BUILD_SOURCES + wasm/qwasmaudiosink.cpp + # To avoid collision between symbols defined in wasm/qwasmaudiosource.cpp. ) set(VIDEO_VERTEX_SHADERS @@ -270,7 +305,7 @@ set(VIDEO_SHADERS "shaders/nv12_bt2020_hlg.frag" ) -qt_internal_add_shaders(Multimedia "shaders" +qt_internal_add_shaders(Multimedia "qtmultimedia_shaders" SILENT BATCHABLE PRECOMPILE @@ -284,7 +319,7 @@ qt_internal_add_shaders(Multimedia "shaders" string(REPLACE ".frag" "_linear.frag.qsb" LINEAR_VIDEO_SHADERS "${VIDEO_SHADERS}") -qt_internal_add_shaders(Multimedia "shaders_linear" +qt_internal_add_shaders(Multimedia "qtmultimedia_shaders_linear" SILENT BATCHABLE PRECOMPILE @@ -299,7 +334,7 @@ qt_internal_add_shaders(Multimedia "shaders_linear" QMM_OUTPUTSURFACE_LINEAR ) -qt_internal_add_shaders(Multimedia "shaders_gl_macos" +qt_internal_add_shaders(Multimedia "qtmultimedia_shaders_gl_macos" SILENT BATCHABLE PRECOMPILE @@ -315,7 +350,7 @@ qt_internal_add_shaders(Multimedia "shaders_gl_macos" "shaders/rectsampler_bgra.frag" ) -qt_internal_add_shaders(Multimedia "shaders_gl_macos_linear" +qt_internal_add_shaders(Multimedia "qtmultimedia_shaders_gl_macos_linear" SILENT BATCHABLE PRECOMPILE @@ -331,3 +366,8 @@ qt_internal_add_shaders(Multimedia "shaders_gl_macos_linear" OUTPUTS "shaders/rectsampler_bgra_linear.frag.qsb" ) + +if(DEFINED QT_DEFAULT_MEDIA_BACKEND) + target_compile_definitions(Multimedia + PRIVATE QT_DEFAULT_MEDIA_BACKEND="${QT_DEFAULT_MEDIA_BACKEND}") +endif() diff --git a/src/multimedia/alsa/qalsaaudiodevice.cpp b/src/multimedia/alsa/qalsaaudiodevice.cpp index d38a872ec..893375270 100644 --- a/src/multimedia/alsa/qalsaaudiodevice.cpp +++ b/src/multimedia/alsa/qalsaaudiodevice.cpp @@ -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 // // W A R N I N G @@ -73,55 +37,35 @@ QAlsaAudioDeviceInfo::QAlsaAudioDeviceInfo(const QByteArray &dev, const QString minimumSampleRate = 8000; maximumSampleRate = 48000; - supportedSampleFormats << QAudioFormat::UInt8 << QAudioFormat::Int16 << QAudioFormat::Int32 << QAudioFormat::Float; + supportedSampleFormats = { + QAudioFormat::UInt8, + QAudioFormat::Int16, + QAudioFormat::Int32, + QAudioFormat::Float, + }; preferredFormat.setChannelCount(mode == QAudioDevice::Input ? 1 : 2); preferredFormat.setSampleFormat(QAudioFormat::Float); preferredFormat.setSampleRate(48000); } -QAlsaAudioDeviceInfo::~QAlsaAudioDeviceInfo() -{ -} +QAlsaAudioDeviceInfo::~QAlsaAudioDeviceInfo() = default; void QAlsaAudioDeviceInfo::checkSurround() { + if (mode != QAudioDevice::Output) + return; + surround40 = false; surround51 = false; surround71 = false; - void **hints, **n; - char *name, *descr, *io; - - if(snd_device_name_hint(-1, "pcm", &hints) < 0) - return; - - n = hints; - - while (*n != NULL) { - name = snd_device_name_get_hint(*n, "NAME"); - descr = snd_device_name_get_hint(*n, "DESC"); - io = snd_device_name_get_hint(*n, "IOID"); - if((name != NULL) && (descr != NULL)) { - QString deviceName = QLatin1String(name); - if (mode == QAudioDevice::Output) { - if(deviceName.contains(QLatin1String("surround40"))) - surround40 = true; - if(deviceName.contains(QLatin1String("surround51"))) - surround51 = true; - if(deviceName.contains(QLatin1String("surround71"))) - surround71 = true; - } - } - if(name != NULL) - free(name); - if(descr != NULL) - free(descr); - if(io != NULL) - free(io); - ++n; - } - snd_device_name_free_hint(hints); + if (id.startsWith(QLatin1String("surround40"))) + surround40 = true; + if (id.startsWith(QLatin1String("surround51"))) + surround51 = true; + if (id.startsWith(QLatin1String("surround71"))) + surround71 = true; } QT_END_NAMESPACE diff --git a/src/multimedia/alsa/qalsaaudiodevice_p.h b/src/multimedia/alsa/qalsaaudiodevice_p.h index 4f7bc5757..dcbc9e692 100644 --- a/src/multimedia/alsa/qalsaaudiodevice_p.h +++ b/src/multimedia/alsa/qalsaaudiodevice_p.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 // // W A R N I N G @@ -74,9 +38,9 @@ public: private: void checkSurround(); - bool surround40; - bool surround51; - bool surround71; + bool surround40{}; + bool surround51{}; + bool surround71{}; }; QT_END_NAMESPACE diff --git a/src/multimedia/alsa/qalsaaudiosink.cpp b/src/multimedia/alsa/qalsaaudiosink.cpp index b6c75b7e9..e515219a2 100644 --- a/src/multimedia/alsa/qalsaaudiosink.cpp +++ b/src/multimedia/alsa/qalsaaudiosink.cpp @@ -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 // // W A R N I N G @@ -57,42 +21,22 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcAlsaOutput, "qt.multimedia.alsa.output") +static Q_LOGGING_CATEGORY(lcAlsaOutput, "qt.multimedia.alsa.output") //#define DEBUG_AUDIO 1 -QAlsaAudioSink::QAlsaAudioSink(const QByteArray &device) +QAlsaAudioSink::QAlsaAudioSink(const QByteArray &device, QObject *parent) + : QPlatformAudioSink(parent) { - bytesAvailable = 0; - handle = 0; - access = SND_PCM_ACCESS_RW_INTERLEAVED; - pcmformat = SND_PCM_FORMAT_S16; - buffer_frames = 0; - period_frames = 0; - buffer_size = 0; - period_size = 0; - buffer_time = 100000; - period_time = 20000; - totalTimeValue = 0; - audioBuffer = 0; - errorState = QAudio::NoError; - deviceState = QAudio::StoppedState; - audioSource = 0; - pullMode = true; - resuming = false; - opened = false; - - m_volume = 1.0f; - m_device = device; timer = new QTimer(this); - connect(timer,SIGNAL(timeout()),SLOT(userFeed())); + connect(timer, &QTimer::timeout, this, &QAlsaAudioSink::userFeed); } QAlsaAudioSink::~QAlsaAudioSink() { close(); - disconnect(timer, SIGNAL(timeout())); + disconnect(timer, &QTimer::timeout, this, &QAlsaAudioSink::userFeed); QCoreApplication::processEvents(); delete timer; } @@ -171,21 +115,22 @@ int QAlsaAudioSink::setFormat() break; case QAudioFormat::Int16: if constexpr (QSysInfo::ByteOrder == QSysInfo::BigEndian) - pcmformat = SND_PCM_FORMAT_S16_LE; - else pcmformat = SND_PCM_FORMAT_S16_BE; + else + pcmformat = SND_PCM_FORMAT_S16_LE; break; case QAudioFormat::Int32: if constexpr (QSysInfo::ByteOrder == QSysInfo::BigEndian) - pcmformat = SND_PCM_FORMAT_S32_LE; - else pcmformat = SND_PCM_FORMAT_S32_BE; + else + pcmformat = SND_PCM_FORMAT_S32_LE; break; case QAudioFormat::Float: if constexpr (QSysInfo::ByteOrder == QSysInfo::BigEndian) - pcmformat = SND_PCM_FORMAT_FLOAT_LE; - else pcmformat = SND_PCM_FORMAT_FLOAT_BE; + else + pcmformat = SND_PCM_FORMAT_FLOAT_LE; + break; default: break; } @@ -213,6 +158,11 @@ void QAlsaAudioSink::start(QIODevice* device) pullMode = true; audioSource = device; + connect(audioSource, &QIODevice::readyRead, timer, [this] { + if (!timer->isActive()) { + timer->start(period_time / 1000); + } + }); deviceState = QAudio::ActiveState; open(); @@ -586,8 +536,7 @@ void QAlsaAudioSink::resume() } resuming = true; - deviceState = pullMode ? QAudio::ActiveState : QAudio::IdleState; - + deviceState = suspendedInState; errorState = QAudio::NoError; timer->start(period_time/1000); emit stateChanged(deviceState); @@ -607,6 +556,7 @@ QAudioFormat QAlsaAudioSink::format() const void QAlsaAudioSink::suspend() { if(deviceState == QAudio::ActiveState || deviceState == QAudio::IdleState || resuming) { + suspendedInState = deviceState; snd_pcm_drain(handle); timer->stop(); deviceState = QAudio::SuspendedState; @@ -662,11 +612,13 @@ bool QAlsaAudioSink::deviceReady() } else if(l == 0) { // Did not get any data to output + timer->stop(); + snd_pcm_drain(handle); bytesAvailable = bytesFree(); if(bytesAvailable > snd_pcm_frames_to_bytes(handle, buffer_frames-period_frames)) { // Underrun if (deviceState != QAudio::IdleState) { - errorState = QAudio::UnderrunError; + errorState = audioSource->atEnd() ? QAudio::NoError : QAudio::UnderrunError; emit errorChanged(errorState); deviceState = QAudio::IdleState; emit stateChanged(deviceState); diff --git a/src/multimedia/alsa/qalsaaudiosink_p.h b/src/multimedia/alsa/qalsaaudiosink_p.h index 9c6da2557..0f5a5aa5a 100644 --- a/src/multimedia/alsa/qalsaaudiosink_p.h +++ b/src/multimedia/alsa/qalsaaudiosink_p.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 // // W A R N I N G @@ -72,7 +36,7 @@ class QAlsaAudioSink : public QPlatformAudioSink friend class AlsaOutputPrivate; Q_OBJECT public: - QAlsaAudioSink(const QByteArray &device); + QAlsaAudioSink(const QByteArray &device, QObject *parent); ~QAlsaAudioSink(); qint64 write( const char *data, qint64 len ); @@ -95,10 +59,11 @@ public: qreal volume() const override; - QIODevice* audioSource; + QIODevice* audioSource = nullptr; QAudioFormat settings; - QAudio::Error errorState; - QAudio::State deviceState; + QAudio::Error errorState = QAudio::NoError; + QAudio::State deviceState = QAudio::StoppedState; + QAudio::State suspendedInState = QAudio::SuspendedState; private slots: void userFeed(); @@ -108,14 +73,14 @@ signals: void processMore(); private: - bool opened; - bool pullMode; - bool resuming; - int buffer_size; - int period_size; - qint64 totalTimeValue; - unsigned int buffer_time; - unsigned int period_time; + bool opened = false; + bool pullMode = true; + bool resuming = false; + int buffer_size = 0; + int period_size = 0; + qint64 totalTimeValue = 0; + unsigned int buffer_time = 100000; + unsigned int period_time = 20000; snd_pcm_uframes_t buffer_frames; snd_pcm_uframes_t period_frames; int xrun_recovery(int err); @@ -124,16 +89,15 @@ private: bool open(); void close(); - QTimer* timer; + QTimer* timer = nullptr; QByteArray m_device; - int bytesAvailable; - qint64 elapsedTimeOffset; - char* audioBuffer; - snd_pcm_t* handle; - snd_pcm_access_t access; - snd_pcm_format_t pcmformat; - snd_pcm_hw_params_t *hwparams; - qreal m_volume; + int bytesAvailable = 0; + qint64 elapsedTimeOffset = 0; + char* audioBuffer = nullptr; + snd_pcm_t* handle = nullptr; + snd_pcm_access_t access = SND_PCM_ACCESS_RW_INTERLEAVED; + snd_pcm_hw_params_t *hwparams = nullptr; + qreal m_volume = 1.0f; }; class AlsaOutputPrivate : public QIODevice diff --git a/src/multimedia/alsa/qalsaaudiosource.cpp b/src/multimedia/alsa/qalsaaudiosource.cpp index 9302894d1..ebf6e24e2 100644 --- a/src/multimedia/alsa/qalsaaudiosource.cpp +++ b/src/multimedia/alsa/qalsaaudiosource.cpp @@ -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 // // W A R N I N G @@ -52,13 +16,13 @@ #include <QtCore/qvarlengtharray.h> #include <QtMultimedia/private/qaudiohelpers_p.h> #include "qalsaaudiosource_p.h" -#include "qalsaaudiodevice_p.h" QT_BEGIN_NAMESPACE //#define DEBUG_AUDIO 1 -QAlsaAudioSource::QAlsaAudioSource(const QByteArray &device) +QAlsaAudioSource::QAlsaAudioSource(const QByteArray &device, QObject *parent) + : QPlatformAudioSource(parent) { bytesAvailable = 0; handle = 0; @@ -80,13 +44,13 @@ QAlsaAudioSource::QAlsaAudioSource(const QByteArray &device) m_device = device; timer = new QTimer(this); - connect(timer,SIGNAL(timeout()),SLOT(userFeed())); + connect(timer, &QTimer::timeout, this, &QAlsaAudioSource::userFeed); } QAlsaAudioSource::~QAlsaAudioSource() { close(); - disconnect(timer, SIGNAL(timeout())); + disconnect(timer, &QTimer::timeout, this, &QAlsaAudioSource::userFeed); QCoreApplication::processEvents(); delete timer; } @@ -178,21 +142,22 @@ int QAlsaAudioSource::setFormat() break; case QAudioFormat::Int16: if constexpr (QSysInfo::ByteOrder == QSysInfo::BigEndian) - pcmformat = SND_PCM_FORMAT_S16_LE; - else pcmformat = SND_PCM_FORMAT_S16_BE; + else + pcmformat = SND_PCM_FORMAT_S16_LE; break; case QAudioFormat::Int32: if constexpr (QSysInfo::ByteOrder == QSysInfo::BigEndian) - pcmformat = SND_PCM_FORMAT_S32_LE; - else pcmformat = SND_PCM_FORMAT_S32_BE; + else + pcmformat = SND_PCM_FORMAT_S32_LE; break; case QAudioFormat::Float: if constexpr (QSysInfo::ByteOrder == QSysInfo::BigEndian) - pcmformat = SND_PCM_FORMAT_FLOAT_LE; - else pcmformat = SND_PCM_FORMAT_FLOAT_BE; + else + pcmformat = SND_PCM_FORMAT_FLOAT_LE; + break; default: break; } @@ -405,7 +370,7 @@ bool QAlsaAudioSource::open() bytesAvailable = checkBytesReady(); if(pullMode) - connect(audioSource,SIGNAL(readyRead()),this,SLOT(userFeed())); + connect(audioSource, &QIODevice::readyRead, this, &QAlsaAudioSource::userFeed); // Step 6: Start audio processing chunks = buffer_size/period_size; diff --git a/src/multimedia/alsa/qalsaaudiosource_p.h b/src/multimedia/alsa/qalsaaudiosource_p.h index 7d360544f..87487a6ad 100644 --- a/src/multimedia/alsa/qalsaaudiosource_p.h +++ b/src/multimedia/alsa/qalsaaudiosource_p.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 // // W A R N I N G @@ -98,7 +62,7 @@ class QAlsaAudioSource : public QPlatformAudioSource { Q_OBJECT public: - QAlsaAudioSource(const QByteArray &device); + QAlsaAudioSource(const QByteArray &device, QObject *parent); ~QAlsaAudioSource(); qint64 read(char* data, qint64 len); diff --git a/src/multimedia/alsa/qalsamediadevices.cpp b/src/multimedia/alsa/qalsamediadevices.cpp index e2561e66a..9466fa0cd 100644 --- a/src/multimedia/alsa/qalsamediadevices.cpp +++ b/src/multimedia/alsa/qalsamediadevices.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 "qalsamediadevices_p.h" #include "qmediadevices.h" @@ -49,6 +13,26 @@ QT_BEGIN_NAMESPACE +namespace { + +struct free_char +{ + void operator()(char *c) const { ::free(c); } +}; + +using unique_str = std::unique_ptr<char, free_char>; + +bool operator==(const unique_str &str, std::string_view sv) +{ + return std::string_view{ str.get() } == sv; +} +bool operator!=(const unique_str &str, std::string_view sv) +{ + return !(str == sv); +} + +} // namespace + QAlsaMediaDevices::QAlsaMediaDevices() : QPlatformMediaDevices() { @@ -58,45 +42,66 @@ static QList<QAudioDevice> availableDevices(QAudioDevice::Mode mode) { QList<QAudioDevice> devices; - QByteArray filter; - // Create a list of all current audio devices that support mode - void **hints, **n; - char *name, *descr, *io; - - if(snd_device_name_hint(-1, "pcm", &hints) < 0) { + void **hints; + if (snd_device_name_hint(-1, "pcm", &hints) < 0) { qWarning() << "no alsa devices available"; return devices; } - n = hints; - if(mode == QAudioDevice::Input) { - filter = "Input"; - } else { - filter = "Output"; - } + std::string_view filter = (mode == QAudioDevice::Input) ? "Input" : "Output"; + + QAlsaAudioDeviceInfo *sysdefault = nullptr; + auto makeDeviceInfo = [&filter, mode](void *entry) -> QAlsaAudioDeviceInfo * { + unique_str name{ snd_device_name_get_hint(entry, "NAME") }; + if (name && name != "null") { + unique_str descr{ snd_device_name_get_hint(entry, "DESC") }; + unique_str io{ snd_device_name_get_hint(entry, "IOID") }; + + if (descr && (!io || (io == filter))) { + auto *infop = new QAlsaAudioDeviceInfo{ + name.get(), + QString::fromUtf8(descr.get()), + mode, + }; + return infop; + } + } + return nullptr; + }; + + bool hasDefault = false; + void **n = hints; while (*n != NULL) { - name = snd_device_name_get_hint(*n, "NAME"); - if (name != 0 && qstrcmp(name, "null") != 0) { - descr = snd_device_name_get_hint(*n, "DESC"); - io = snd_device_name_get_hint(*n, "IOID"); - - if ((descr != NULL) && ((io == NULL) || (io == filter))) { - auto *infop = new QAlsaAudioDeviceInfo(name, QString::fromUtf8(descr), mode); - devices.append(infop->create()); - if (strcmp(name, "default") == 0) - infop->isDefault = true; + QAlsaAudioDeviceInfo *infop = makeDeviceInfo(*n++); + + if (infop) { + devices.append(infop->create()); + if (!hasDefault && infop->id.startsWith("default")) { + infop->isDefault = true; + hasDefault = true; } + if (!sysdefault && infop->id.startsWith("sysdefault")) + sysdefault = infop; + } + } - free(descr); - free(io); + if (!hasDefault && sysdefault) { + // Make "sysdefault" the default device if there is no "default" device exists + sysdefault->isDefault = true; + hasDefault = true; + } + if (!hasDefault && devices.size() > 0) { + // forcefully declare the first device as "default" + QAlsaAudioDeviceInfo *infop = makeDeviceInfo(hints[0]); + if (infop) { + infop->isDefault = true; + devices.prepend(infop->create()); } - free(name); - ++n; } - snd_device_name_free_hint(hints); + snd_device_name_free_hint(hints); return devices; } @@ -110,19 +115,16 @@ QList<QAudioDevice> QAlsaMediaDevices::audioOutputs() const return availableDevices(QAudioDevice::Output); } -QList<QCameraDevice> QAlsaMediaDevices::videoInputs() const -{ - return {}; -} - -QPlatformAudioSource *QAlsaMediaDevices::createAudioSource(const QAudioDevice &deviceInfo) +QPlatformAudioSource *QAlsaMediaDevices::createAudioSource(const QAudioDevice &deviceInfo, + QObject *parent) { - return new QAlsaAudioSource(deviceInfo.id()); + return new QAlsaAudioSource(deviceInfo.id(), parent); } -QPlatformAudioSink *QAlsaMediaDevices::createAudioSink(const QAudioDevice &deviceInfo) +QPlatformAudioSink *QAlsaMediaDevices::createAudioSink(const QAudioDevice &deviceInfo, + QObject *parent) { - return new QAlsaAudioSink(deviceInfo.id()); + return new QAlsaAudioSink(deviceInfo.id(), parent); } QT_END_NAMESPACE diff --git a/src/multimedia/alsa/qalsamediadevices_p.h b/src/multimedia/alsa/qalsamediadevices_p.h index 54df9c851..d9fbb7c97 100644 --- a/src/multimedia/alsa/qalsamediadevices_p.h +++ b/src/multimedia/alsa/qalsamediadevices_p.h @@ -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 #ifndef QALSAMEDIADEVICES_H #define QALSAMEDIADEVICES_H @@ -66,9 +30,10 @@ public: QList<QAudioDevice> audioInputs() const override; QList<QAudioDevice> audioOutputs() const override; - QList<QCameraDevice> videoInputs() const override; - QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo) override; - QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo) override; + QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo, + QObject *parent) override; + QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo, + QObject *parent) override; }; QT_END_NAMESPACE diff --git a/src/multimedia/android/qandroidaudiodevice.cpp b/src/multimedia/android/qandroidaudiodevice.cpp index fcd979a5a..576774fd8 100644 --- a/src/multimedia/android/qandroidaudiodevice.cpp +++ b/src/multimedia/android/qandroidaudiodevice.cpp @@ -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 #include "qandroidaudiodevice_p.h" diff --git a/src/multimedia/android/qandroidaudiodevice_p.h b/src/multimedia/android/qandroidaudiodevice_p.h index 39aec7311..d448306fe 100644 --- a/src/multimedia/android/qandroidaudiodevice_p.h +++ b/src/multimedia/android/qandroidaudiodevice_p.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 QOPENSLESDEVICEINFO_H #define QOPENSLESDEVICEINFO_H diff --git a/src/multimedia/android/qandroidaudiosink.cpp b/src/multimedia/android/qandroidaudiosink.cpp index bd7005a5b..4da4c5fdc 100644 --- a/src/multimedia/android/qandroidaudiosink.cpp +++ b/src/multimedia/android/qandroidaudiosink.cpp @@ -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 #include "qandroidaudiosink_p.h" #include "qopenslesengine_p.h" @@ -48,8 +12,6 @@ #include <SLES/OpenSLES_AndroidConfiguration.h> #endif // ANDROID -#define BUFFER_COUNT 2 - QT_BEGIN_NAMESPACE static inline void openSlDebugInfo() @@ -64,26 +26,9 @@ static inline void openSlDebugInfo() << "\nDefault buffer size: " << QOpenSLESEngine::getDefaultBufferSize(format); } -QAndroidAudioSink::QAndroidAudioSink(const QByteArray &device) - : m_deviceName(device), - m_state(QAudio::StoppedState), - m_error(QAudio::NoError), - m_outputMixObject(nullptr), - m_playerObject(nullptr), - m_playItf(nullptr), - m_volumeItf(nullptr), - m_bufferQueueItf(nullptr), - m_audioSource(nullptr), - m_buffers(nullptr), - m_volume(1.0), - m_pullMode(false), - m_nextBuffer(0), - m_bufferSize(0), - m_elapsedTime(0), - m_processedBytes(0), - m_availableBuffers(BUFFER_COUNT), - m_eventMask(SL_PLAYEVENT_HEADATEND), - m_startRequiresInit(true) +QAndroidAudioSink::QAndroidAudioSink(const QByteArray &device, QObject *parent) + : QPlatformAudioSink(parent), + m_deviceName(device) { #ifndef ANDROID m_streamType = -1; @@ -117,16 +62,17 @@ void QAndroidAudioSink::start(QIODevice *device) if (!preparePlayer()) return; + m_endSound = false; m_pullMode = true; m_audioSource = device; m_nextBuffer = 0; m_processedBytes = 0; - m_availableBuffers = BUFFER_COUNT; + m_availableBuffers = BufferCount; setState(QAudio::ActiveState); setError(QAudio::NoError); // Attempt to fill buffers first. - for (int i = 0; i != BUFFER_COUNT; ++i) { + for (int i = 0; i != BufferCount; ++i) { const int index = i * m_bufferSize; const qint64 readSize = m_audioSource->read(m_buffers + index, m_bufferSize); if (readSize && SL_RESULT_SUCCESS != (*m_bufferQueueItf)->Enqueue(m_bufferQueueItf, @@ -145,6 +91,16 @@ void QAndroidAudioSink::start(QIODevice *device) // Change the state to playing. // We need to do this after filling the buffers or processedBytes might get corrupted. startPlayer(); + connect(m_audioSource, &QIODevice::readyRead, this, &QAndroidAudioSink::readyRead); +} + +void QAndroidAudioSink::readyRead() +{ + if (m_pullMode && m_state == QAudio::IdleState) { + setState(QAudio::ActiveState); + setError(QAudio::NoError); + QMetaObject::invokeMethod(this, "bufferAvailable", Qt::QueuedConnection); + } } QIODevice *QAndroidAudioSink::start() @@ -157,7 +113,7 @@ QIODevice *QAndroidAudioSink::start() m_pullMode = false; m_processedBytes = 0; - m_availableBuffers = BUFFER_COUNT; + m_availableBuffers = BufferCount; m_audioSource = new SLIODevicePrivate(this); m_audioSource->open(QIODevice::WriteOnly | QIODevice::Unbuffered); @@ -222,7 +178,7 @@ void QAndroidAudioSink::resume() return; } - setState(m_pullMode ? QAudio::ActiveState : QAudio::IdleState); + setState(m_suspendedInState); setError(QAudio::NoError); } @@ -248,6 +204,7 @@ void QAndroidAudioSink::suspend() return; } + m_suspendedInState = m_state; setState(QAudio::SuspendedState); setError(QAudio::NoError); } @@ -291,18 +248,15 @@ void QAndroidAudioSink::onBytesProcessed(qint64 bytes) m_processedBytes += bytes; } -void QAndroidAudioSink::bufferAvailable(quint32 count, quint32 playIndex) +void QAndroidAudioSink::bufferAvailable() { - Q_UNUSED(count); - Q_UNUSED(playIndex); - if (m_state == QAudio::StoppedState) return; if (!m_pullMode) { // We're in push mode. // Signal that there is a new open slot in the buffer and return const int val = m_availableBuffers.fetchAndAddRelease(1) + 1; - if (val == BUFFER_COUNT) + if (val == BufferCount) QMetaObject::invokeMethod(this, "onEOSEvent", Qt::QueuedConnection); return; @@ -310,7 +264,23 @@ void QAndroidAudioSink::bufferAvailable(quint32 count, quint32 playIndex) // We're in pull mode. const int index = m_nextBuffer * m_bufferSize; - const qint64 readSize = m_audioSource->read(m_buffers + index, m_bufferSize); + qint64 readSize = 0; + if (m_audioSource->atEnd()) { + // The whole sound was passed to player buffer, but setting SL_PLAYSTATE_STOPPED state + // too quickly will result in cutting of end of the sound. Therefore, we make it a little + // longer with empty data to make sure they will be played correctly + if (m_endSound) { + m_endSound = false; + setState(QAudio::IdleState); + return; + } + m_endSound = true; + readSize = m_bufferSize; + memset(m_buffers + index, 0, readSize); + } else { + readSize = m_audioSource->read(m_buffers + index, m_bufferSize); + } + if (readSize < 1) { QMetaObject::invokeMethod(this, "onEOSEvent", Qt::QueuedConnection); @@ -326,8 +296,10 @@ void QAndroidAudioSink::bufferAvailable(quint32 count, quint32 playIndex) return; } - m_nextBuffer = (m_nextBuffer + 1) % BUFFER_COUNT; - QMetaObject::invokeMethod(this, "onBytesProcessed", Qt::QueuedConnection, Q_ARG(qint64, readSize)); + m_nextBuffer = (m_nextBuffer + 1) % BufferCount; + if (!m_endSound) { + QMetaObject::invokeMethod(this, "onBytesProcessed", Qt::QueuedConnection, Q_ARG(qint64, readSize)); + } } void QAndroidAudioSink::playCallback(SLPlayItf player, void *ctx, SLuint32 event) @@ -340,10 +312,9 @@ void QAndroidAudioSink::playCallback(SLPlayItf player, void *ctx, SLuint32 event void QAndroidAudioSink::bufferQueueCallback(SLBufferQueueItf bufferQueue, void *ctx) { - SLBufferQueueState state; - (*bufferQueue)->GetState(bufferQueue, &state); + Q_UNUSED(bufferQueue); QAndroidAudioSink *audioOutput = reinterpret_cast<QAndroidAudioSink *>(ctx); - audioOutput->bufferAvailable(state.count, state.playIndex); + QMetaObject::invokeMethod(audioOutput, "bufferAvailable", Qt::QueuedConnection); } bool QAndroidAudioSink::preparePlayer() @@ -353,6 +324,9 @@ bool QAndroidAudioSink::preparePlayer() else return true; + if (!QOpenSLESEngine::setAudioOutput(m_deviceName)) + qWarning() << "Unable to set up Audio Output Device"; + SLEngineItf engine = QOpenSLESEngine::instance()->slEngine(); if (!engine) { qWarning() << "No engine"; @@ -360,7 +334,7 @@ bool QAndroidAudioSink::preparePlayer() return false; } - SLDataLocator_BufferQueue bufferQueueLocator = { SL_DATALOCATOR_BUFFERQUEUE, BUFFER_COUNT }; + SLDataLocator_BufferQueue bufferQueueLocator = { SL_DATALOCATOR_BUFFERQUEUE, BufferCount }; SLAndroidDataFormat_PCM_EX pcmFormat = QOpenSLESEngine::audioFormatToSLFormatPCM(m_format); SLDataSource audioSrc = { &bufferQueueLocator, &pcmFormat }; @@ -492,7 +466,7 @@ bool QAndroidAudioSink::preparePlayer() } if (!m_buffers) - m_buffers = new char[BUFFER_COUNT * m_bufferSize]; + m_buffers = new char[BufferCount * m_bufferSize]; setError(QAudio::NoError); m_startRequiresInit = false; @@ -525,7 +499,7 @@ void QAndroidAudioSink::destroyPlayer() m_buffers = nullptr; m_processedBytes = 0; m_nextBuffer = 0; - m_availableBuffers.storeRelease(BUFFER_COUNT); + m_availableBuffers.storeRelease(BufferCount); m_playItf = nullptr; m_volumeItf = nullptr; m_bufferQueueItf = nullptr; @@ -536,10 +510,14 @@ void QAndroidAudioSink::stopPlayer() { setState(QAudio::StoppedState); - if (m_audioSource && !m_pullMode) { - m_audioSource->close(); - delete m_audioSource; - m_audioSource = nullptr; + if (m_audioSource) { + if (m_pullMode) { + disconnect(m_audioSource, &QIODevice::readyRead, this, &QAndroidAudioSink::readyRead); + } else { + m_audioSource->close(); + delete m_audioSource; + m_audioSource = nullptr; + } } // We need to change the state manually... @@ -599,7 +577,7 @@ qint64 QAndroidAudioSink::writeData(const char *data, qint64 len) m_processedBytes += len; setState(QAudio::ActiveState); setError(QAudio::NoError); - m_nextBuffer = (m_nextBuffer + 1) % BUFFER_COUNT; + m_nextBuffer = (m_nextBuffer + 1) % BufferCount; return len; } diff --git a/src/multimedia/android/qandroidaudiosink_p.h b/src/multimedia/android/qandroidaudiosink_p.h index 2a843eed8..4cb63b252 100644 --- a/src/multimedia/android/qandroidaudiosink_p.h +++ b/src/multimedia/android/qandroidaudiosink_p.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 QOPENSLESAUDIOOUTPUT_H #define QOPENSLESAUDIOOUTPUT_H @@ -65,7 +29,7 @@ class QAndroidAudioSink : public QPlatformAudioSink Q_OBJECT public: - QAndroidAudioSink(const QByteArray &device); + QAndroidAudioSink(const QByteArray &device, QObject *parent); ~QAndroidAudioSink(); void start(QIODevice *device) override; @@ -91,7 +55,7 @@ private: Q_INVOKABLE void onEOSEvent(); Q_INVOKABLE void onBytesProcessed(qint64 bytes); - void bufferAvailable(quint32 count, quint32 playIndex); + Q_INVOKABLE void bufferAvailable(); static void playCallback(SLPlayItf playItf, void *ctx, SLuint32 event); static void bufferQueueCallback(SLBufferQueueItf bufferQueue, void *ctx); @@ -99,6 +63,7 @@ private: bool preparePlayer(); void destroyPlayer(); void stopPlayer(); + void readyRead(); void startPlayer(); qint64 writeData(const char *data, qint64 len); @@ -107,25 +72,29 @@ private: SLmillibel adjustVolume(qreal vol); + static constexpr int BufferCount = 2; + QByteArray m_deviceName; - QAudio::State m_state; - QAudio::Error m_error; - SLObjectItf m_outputMixObject; - SLObjectItf m_playerObject; - SLPlayItf m_playItf; - SLVolumeItf m_volumeItf; - SLBufferQueueItf m_bufferQueueItf; - QIODevice *m_audioSource; - char *m_buffers; - qreal m_volume; - bool m_pullMode; - int m_nextBuffer; - int m_bufferSize; - qint64 m_elapsedTime; - qint64 m_processedBytes; - QAtomicInt m_availableBuffers; - SLuint32 m_eventMask; - bool m_startRequiresInit; + QAudio::State m_state = QAudio::StoppedState; + QAudio::State m_suspendedInState = QAudio::SuspendedState; + QAudio::Error m_error = QAudio::NoError; + SLObjectItf m_outputMixObject = nullptr; + SLObjectItf m_playerObject = nullptr; + SLPlayItf m_playItf = nullptr; + SLVolumeItf m_volumeItf = nullptr; + SLBufferQueueItf m_bufferQueueItf = nullptr; + QIODevice *m_audioSource = nullptr; + char *m_buffers = nullptr; + qreal m_volume = 1.0; + bool m_pullMode = false; + int m_nextBuffer = 0; + int m_bufferSize = 0; + qint64 m_elapsedTime = 0; + qint64 m_processedBytes = 0; + bool m_endSound = false; + QAtomicInt m_availableBuffers = BufferCount; + SLuint32 m_eventMask = SL_PLAYEVENT_HEADATEND; + bool m_startRequiresInit = true; qint32 m_streamType; QAudioFormat m_format; diff --git a/src/multimedia/android/qandroidaudiosource.cpp b/src/multimedia/android/qandroidaudiosource.cpp index 121c6294a..3a7332fd1 100644 --- a/src/multimedia/android/qandroidaudiosource.cpp +++ b/src/multimedia/android/qandroidaudiosource.cpp @@ -1,55 +1,22 @@ -/**************************************************************************** -** -** 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 "qandroidaudiosource_p.h" #include "qopenslesengine_p.h" #include <private/qaudiohelpers_p.h> -#include <QtCore/private/qandroidextras_p.h> #include <qbuffer.h> #include <qdebug.h> +#include <qloggingcategory.h> #ifdef ANDROID #include <SLES/OpenSLES_AndroidConfiguration.h> #include <QtCore/qcoreapplication.h> +#include <QtCore/qpermissions.h> #endif +static Q_LOGGING_CATEGORY(qLcAndroidAudioSource, "qt.multimedia.android.audiosource") + QT_BEGIN_NAMESPACE #define NUM_BUFFERS 2 @@ -59,20 +26,13 @@ QT_BEGIN_NAMESPACE #ifdef ANDROID static bool hasRecordingPermission() { - if (QNativeInterface::QAndroidApplication::sdkVersion() < 23) - return true; - - const auto key = QStringLiteral("android.permission.RECORD_AUDIO"); - // Permission already granted? - if (QtAndroidPrivate::checkPermission(key).result() == QtAndroidPrivate::Authorized) - return true; + QMicrophonePermission permission; - if (QtAndroidPrivate::requestPermission(key).result() != QtAndroidPrivate::Authorized) { - qDebug("Microphone permission denied by user!"); - return false; - } + const bool permitted = qApp->checkPermission(permission) == Qt::PermissionStatus::Granted; + if (!permitted) + qCWarning(qLcAndroidAudioSource, "Missing microphone permission!"); - return true; + return permitted; } static void bufferQueueCallback(SLAndroidSimpleBufferQueueItf, void *context) @@ -84,8 +44,9 @@ static void bufferQueueCallback(SLBufferQueueItf, void *context) QMetaObject::invokeMethod(reinterpret_cast<QAndroidAudioSource*>(context), "processBuffer"); } -QAndroidAudioSource::QAndroidAudioSource(const QByteArray &device) - : m_device(device) +QAndroidAudioSource::QAndroidAudioSource(const QByteArray &device, QObject *parent) + : QPlatformAudioSource(parent) + , m_device(device) , m_engine(QOpenSLESEngine::instance()) , m_recorderObject(0) , m_recorder(0) @@ -180,7 +141,7 @@ QIODevice *QAndroidAudioSource::start() m_pullMode = false; m_pushBuffer.clear(); - m_bufferIODevice = new QBuffer(&m_pushBuffer); + m_bufferIODevice = new QBuffer(&m_pushBuffer, this); m_bufferIODevice->open(QIODevice::ReadOnly); if (startRecording()) { @@ -398,6 +359,10 @@ void QAndroidAudioSource::processBuffer() QByteArray *processedBuffer = &m_buffers[m_currentBuffer]; writeDataToDevice(processedBuffer->constData(), processedBuffer->size()); + // Make sure that it was not stopped from writeDataToDevice + if (m_deviceState == QAudio::StoppedState || m_deviceState == QAudio::SuspendedState) + return; + // Re-enqueue the buffer SLresult result = (*m_bufferQueue)->Enqueue(m_bufferQueue, processedBuffer->data(), diff --git a/src/multimedia/android/qandroidaudiosource_p.h b/src/multimedia/android/qandroidaudiosource_p.h index 727f1746f..13578509c 100644 --- a/src/multimedia/android/qandroidaudiosource_p.h +++ b/src/multimedia/android/qandroidaudiosource_p.h @@ -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 #ifndef QOPENSLESAUDIOINPUT_H #define QOPENSLESAUDIOINPUT_H @@ -76,7 +40,7 @@ class QAndroidAudioSource : public QPlatformAudioSource Q_OBJECT public: - QAndroidAudioSource(const QByteArray &device); + QAndroidAudioSource(const QByteArray &device, QObject *parent); ~QAndroidAudioSource(); void start(QIODevice *device); diff --git a/src/multimedia/android/qandroidmediadevices.cpp b/src/multimedia/android/qandroidmediadevices.cpp index 8a38bef83..7688da079 100644 --- a/src/multimedia/android/qandroidmediadevices.cpp +++ b/src/multimedia/android/qandroidmediadevices.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 "qandroidmediadevices_p.h" #include "qmediadevices.h" @@ -53,7 +17,22 @@ QT_BEGIN_NAMESPACE -QAndroidMediaDevices::QAndroidMediaDevices() : QPlatformMediaDevices() { } +Q_DECLARE_JNI_CLASS(QtAudioDeviceManager, + "org/qtproject/qt/android/multimedia/QtAudioDeviceManager"); + + +QAndroidMediaDevices::QAndroidMediaDevices() : QPlatformMediaDevices() +{ + QtJniTypes::QtAudioDeviceManager::callStaticMethod<void>("registerAudioHeadsetStateReceiver"); +} + +QAndroidMediaDevices::~QAndroidMediaDevices() +{ + // Object of QAndroidMediaDevices type is static. Unregistering will happend only when closing + // the application. In such case it is probably not needed, but let's leave it for + // compatibility with Android documentation + QtJniTypes::QtAudioDeviceManager::callStaticMethod<void>("unregisterAudioHeadsetStateReceiver"); +} QList<QAudioDevice> QAndroidMediaDevices::audioInputs() const { @@ -65,34 +44,36 @@ QList<QAudioDevice> QAndroidMediaDevices::audioOutputs() const return QOpenSLESEngine::availableDevices(QAudioDevice::Output); } -QPlatformAudioSource *QAndroidMediaDevices::createAudioSource(const QAudioDevice &deviceInfo) +QPlatformAudioSource *QAndroidMediaDevices::createAudioSource(const QAudioDevice &deviceInfo, + QObject *parent) { - return new QAndroidAudioSource(deviceInfo.id()); + return new QAndroidAudioSource(deviceInfo.id(), parent); } -QPlatformAudioSink *QAndroidMediaDevices::createAudioSink(const QAudioDevice &deviceInfo) +QPlatformAudioSink *QAndroidMediaDevices::createAudioSink(const QAudioDevice &deviceInfo, + QObject *parent) { - return new QAndroidAudioSink(deviceInfo.id()); + return new QAndroidAudioSink(deviceInfo.id(), parent); } void QAndroidMediaDevices::forwardAudioOutputsChanged() { - audioOutputsChanged(); + emit audioOutputsChanged(); } void QAndroidMediaDevices::forwardAudioInputsChanged() { - audioInputsChanged(); + emit audioInputsChanged(); } static void onAudioInputDevicesUpdated(JNIEnv */*env*/, jobject /*thiz*/) { - static_cast<QAndroidMediaDevices*>(QPlatformMediaDevices::instance())->forwardAudioInputsChanged(); + static_cast<QAndroidMediaDevices*>(QPlatformMediaIntegration::instance()->mediaDevices())->forwardAudioInputsChanged(); } static void onAudioOutputDevicesUpdated(JNIEnv */*env*/, jobject /*thiz*/) { - static_cast<QAndroidMediaDevices*>(QPlatformMediaDevices::instance())->forwardAudioOutputsChanged(); + static_cast<QAndroidMediaDevices*>(QPlatformMediaIntegration::instance()->mediaDevices())->forwardAudioOutputsChanged(); } Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) @@ -126,11 +107,6 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) if (!registered) return JNI_ERR; - QJniObject::callStaticMethod<void>("org/qtproject/qt/android/multimedia/QtAudioDeviceManager", - "registerAudioHeadsetStateReceiver", - "(Landroid/content/Context;)V", - QNativeInterface::QAndroidApplication::context()); - return JNI_VERSION_1_6; } diff --git a/src/multimedia/android/qandroidmediadevices_p.h b/src/multimedia/android/qandroidmediadevices_p.h index 25de67f54..a77ed0451 100644 --- a/src/multimedia/android/qandroidmediadevices_p.h +++ b/src/multimedia/android/qandroidmediadevices_p.h @@ -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 #ifndef QANDROIDMEDIADEVICES_H #define QANDROIDMEDIADEVICES_H @@ -61,10 +25,13 @@ class QAndroidMediaDevices : public QPlatformMediaDevices public: QAndroidMediaDevices(); + ~QAndroidMediaDevices(); QList<QAudioDevice> audioInputs() const override; QList<QAudioDevice> audioOutputs() const override; - QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo) override; - QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo) override; + QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo, + QObject *parent) override; + QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo, + QObject *parent) override; void forwardAudioOutputsChanged(); void forwardAudioInputsChanged(); diff --git a/src/multimedia/android/qopenslesengine.cpp b/src/multimedia/android/qopenslesengine.cpp index 94de56327..738161ab7 100644 --- a/src/multimedia/android/qopenslesengine.cpp +++ b/src/multimedia/android/qopenslesengine.cpp @@ -1,48 +1,14 @@ -/**************************************************************************** -** -** 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 "qopenslesengine_p.h" #include "qandroidaudiosource_p.h" #include "qandroidaudiodevice_p.h" +#include <QtCore/qcoreapplication.h> #include <QtCore/qjniobject.h> +#include <QtCore/qpermissions.h> #include <QtCore/private/qandroidextras_p.h> #include <qdebug.h> @@ -83,6 +49,22 @@ QOpenSLESEngine *QOpenSLESEngine::instance() return openslesEngine(); } +static SLuint32 getChannelMask(unsigned channelCount) +{ + switch (channelCount) { + case 1: return SL_SPEAKER_FRONT_CENTER; + case 2: return SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT; + case 3: return SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT | SL_SPEAKER_FRONT_CENTER; + case 4: return SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT + | SL_SPEAKER_BACK_LEFT | SL_SPEAKER_BACK_RIGHT; + case 5: return SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT | SL_SPEAKER_BACK_LEFT + | SL_SPEAKER_BACK_RIGHT | SL_SPEAKER_FRONT_CENTER; + case 6: return SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT | SL_SPEAKER_BACK_LEFT + | SL_SPEAKER_BACK_RIGHT | SL_SPEAKER_FRONT_CENTER | SL_SPEAKER_LOW_FREQUENCY; + default: return 0; // Default to 0 for an unsupported or unknown number of channels + } +} + SLAndroidDataFormat_PCM_EX QOpenSLESEngine::audioFormatToSLFormatPCM(const QAudioFormat &format) { SLAndroidDataFormat_PCM_EX format_pcm; @@ -91,9 +73,7 @@ SLAndroidDataFormat_PCM_EX QOpenSLESEngine::audioFormatToSLFormatPCM(const QAudi format_pcm.sampleRate = format.sampleRate() * 1000; format_pcm.bitsPerSample = format.bytesPerSample() * 8; format_pcm.containerSize = format.bytesPerSample() * 8; - format_pcm.channelMask = (format.channelCount() == 1 ? - SL_SPEAKER_FRONT_CENTER : - SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT); + format_pcm.channelMask = getChannelMask(format_pcm.numChannels); format_pcm.endianness = (QSysInfo::ByteOrder == QSysInfo::LittleEndian ? SL_BYTEORDER_LITTLEENDIAN : SL_BYTEORDER_BIGENDIAN); @@ -147,15 +127,22 @@ QList<QAudioDevice> QOpenSLESEngine::availableDevices(QAudioDevice::Mode mode) return devices; } +bool QOpenSLESEngine::setAudioOutput(const QByteArray &deviceId) +{ + return QJniObject::callStaticMethod<jboolean>( + "org/qtproject/qt/android/multimedia/QtAudioDeviceManager", + "setAudioOutput", + deviceId.toInt()); +} + static bool hasRecordPermission() { - const auto recordPerm = QtAndroidPrivate::checkPermission(QStringLiteral("android.permission.RECORD_AUDIO")); - return recordPerm.result() == QtAndroidPrivate::Authorized; + return qApp->checkPermission(QMicrophonePermission{}) == Qt::PermissionStatus::Granted; } QList<int> QOpenSLESEngine::supportedChannelCounts(QAudioDevice::Mode mode) const { - if (mode == QAudioDevice::Input && hasRecordPermission()) { + if (mode == QAudioDevice::Input) { if (!m_checkedInputFormats) const_cast<QOpenSLESEngine *>(this)->checkSupportedInputFormats(); return m_supportedInputChannelCounts; @@ -166,7 +153,7 @@ QList<int> QOpenSLESEngine::supportedChannelCounts(QAudioDevice::Mode mode) cons QList<int> QOpenSLESEngine::supportedSampleRates(QAudioDevice::Mode mode) const { - if (mode == QAudioDevice::Input && hasRecordPermission()) { + if (mode == QAudioDevice::Input) { if (!m_checkedInputFormats) const_cast<QOpenSLESEngine *>(this)->checkSupportedInputFormats(); return m_supportedInputSampleRates; @@ -374,6 +361,10 @@ bool QOpenSLESEngine::inputFormatIsSupported(SLAndroidDataFormat_PCM_EX format) SLDataLocator_AndroidSimpleBufferQueue loc_bq = { SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1 }; SLDataSink audioSnk = { &loc_bq, &format }; + // only ask permission when it is about to create the audiorecorder + if (!hasRecordPermission()) + return false; + result = (*m_engine)->CreateAudioRecorder(m_engine, &recorder, &audioSrc, &audioSnk, 0, 0, 0); if (result == SL_RESULT_SUCCESS) result = (*recorder)->Realize(recorder, false); diff --git a/src/multimedia/android/qopenslesengine_p.h b/src/multimedia/android/qopenslesengine_p.h index 3adf34594..9918ac888 100644 --- a/src/multimedia/android/qopenslesengine_p.h +++ b/src/multimedia/android/qopenslesengine_p.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 QOPENSLESENGINE_H #define QOPENSLESENGINE_H @@ -75,6 +39,7 @@ public: static SLAndroidDataFormat_PCM_EX audioFormatToSLFormatPCM(const QAudioFormat &format); static QList<QAudioDevice> availableDevices(QAudioDevice::Mode mode); + static bool setAudioOutput(const QByteArray &deviceId); QList<int> supportedChannelCounts(QAudioDevice::Mode mode) const; QList<int> supportedSampleRates(QAudioDevice::Mode mode) const; diff --git a/src/multimedia/audio/qaudio.h b/src/multimedia/audio/qaudio.h index 868ef2f6a..5ae994b9f 100644 --- a/src/multimedia/audio/qaudio.h +++ b/src/multimedia/audio/qaudio.h @@ -1,46 +1,13 @@ -/**************************************************************************** -** -** 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 QAUDIO_H #define QAUDIO_H +#if 0 +#pragma qt_class(QAudio) +#endif + #include <QtMultimedia/qtmultimediaglobal.h> #include <QtCore/qmetatype.h> @@ -51,7 +18,12 @@ QT_BEGIN_NAMESPACE // Class forward declaration required for QDoc bug class QString; + +#if defined(Q_QDOC) +namespace QtAudio +#else namespace QAudio +#endif { enum Error { NoError, OpenError, IOError, UnderrunError, FatalError }; enum State { ActiveState, SuspendedState, StoppedState, IdleState }; @@ -66,10 +38,14 @@ namespace QAudio Q_MULTIMEDIA_EXPORT float convertVolume(float volume, VolumeScale from, VolumeScale to); } +#if !defined(Q_QDOC) +namespace QtAudio = QAudio; +#endif + #ifndef QT_NO_DEBUG_STREAM -Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug dbg, QAudio::Error error); -Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug dbg, QAudio::State state); -Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug dbg, QAudio::VolumeScale role); +Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug dbg, QtAudio::Error error); +Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug dbg, QtAudio::State state); +Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug dbg, QtAudio::VolumeScale role); #endif QT_END_NAMESPACE diff --git a/src/multimedia/audio/qaudiobuffer.cpp b/src/multimedia/audio/qaudiobuffer.cpp index f839dc68b..69adcc5b7 100644 --- a/src/multimedia/audio/qaudiobuffer.cpp +++ b/src/multimedia/audio/qaudiobuffer.cpp @@ -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 #include "qaudiobuffer.h" @@ -48,9 +12,7 @@ class QAudioBufferPrivate : public QSharedData { public: QAudioBufferPrivate(const QAudioFormat &f, const QByteArray &d, qint64 start) - : format(f), - data(d), - startTime(start) + : format(f), data(d), startTime(start) { } @@ -71,11 +33,12 @@ QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QAudioBufferPrivate); \inmodule QtMultimedia \ingroup multimedia \ingroup multimedia_audio - \brief The QAudioBuffer class represents a collection of audio samples with a specific format and sample rate. + \brief The QAudioBuffer class represents a collection of audio samples with a specific format + and sample rate. - QAudioBuffer is used by the QAudioDecoder class to hand decoded audio data over to the application. An audio buffer - contains data in a certain QAudioFormat that can be queried using format(). It is also tagged with timing and duration - information. + QAudioBuffer is used by the QAudioDecoder class to hand decoded audio data over to the + application. An audio buffer contains data in a certain QAudioFormat that can be queried using + format(). It is also tagged with timing and duration information. To access the data stored inside the buffer, use the data() or constData() methods. @@ -140,6 +103,12 @@ QAudioBuffer::QAudioBuffer(int numFrames, const QAudioFormat &format, qint64 sta */ /*! + \fn void QAudioBuffer::swap(QAudioBuffer &other) noexcept + + Swaps the audio buffer with \a other. +*/ + +/*! \fn QAudioBuffer &QAudioBuffer::operator=(QAudioBuffer &&other) Moves \a other into this QAudioBuffer. @@ -148,7 +117,7 @@ QAudioBuffer::QAudioBuffer(int numFrames, const QAudioFormat &format, qint64 sta /*! Assigns the \a other buffer to this. */ -QAudioBuffer &QAudioBuffer::operator =(const QAudioBuffer &other) = default; +QAudioBuffer &QAudioBuffer::operator=(const QAudioBuffer &other) = default; /*! Destroys this audio buffer. @@ -245,15 +214,15 @@ qint64 QAudioBuffer::startTime() const noexcept } /*! + \fn template <typename T> const T* QAudioBuffer::constData() const + Returns a pointer to this buffer's data. You can only read it. This method is preferred over the const version of \l data() to prevent unnecessary copying. - There is also a templatized version of this constData() function that - allows you to retrieve a specific type of read-only pointer to - the data. Note that there is no checking done on the format of - the audio buffer - this is simply a convenience function. + Note that there is no checking done on the format of the audio + buffer - this is simply a convenience function. \code // With a 16bit sample buffer: @@ -261,7 +230,8 @@ qint64 QAudioBuffer::startTime() const noexcept \endcode */ -const void* QAudioBuffer::constData() const noexcept + +const void *QAudioBuffer::constData() const noexcept { if (!d) return nullptr; @@ -269,14 +239,14 @@ const void* QAudioBuffer::constData() const noexcept } /*! + \fn template <typename T> const T* QAudioBuffer::data() const + Returns a pointer to this buffer's data. You can only read it. You should use the \l constData() function rather than this to prevent accidental deep copying. - There is also a templatized version of this data() function that - allows you to retrieve a specific type of read-only pointer to - the data. Note that there is no checking done on the format of + Note that there is no checking done on the format of the audio buffer - this is simply a convenience function. \code @@ -284,36 +254,32 @@ const void* QAudioBuffer::constData() const noexcept const quint16 *data = buffer->data<quint16>(); \endcode */ -const void* QAudioBuffer::data() const noexcept + +const void *QAudioBuffer::data() const noexcept { if (!d) return nullptr; return d->data.constData(); } - -/* - Template data/constData functions caused override problems with qdoc, - so moved their docs into the non template versions. -*/ - /*! + \fn template <typename T> T* QAudioBuffer::data() + Returns a pointer to this buffer's data. You can modify the data through the returned pointer. Since QAudioBuffer objects are explicitly shared, you should usually call detach() before modifying the data through this function. - There is also a templatized version of data() allows you to retrieve - a specific type of pointer to the data. Note that there is no - checking done on the format of the audio buffer - this is - simply a convenience function. + Note that there is no checking done on the format of the audio + buffer - this is simply a convenience function. \code // With a 16bit sample buffer: quint16 *data = buffer->data<quint16>(); // May cause deep copy \endcode */ + void *QAudioBuffer::data() { if (!d) @@ -328,4 +294,33 @@ void *QAudioBuffer::data() channel is a \e {signed short}. */ +/*! + \typedef QAudioBuffer::U8M + + This is a predefined specialization for an unsigned 8 bit mono sample. +*/ +/*! + \typedef QAudioBuffer::S16M + This is a predefined specialization for a signed 16 bit mono sample. +i*/ +/*! + \typedef QAudioBuffer::S32M + This is a predefined specialization for a signed 32 bit mono sample. +*/ +/*! + \typedef QAudioBuffer::F32M + This is a predefined specialization for a 32 bit float mono sample. +*/ +/*! + \typedef QAudioBuffer::U8S + This is a predifined specialization for an unsiged 8 bit stereo sample. +*/ +/*! + \typedef QAudioBuffer::S32S + This is a predifined specialization for a siged 32 bit stereo sample. +*/ +/*! + \typedef QAudioBuffer::F32S + This is a predifined specialization for a 32 bit float stereo sample. +*/ QT_END_NAMESPACE diff --git a/src/multimedia/audio/qaudiobuffer.h b/src/multimedia/audio/qaudiobuffer.h index 624c8aabe..822619f31 100644 --- a/src/multimedia/audio/qaudiobuffer.h +++ b/src/multimedia/audio/qaudiobuffer.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 QAUDIOBUFFER_H #define QAUDIOBUFFER_H @@ -44,7 +8,7 @@ #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qaudio.h> +#include <QtMultimedia/qtaudio.h> #include <QtMultimedia/qaudioformat.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/audio/qaudiobufferinput.cpp b/src/multimedia/audio/qaudiobufferinput.cpp new file mode 100644 index 000000000..e43066f10 --- /dev/null +++ b/src/multimedia/audio/qaudiobufferinput.cpp @@ -0,0 +1,184 @@ +// Copyright (C) 2024 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 "qaudiobufferinput.h" +#include "qplatformaudiobufferinput_p.h" +#include "qmediainputencoderinterface_p.h" +#include "qmediaframeinput_p.h" + +QT_BEGIN_NAMESPACE + +class QAudioBufferInputPrivate : public QMediaFrameInputPrivate +{ +public: + QAudioBufferInputPrivate(QAudioBufferInput *q) : q(q) { } + + bool sendAudioBuffer(const QAudioBuffer &audioBuffer) + { + return sendMediaFrame( + [&]() { emit m_platfromAudioBufferInput->newAudioBuffer(audioBuffer); }); + } + + void initialize(const QAudioFormat &format = {}) + { + m_platfromAudioBufferInput = std::make_unique<QPlatformAudioBufferInput>(format); + addUpdateSignal(m_platfromAudioBufferInput.get(), + &QPlatformAudioBufferInput::encoderUpdated); + } + + void uninitialize() + { + m_platfromAudioBufferInput.reset(); + + if (captureSession()) + captureSession()->setAudioBufferInput(nullptr); + } + + QMediaCaptureSession *session() const { return m_captureSession; } + + QPlatformAudioBufferInput *platfromAudioBufferInput() const + { + return m_platfromAudioBufferInput.get(); + } + +private: + void updateCaptureSessionConnections(QMediaCaptureSession *prevSession, + QMediaCaptureSession *newSession) override + { + if (prevSession) + removeUpdateSignal(prevSession, &QMediaCaptureSession::audioOutputChanged); + + if (newSession) + addUpdateSignal(newSession, &QMediaCaptureSession::audioOutputChanged); + } + + bool checkIfCanSendMediaFrame() const override + { + if (auto encoderInterface = m_platfromAudioBufferInput->encoderInterface()) + return encoderInterface->canPushFrame(); + + // Not implemented yet + // return captureSession()->audioOutput() != nullptr; + return false; + } + + void emitReadyToSendMediaFrame() override { emit q->readyToSendAudioBuffer(); } + +private: + QAudioBufferInput *q = nullptr; + QMediaCaptureSession *m_captureSession = nullptr; + std::unique_ptr<QPlatformAudioBufferInput> m_platfromAudioBufferInput; +}; + +/*! + \class QAudioBufferInput + \inmodule QtMultimedia + \ingroup multimedia + \ingroup multimedia_audio + \since 6.8 + + \brief The QAudioBufferInput class is used for providing custom audio buffers + to \l QMediaRecorder through \l QMediaCaptureSession. + + \sa QMediaRecorder, QMediaCaptureSession +*/ + +/*! + Constructs a new QAudioBufferInput object with \a parent. +*/ +QAudioBufferInput::QAudioBufferInput(QObject *parent) : QAudioBufferInput({}, parent) { } + +/*! + Constructs a new QAudioBufferInput object with audio \a format and \a parent. + + The specified \a format will work as a hint for the initialization of the matching + audio encoder upon invoking \l QMediaRecorder::record(). + If the format is not specified or not valid, the audio encoder will be initialized + upon sending the first audio buffer. + + We recommend specifying the format if you know in advance what kind of audio buffers + you're going to send. +*/ +QAudioBufferInput::QAudioBufferInput(const QAudioFormat &format, QObject *parent) + : QObject(*new QAudioBufferInputPrivate(this), parent) +{ + Q_D(QAudioBufferInput); + d->initialize(format); +} + +/*! + Destroys the object. + */ +QAudioBufferInput::~QAudioBufferInput() +{ + Q_D(QAudioBufferInput); + d->uninitialize(); +} + +/*! + Sends \l QAudioBuffer to \l QMediaRecorder through \l QMediaCaptureSession. + + Returns \c true if the specified \a audioBuffer has been sent successfully + to the destination. Returns \c false, if the buffer hasn't been sent, + which can happen if the instance is not assigned to + \l QMediaCaptureSession, the session doesn't have a media recorder, + the media recorder is not started or its queue is full. + The \l readyToSendAudioBuffer() signal will be emitted as soon as + the destination is able to handle a new audio buffer. + + Sending of an empty audio buffer is treated by \l QMediaRecorder + as an end of the input stream. QMediaRecorder stops the recording + automatically if \l QMediaRecorder::autoStop is \c true and + all the inputs have reported the end of the stream. +*/ +bool QAudioBufferInput::sendAudioBuffer(const QAudioBuffer &audioBuffer) +{ + Q_D(QAudioBufferInput); + return d->sendAudioBuffer(audioBuffer); +} + +/*! + Returns the audio format that was specified upon construction of the audio buffer input. +*/ +QAudioFormat QAudioBufferInput::format() const +{ + Q_D(const QAudioBufferInput); + return d->platfromAudioBufferInput()->audioFormat(); +} + +/*! + Returns the capture session this audio buffer input is connected to, or + a \c nullptr if the audio buffer input is not connected to a capture session. + + Use QMediaCaptureSession::setAudioBufferInput() to connect + the audio buffer input to a session. +*/ +QMediaCaptureSession *QAudioBufferInput::captureSession() const +{ + Q_D(const QAudioBufferInput); + return d->captureSession(); +} + +void QAudioBufferInput::setCaptureSession(QMediaCaptureSession *captureSession) +{ + Q_D(QAudioBufferInput); + d->setCaptureSession(captureSession); +} + +QPlatformAudioBufferInput *QAudioBufferInput::platformAudioBufferInput() const +{ + Q_D(const QAudioBufferInput); + return d->platfromAudioBufferInput(); +} + +/*! + \fn void QAudioBufferInput::readyToSendAudioBuffer() + + Signals that a new audio buffer can be sent to the audio buffer input. + After receiving the signal, if you have audio date to be sent, invoke \l sendAudioBuffer + once or in a loop until it returns \c false. + + \sa sendAudioBuffer() +*/ + +QT_END_NAMESPACE diff --git a/src/multimedia/audio/qaudiobufferinput.h b/src/multimedia/audio/qaudiobufferinput.h new file mode 100644 index 000000000..f48db186a --- /dev/null +++ b/src/multimedia/audio/qaudiobufferinput.h @@ -0,0 +1,48 @@ +// Copyright (C) 2024 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 QAUDIOBUFFERINPUT_H +#define QAUDIOBUFFERINPUT_H + +#include <QtMultimedia/qtmultimediaexports.h> +#include <QtMultimedia/qaudiobuffer.h> +#include <QtCore/qobject.h> + +QT_BEGIN_NAMESPACE + +class QPlatformAudioBufferInput; +class QAudioBufferInputPrivate; +class QMediaCaptureSession; + +class Q_MULTIMEDIA_EXPORT QAudioBufferInput : public QObject +{ + Q_OBJECT +public: + explicit QAudioBufferInput(QObject *parent = nullptr); + + explicit QAudioBufferInput(const QAudioFormat &format, QObject *parent = nullptr); + + ~QAudioBufferInput() override; + + bool sendAudioBuffer(const QAudioBuffer &audioBuffer); + + QAudioFormat format() const; + + QMediaCaptureSession *captureSession() const; + +Q_SIGNALS: + void readyToSendAudioBuffer(); + +private: + void setCaptureSession(QMediaCaptureSession *captureSession); + + QPlatformAudioBufferInput *platformAudioBufferInput() const; + + friend class QMediaCaptureSession; + Q_DISABLE_COPY(QAudioBufferInput) + Q_DECLARE_PRIVATE(QAudioBufferInput) +}; + +QT_END_NAMESPACE + +#endif // QAUDIOBUFFERINPUT_H diff --git a/src/multimedia/audio/qaudiobufferoutput.cpp b/src/multimedia/audio/qaudiobufferoutput.cpp new file mode 100644 index 000000000..50389c49a --- /dev/null +++ b/src/multimedia/audio/qaudiobufferoutput.cpp @@ -0,0 +1,78 @@ +// Copyright (C) 2024 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 "qaudiobufferoutput_p.h" +#include "qmediaplayer.h" + +QT_BEGIN_NAMESPACE + +/*! + \class QAudioBufferOutput + \inmodule QtMultimedia + \ingroup multimedia + \ingroup multimedia_audio + \since 6.8 + + \brief The QAudioBufferOutput class is used for capturing audio data provided by \l QMediaPlayer. + + QAudioBufferOutput can be set to QMediaPlayer in order to receive audio buffers + decoded by the media player. The received audio data can be used for any + processing or visualization. + + \sa QMediaPlayer, QMediaPlayer::setAudioBufferOutput, QAudioBuffer +*/ + +/*! + Constructs a new QAudioBufferOutput object with \a parent. + + The audio format of output audio buffers will depend on + the source media file and the inner audio decoder in \l QMediaPlayer. +*/ +QAudioBufferOutput::QAudioBufferOutput(QObject *parent) + : QObject(*new QAudioBufferOutputPrivate, parent) +{ +} + +/*! + Constructs a new QAudioBufferOutput object with audio \a format and \a parent. + + If the specified \a format is valid, it will be the format of output + audio buffers. Otherwise, the format of output audio buffers + will depend on the source media file and the inner audio decoder in \l QMediaPlayer. +*/ +QAudioBufferOutput::QAudioBufferOutput(const QAudioFormat &format, QObject *parent) + : QObject(*new QAudioBufferOutputPrivate(format), parent) +{ +} + +/*! + Destroys the audio buffer output object. +*/ +QAudioBufferOutput::~QAudioBufferOutput() +{ + Q_D(QAudioBufferOutput); + + if (d->mediaPlayer) + d->mediaPlayer->setAudioBufferOutput(nullptr); +} + +/*! + Gets the audio format specified in the constructor. + + If the format is valid, it specifies the format of output oudio buffers. +*/ +QAudioFormat QAudioBufferOutput::format() const +{ + Q_D(const QAudioBufferOutput); + return d->format; +} + +/*! + \fn void QAudioBufferOutput::audioBufferReceived(const QAudioBuffer &buffer) + + Signals that a new audio \a buffer has been received from \l QMediaPlayer. +*/ + +QT_END_NAMESPACE + +#include "moc_qaudiobufferoutput.cpp" diff --git a/src/multimedia/audio/qaudiobufferoutput.h b/src/multimedia/audio/qaudiobufferoutput.h new file mode 100644 index 000000000..2e4fab1a4 --- /dev/null +++ b/src/multimedia/audio/qaudiobufferoutput.h @@ -0,0 +1,37 @@ +// Copyright (C) 2024 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 QAUDIOBUFFEROUTPUT_H +#define QAUDIOBUFFEROUTPUT_H + +#include <QtMultimedia/qtmultimediaexports.h> +#include <QtMultimedia/qaudiobuffer.h> +#include <QtCore/qobject.h> + +QT_BEGIN_NAMESPACE + +class QAudioBufferOutputPrivate; + +class Q_MULTIMEDIA_EXPORT QAudioBufferOutput : public QObject +{ + Q_OBJECT +public: + explicit QAudioBufferOutput(QObject *parent = nullptr); + + explicit QAudioBufferOutput(const QAudioFormat &format, QObject *parent = nullptr); + + ~QAudioBufferOutput() override; + + QAudioFormat format() const; + +Q_SIGNALS: + void audioBufferReceived(const QAudioBuffer &buffer); + +private: + Q_DISABLE_COPY(QAudioBufferOutput) + Q_DECLARE_PRIVATE(QAudioBufferOutput) +}; + +QT_END_NAMESPACE + +#endif // QAUDIOBUFFEROUTPUT_H diff --git a/src/multimedia/audio/qaudiobufferoutput_p.h b/src/multimedia/audio/qaudiobufferoutput_p.h new file mode 100644 index 000000000..2f9c11bd1 --- /dev/null +++ b/src/multimedia/audio/qaudiobufferoutput_p.h @@ -0,0 +1,42 @@ +// Copyright (C) 2024 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 QAUDIOBUFFEROUTPUT_P_H +#define QAUDIOBUFFEROUTPUT_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtCore/private/qobject_p.h> +#include "qaudiobufferoutput.h" + +QT_BEGIN_NAMESPACE + +class QMediaPlayer; + +class QAudioBufferOutputPrivate : public QObjectPrivate +{ +public: + QAudioBufferOutputPrivate(const QAudioFormat &format = {}) : format(std::move(format)) { } + + static QMediaPlayer *exchangeMediaPlayer(QAudioBufferOutput &output, QMediaPlayer *player) + { + auto outputPrivate = static_cast<QAudioBufferOutputPrivate *>(output.d_func()); + return std::exchange(outputPrivate->mediaPlayer, player); + } + + QAudioFormat format; + QMediaPlayer *mediaPlayer = nullptr; +}; + +QT_END_NAMESPACE + +#endif // QAUDIOBUFFEROUTPUT_P_H diff --git a/src/multimedia/audio/qaudiodecoder.cpp b/src/multimedia/audio/qaudiodecoder.cpp index e0587d31a..f555f46ed 100644 --- a/src/multimedia/audio/qaudiodecoder.cpp +++ b/src/multimedia/audio/qaudiodecoder.cpp @@ -1,56 +1,19 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ - -#include "qtmultimediaglobal_p.h" -#include "qaudiodecoder.h" +// 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 -#include "private/qplatformaudiodecoder_p.h" +#include "qaudiodecoder.h" +#include <private/qaudiodecoder_p.h> +#include <private/qmultimediautils_p.h> +#include <private/qplatformaudiodecoder_p.h> #include <private/qplatformmediaintegration_p.h> -#include <private/qobject_p.h> #include <QtCore/qcoreevent.h> +#include <QtCore/qdebug.h> #include <QtCore/qmetaobject.h> +#include <QtCore/qpointer.h> #include <QtCore/qtimer.h> #include <QtCore/qurl.h> -#include <QtCore/qdebug.h> -#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE @@ -74,12 +37,19 @@ QT_BEGIN_NAMESPACE /*! Construct an QAudioDecoder instance with \a parent. */ -QAudioDecoder::QAudioDecoder(QObject *parent) - : QObject(parent) +QAudioDecoder::QAudioDecoder(QObject *parent) : QObject{ *new QAudioDecoderPrivate, parent } { - decoder = QPlatformMediaIntegration::instance()->createAudioDecoder(this); -} + QT6_ONLY(Q_UNUSED(unused)) + + Q_D(QAudioDecoder); + auto maybeDecoder = QPlatformMediaIntegration::instance()->createAudioDecoder(this); + if (maybeDecoder) { + d->decoder.reset(maybeDecoder.value()); + } else { + qWarning() << "Failed to initialize QAudioDecoder" << maybeDecoder.error(); + } +} /*! Destroys the audio decoder object. @@ -91,7 +61,9 @@ QAudioDecoder::~QAudioDecoder() = default; */ bool QAudioDecoder::isSupported() const { - return decoder != nullptr; + Q_D(const QAudioDecoder); + + return bool(d->decoder); } /*! @@ -100,29 +72,33 @@ bool QAudioDecoder::isSupported() const */ bool QAudioDecoder::isDecoding() const { - return decoder && decoder->isDecoding(); + Q_D(const QAudioDecoder); + + return d->decoder && d->decoder->isDecoding(); } /*! - \property QAudioDecoder::error - \brief The current error state. + + Returns the current error state of the QAudioDecoder. */ QAudioDecoder::Error QAudioDecoder::error() const { - if (!decoder) - return NotSupportedError; - return decoder->error(); + Q_D(const QAudioDecoder); + return d->decoder ? d->decoder->error() : NotSupportedError; } /*! + \property QAudioDecoder::error + Returns a human readable description of the current error, or an empty string is there is no error. */ QString QAudioDecoder::errorString() const { - if (!decoder) + Q_D(const QAudioDecoder); + if (!d->decoder) return tr("QAudioDecoder not supported."); - return decoder->errorString(); + return d->decoder->errorString(); } /*! @@ -139,13 +115,14 @@ QString QAudioDecoder::errorString() const */ void QAudioDecoder::start() { - if (decoder == nullptr) + Q_D(QAudioDecoder); + + if (!d->decoder) return; // Reset error conditions - decoder->clearError(); - - decoder->start(); + d->decoder->clearError(); + d->decoder->start(); } /*! @@ -153,10 +130,10 @@ void QAudioDecoder::start() */ void QAudioDecoder::stop() { - if (!decoder) - return; + Q_D(QAudioDecoder); - decoder->stop(); + if (d->decoder) + d->decoder->stop(); } /*! @@ -166,9 +143,8 @@ void QAudioDecoder::stop() */ QUrl QAudioDecoder::source() const { - if (decoder) - return decoder->source(); - return QString(); + Q_D(const QAudioDecoder); + return d->unresolvedUrl; } /*! @@ -182,11 +158,16 @@ QUrl QAudioDecoder::source() const */ void QAudioDecoder::setSource(const QUrl &fileName) { - if (!decoder) + Q_D(QAudioDecoder); + + if (!d->decoder) return; - decoder->clearError(); - decoder->setSource(fileName); + d->decoder->clearError(); + d->unresolvedUrl = fileName; + d->decoder->setSourceDevice(nullptr); + QUrl url = qMediaFromUserInput(fileName); + d->decoder->setSource(url); } /*! @@ -195,9 +176,8 @@ void QAudioDecoder::setSource(const QUrl &fileName) */ QIODevice *QAudioDecoder::sourceDevice() const { - if (decoder) - return decoder->sourceDevice(); - return nullptr; + Q_D(const QAudioDecoder); + return d->decoder ? d->decoder->sourceDevice() : nullptr; } /*! @@ -211,9 +191,11 @@ QIODevice *QAudioDecoder::sourceDevice() const */ void QAudioDecoder::setSourceDevice(QIODevice *device) { - if (!decoder) - return; - decoder->setSourceDevice(device); + Q_D(QAudioDecoder); + if (d->decoder) { + d->unresolvedUrl = QUrl{}; + d->decoder->setSourceDevice(device); + } } /*! @@ -226,9 +208,8 @@ void QAudioDecoder::setSourceDevice(QIODevice *device) */ QAudioFormat QAudioDecoder::audioFormat() const { - if (decoder) - return decoder->audioFormat(); - return QAudioFormat(); + Q_D(const QAudioDecoder); + return d->decoder ? d->decoder->audioFormat() : QAudioFormat{}; } /*! @@ -248,15 +229,18 @@ QAudioFormat QAudioDecoder::audioFormat() const audio file, you can specify an invalid \a format. \warning Setting a desired audio format is not yet supported - on Android. + on the Android backend. It does work with the default FFMPEG + backend. */ void QAudioDecoder::setAudioFormat(const QAudioFormat &format) { if (isDecoding()) return; - if (decoder != nullptr) - decoder->setAudioFormat(format); + Q_D(QAudioDecoder); + + if (d->decoder) + d->decoder->setAudioFormat(format); } /*! @@ -266,9 +250,8 @@ void QAudioDecoder::setAudioFormat(const QAudioFormat &format) */ bool QAudioDecoder::bufferAvailable() const { - if (decoder) - return decoder->bufferAvailable(); - return false; + Q_D(const QAudioDecoder); + return d->decoder && d->decoder->bufferAvailable(); } /*! @@ -278,9 +261,8 @@ bool QAudioDecoder::bufferAvailable() const qint64 QAudioDecoder::position() const { - if (decoder) - return decoder->position(); - return -1; + Q_D(const QAudioDecoder); + return d->decoder ? d->decoder->position() : -1; } /*! @@ -290,9 +272,8 @@ qint64 QAudioDecoder::position() const qint64 QAudioDecoder::duration() const { - if (decoder) - return decoder->duration(); - return -1; + Q_D(const QAudioDecoder); + return d->decoder ? d->decoder->duration() : -1; } /*! @@ -307,10 +288,8 @@ qint64 QAudioDecoder::duration() const QAudioBuffer QAudioDecoder::read() const { - if (decoder) - return decoder->read(); - - return QAudioBuffer(); + Q_D(const QAudioDecoder); + return d->decoder ? d->decoder->read() : QAudioBuffer{}; } // Enums @@ -328,7 +307,7 @@ QAudioBuffer QAudioDecoder::read() const // Signals /*! - \fn QAudioDecoder::error(QAudioDecoder::Error error) + \fn void QAudioDecoder::error(QAudioDecoder::Error error) Signals that an \a error condition has occurred. @@ -394,7 +373,6 @@ QAudioBuffer QAudioDecoder::read() const \sa positionChanged() */ - // Properties /*! \property QAudioDecoder::source diff --git a/src/multimedia/audio/qaudiodecoder.h b/src/multimedia/audio/qaudiodecoder.h index 451c3a657..9044b6617 100644 --- a/src/multimedia/audio/qaudiodecoder.h +++ b/src/multimedia/audio/qaudiodecoder.h @@ -1,53 +1,16 @@ -/**************************************************************************** -** -** 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 QAUDIODECODER_H #define QAUDIODECODER_H #include <QtCore/qobject.h> #include <QtMultimedia/qmediaenumdebug.h> - #include <QtMultimedia/qaudiobuffer.h> QT_BEGIN_NAMESPACE -class QPlatformAudioDecoder; +class QAudioDecoderPrivate; class Q_MULTIMEDIA_EXPORT QAudioDecoder : public QObject { Q_OBJECT @@ -112,7 +75,10 @@ Q_SIGNALS: private: Q_DISABLE_COPY(QAudioDecoder) - QPlatformAudioDecoder *decoder; + Q_DECLARE_PRIVATE(QAudioDecoder) + + // ### Qt7: remove unused member + QT6_ONLY(void *unused = nullptr;) // for ABI compatibility }; QT_END_NAMESPACE diff --git a/src/multimedia/audio/qaudiodecoder_p.h b/src/multimedia/audio/qaudiodecoder_p.h new file mode 100644 index 000000000..fa7311457 --- /dev/null +++ b/src/multimedia/audio/qaudiodecoder_p.h @@ -0,0 +1,40 @@ +// Copyright (C) 2024 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 QAUDIODECODER_P_H +#define QAUDIODECODER_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtCore/private/qobject_p.h> +#include <QtMultimedia/private/qplatformaudiodecoder_p.h> + +#include <memory.h> + +QT_BEGIN_NAMESPACE + +class QAudioDecoder; + +class QAudioDecoderPrivate : public QObjectPrivate +{ + Q_DECLARE_PUBLIC(QAudioDecoder) + +public: + QAudioDecoderPrivate() = default; + + QUrl unresolvedUrl; + std::unique_ptr<QPlatformAudioDecoder> decoder; +}; + +QT_END_NAMESPACE + +#endif // QAUDIODECODER_P_H diff --git a/src/multimedia/audio/qaudiodevice.cpp b/src/multimedia/audio/qaudiodevice.cpp index 5d06cdbe0..4b1e182cb 100644 --- a/src/multimedia/audio/qaudiodevice.cpp +++ b/src/multimedia/audio/qaudiodevice.cpp @@ -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 #include "qaudiosystem_p.h" #include "qaudiodevice_p.h" @@ -52,12 +16,14 @@ QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QAudioDevicePrivate); /*! \class QAudioDevice - \brief The QAudioDevice class provides an information about audio devices and their functionality. + \brief The QAudioDevice class provides an information about audio devices and their + functionality. \inmodule QtMultimedia \ingroup multimedia \ingroup multimedia_audio - QAudioDevice describes an audio device available in the system, either for input or for playback. + QAudioDevice describes an audio device available in the system, either for input or for + playback. A QAudioDevice is used by Qt to construct classes that communicate with the device -- such as @@ -87,7 +53,7 @@ QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QAudioDevicePrivate); sound, i.e., play an audio stream in a supported format. For each device we find, we simply print the deviceName(). - \sa QAudioSink, QAudioSource QAudioFormat + \sa QAudioSink, QAudioSource, QAudioFormat */ /*! @@ -127,14 +93,18 @@ QAudioDevice::QAudioDevice() = default; /*! Constructs a copy of \a other. */ -QAudioDevice::QAudioDevice(const QAudioDevice& other) = default; +QAudioDevice::QAudioDevice(const QAudioDevice &other) = default; /*! \fn QAudioDevice::QAudioDevice(QAudioDevice &&other) Move constructs from \a other. */ +/*! + \fn void QAudioDevice::swap(QAudioDevice &other) noexcept + Swaps the audio device with the \a other. +*/ /*! Destroy this audio device info. */ @@ -143,7 +113,7 @@ QAudioDevice::~QAudioDevice() = default; /*! Sets the QAudioDevice object to be equal to \a other. */ -QAudioDevice& QAudioDevice::operator=(const QAudioDevice &other) = default; +QAudioDevice &QAudioDevice::operator=(const QAudioDevice &other) = default; /*! \fn QAudioDevice& QAudioDevice::operator=(QAudioDevice &&other) @@ -155,13 +125,13 @@ QAudioDevice& QAudioDevice::operator=(const QAudioDevice &other) = default; Returns true if this QAudioDevice class represents the same audio device as \a other. */ -bool QAudioDevice::operator ==(const QAudioDevice &other) const +bool QAudioDevice::operator==(const QAudioDevice &other) const { if (d == other.d) return true; if (!d || !other.d) return false; - if (d->mode == other.d->mode && d->id == other.d->id) + if (d->mode == other.d->mode && d->id == other.d->id && d->isDefault == other.d->isDefault) return true; return false; } @@ -170,7 +140,7 @@ bool QAudioDevice::operator ==(const QAudioDevice &other) const Returns true if this QAudioDevice class represents a different audio device than \a other */ -bool QAudioDevice::operator !=(const QAudioDevice &other) const +bool QAudioDevice::operator!=(const QAudioDevice &other) const { return !operator==(other); } @@ -194,6 +164,8 @@ bool QAudioDevice::isNull() const */ /*! + \property QAudioDevice::id + Returns an identifier for the audio device. Device names vary depending on the platform/audio plugin being used. @@ -214,6 +186,8 @@ QByteArray QAudioDevice::id() const */ /*! + \property QAudioDevice::description + Returns a human readable name of the audio device. Use this string to present the device to the user. @@ -230,6 +204,8 @@ QString QAudioDevice::description() const */ /*! + \property QAudioDevice::isDefault + Returns true if this is the default audio device. */ bool QAudioDevice::isDefault() const @@ -245,9 +221,11 @@ bool QAudioDevice::isFormatSupported(const QAudioFormat &settings) const { if (isNull()) return false; - if (settings.sampleRate() < d->minimumSampleRate || settings.sampleRate() > d->maximumSampleRate) + if (settings.sampleRate() < d->minimumSampleRate + || settings.sampleRate() > d->maximumSampleRate) return false; - if (settings.channelCount() < d->minimumChannelCount || settings.channelCount() > d->maximumChannelCount) + if (settings.channelCount() < d->minimumChannelCount + || settings.channelCount() > d->maximumChannelCount) return false; if (!d->supportedSampleFormats.contains(settings.sampleFormat())) return false; @@ -259,7 +237,7 @@ bool QAudioDevice::isFormatSupported(const QAudioFormat &settings) const These settings are provided by the platform/audio plugin being used. - They are also dependent on the \l {QAudio}::Mode being used. + They are also dependent on the \l {QtAudio}::Mode being used. A typical audio system would provide something like: \list @@ -325,16 +303,18 @@ QAudioFormat::ChannelConfig QAudioDevice::channelConfiguration() const } /*! + \fn QAudioDevicePrivate QAudioDevice::handle() const \internal */ -QAudioDevice::QAudioDevice(QAudioDevicePrivate *p) - : d(p) -{} +/*! + \internal +*/ +QAudioDevice::QAudioDevice(QAudioDevicePrivate *p) : d(p) { } /*! \enum QAudioDevice::Mode - Describes the mode of a QAudioDevice + Describes the mode of this device. \value Null A null device. @@ -359,7 +339,9 @@ QAudioDevice::QAudioDevice(QAudioDevicePrivate *p) */ /*! - returns whether this device is an input or output device. + \property QAudioDevice::mode + + Returns whether this device is an input or output device. */ QAudioDevice::Mode QAudioDevice::mode() const { @@ -387,3 +369,5 @@ QDebug operator<<(QDebug dbg, QAudioDevice::Mode mode) #endif QT_END_NAMESPACE + +#include "moc_qaudiodevice.cpp" diff --git a/src/multimedia/audio/qaudiodevice.h b/src/multimedia/audio/qaudiodevice.h index 3098c6df1..abd1b654c 100644 --- a/src/multimedia/audio/qaudiodevice.h +++ b/src/multimedia/audio/qaudiodevice.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 QAUDIODEVICEINFO_H @@ -49,7 +13,7 @@ #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qaudio.h> +#include <QtMultimedia/qtaudio.h> #include <QtMultimedia/qaudioformat.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/audio/qaudiodevice_p.h b/src/multimedia/audio/qaudiodevice_p.h index 3348e89e4..c59856d72 100644 --- a/src/multimedia/audio/qaudiodevice_p.h +++ b/src/multimedia/audio/qaudiodevice_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2022 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) 2022 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 QAUDIODEVICEINFO_P_H @@ -65,7 +29,7 @@ public: mode(m) {} virtual ~QAudioDevicePrivate(); - QByteArray id; + QByteArray id; QAudioDevice::Mode mode = QAudioDevice::Output; bool isDefault = false; @@ -76,7 +40,19 @@ public: int minimumChannelCount = 0; int maximumChannelCount = 0; QList<QAudioFormat::SampleFormat> supportedSampleFormats; - QAudioFormat::ChannelConfig channelConfiguration; + QAudioFormat::ChannelConfig channelConfiguration = QAudioFormat::ChannelConfigUnknown; + + bool operator == (const QAudioDevicePrivate &other) const + { + return id == other.id && mode == other.mode && isDefault == other.isDefault + && preferredFormat == other.preferredFormat && description == other.description + && minimumSampleRate == other.minimumSampleRate + && maximumSampleRate == other.maximumSampleRate + && minimumChannelCount == other.minimumChannelCount + && maximumChannelCount == other.maximumChannelCount + && supportedSampleFormats == other.supportedSampleFormats + && channelConfiguration == other.channelConfiguration; + } QAudioDevice create() { return QAudioDevice(this); } }; diff --git a/src/multimedia/audio/qaudioformat.cpp b/src/multimedia/audio/qaudioformat.cpp index ecc1de1ff..9f51759b5 100644 --- a/src/multimedia/audio/qaudioformat.cpp +++ b/src/multimedia/audio/qaudioformat.cpp @@ -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 #include <QDebug> #include <qaudioformat.h> #include <qalgorithms.h> @@ -117,9 +81,15 @@ QT_BEGIN_NAMESPACE */ /*! - \fn QAudioFormat& QAudioFormat::operator=(const QAudioFormat &other) + \fn bool QAudioFormat::operator==(const QAudioFormat &a, const QAudioFormat &b) - Assigns \a other to this QAudioFormat implementation. + Returns \c true if audio format \a a is equal to \a b, otherwise returns \c false. +*/ + +/*! + \fn bool QAudioFormat::operator!=(const QAudioFormat &a, const QAudioFormat &b) + + Returns \c true if audio format \a a is not equal to \a b, otherwise returns \c false. */ /*! @@ -172,7 +142,10 @@ QT_BEGIN_NAMESPACE \value BottomFrontLeft \value BottomFrontRight */ - +/*! + \variable QAudioFormat::NChannelPositions + \internal +*/ /*! \enum QAudioFormat::ChannelConfig @@ -182,13 +155,22 @@ QT_BEGIN_NAMESPACE and 7.1 surround configurations. \value ChannelConfigUnknown The channel configuration is not known. - \value ChannelConfigMono The audio has one Center channel - \value ChannelConfigStereo The audio has two channels, Left and Right - \value ChannelConfig2Dot1 The audio has three channels, Left, Right and LFE (low frequency effect) - \value ChannelConfigSurround5Dot0 The audio has five channels, Left, Right, Center, BackLeft, BackRight - \value ChannelConfigSurround5Dot1 The audio has 6 channels, Left, Right, Center, LFE, BackLeft and BackRight - \value ChannelConfigSurround7Dot0 The audio has 7 channels, Left, Right, Center, BackLeft, BackRight, SideLeft and SideRight - \value ChannelConfigSurround7Dot1 The audio has 8 channels, Left, Right, Center, LFE, BackLeft, BackRight, SideLeft and SideRight + \value ChannelConfigMono The audio has one Center channel. + \value ChannelConfigStereo The audio has two channels, Left and Right. + \value ChannelConfig2Dot1 The audio has three channels, Left, Right and + LFE (low frequency effect). + \value ChannelConfig3Dot0 The audio has three channels, Left, Right, and + Center. + \value ChannelConfig3Dot1 The audio has four channels, Left, Right, Center, + and LFE (low frequency effect). + \value ChannelConfigSurround5Dot0 The audio has five channels, Left, Right, + Center, BackLeft, and BackRight. + \value ChannelConfigSurround5Dot1 The audio has 6 channels, Left, Right, + Center, LFE, BackLeft, and BackRight. + \value ChannelConfigSurround7Dot0 The audio has 7 channels, Left, Right, + Center, BackLeft, BackRight, SideLeft, and SideRight. + \value ChannelConfigSurround7Dot1 The audio has 8 channels, Left, Right, + Center, LFE, BackLeft, BackRight, SideLeft, and SideRight. */ /*! @@ -228,7 +210,11 @@ int QAudioFormat::channelOffset(AudioChannelPosition channel) const noexcept config to ChannelConfigUnknown. */ +/*! + \fn template <typename... Args> QAudioFormat::ChannelConfig QAudioFormat::channelConfig(Args... channels) + Returns the current channel configuration for the given \a channels. +*/ /*! \fn QAudioFormat::ChannelConfig QAudioFormat::channelConfig() const noexcept @@ -374,11 +360,15 @@ float QAudioFormat::normalizedSampleValue(const void *sample) const { switch (m_sampleFormat) { case UInt8: - return ((float)*reinterpret_cast<const quint8 *>(sample))/(float)std::numeric_limits<qint8>::max() - 1.; + return ((float)*reinterpret_cast<const quint8 *>(sample)) + / (float)std::numeric_limits<qint8>::max() + - 1.; case Int16: - return ((float)*reinterpret_cast<const qint16 *>(sample))/(float)std::numeric_limits<qint16>::max(); + return ((float)*reinterpret_cast<const qint16 *>(sample)) + / (float)std::numeric_limits<qint16>::max(); case Int32: - return ((float)*reinterpret_cast<const qint32 *>(sample))/(float)std::numeric_limits<qint32>::max(); + return ((float)*reinterpret_cast<const qint32 *>(sample)) + / (float)std::numeric_limits<qint32>::max(); case Float: return *reinterpret_cast<const float *>(sample); case Unknown: @@ -401,6 +391,9 @@ QAudioFormat::ChannelConfig QAudioFormat::defaultChannelConfigForChannelCount(in { QAudioFormat::ChannelConfig config; switch (channelCount) { + case 0: + config = QAudioFormat::ChannelConfigUnknown; + break; case 1: config = QAudioFormat::ChannelConfigMono; break; @@ -442,7 +435,7 @@ QAudioFormat::ChannelConfig QAudioFormat::defaultChannelConfigForChannelCount(in QAudioBuffer. \value Unknown Not Set - \value UInt8 Samples are unsigned 8 bit signed integers + \value UInt8 Samples are 8 bit unsigned integers \value Int16 Samples are 16 bit signed integers \value Int32 Samples are 32 bit signed integers \value Float Samples are floats @@ -476,12 +469,10 @@ QDebug operator<<(QDebug dbg, QAudioFormat::SampleFormat type) QDebug operator<<(QDebug dbg, const QAudioFormat &f) { - dbg << "QAudioFormat(" << f.sampleRate() << "Hz, " << f.channelCount() << "Channels, " << f.sampleFormat() << "Format )"; + dbg << "QAudioFormat(" << f.sampleRate() << "Hz, " << f.channelCount() << "Channels, " + << f.sampleFormat() << "Format )"; return dbg; } #endif - - QT_END_NAMESPACE - diff --git a/src/multimedia/audio/qaudioformat.h b/src/multimedia/audio/qaudioformat.h index b4cbb6428..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 @@ -104,6 +68,8 @@ public: 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), diff --git a/src/multimedia/audio/qaudiohelpers.cpp b/src/multimedia/audio/qaudiohelpers.cpp index 1e7c4ac81..c2d8681c6 100644 --- a/src/multimedia/audio/qaudiohelpers.cpp +++ b/src/multimedia/audio/qaudiohelpers.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 "qaudiohelpers_p.h" @@ -60,7 +24,7 @@ template<class T> struct signedVersion {}; template<> struct signedVersion<quint8> { using TS = qint8; - enum {offset = 0x80}; + static constexpr int offset = 0x80; }; template<class T> void adjustUnsignedSamples(qreal factor, const void *src, void *dst, int samples) diff --git a/src/multimedia/audio/qaudiohelpers_p.h b/src/multimedia/audio/qaudiohelpers_p.h index 04896a2c3..81e6c6382 100644 --- a/src/multimedia/audio/qaudiohelpers_p.h +++ b/src/multimedia/audio/qaudiohelpers_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2022 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) 2022 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 QAUDIOHELPERS_H #define QAUDIOHELPERS_H diff --git a/src/multimedia/audio/qaudioinput.cpp b/src/multimedia/audio/qaudioinput.cpp index 8472ceb6c..dc7d7335f 100644 --- a/src/multimedia/audio/qaudioinput.cpp +++ b/src/multimedia/audio/qaudioinput.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 <qaudioinput.h> #include <qaudiodevice.h> @@ -69,10 +33,10 @@ } \endqml - You can use AudioInput together with a QtMultiMedia::CaptureSession to capture audio from an audio - input device. + You can use AudioInput together with a QtMultiMedia::CaptureSession to capture audio from an + audio input device. - \sa Camera AudioOutput + \sa Camera, AudioOutput */ /*! @@ -87,16 +51,22 @@ to be used, muting the channel, and changing the channel's volume. */ -QAudioInput::QAudioInput(QObject *parent) - : QAudioInput(QMediaDevices::defaultAudioInput(), parent) -{} +QAudioInput::QAudioInput(QObject *parent) : QAudioInput(QMediaDevices::defaultAudioInput(), parent) +{ +} QAudioInput::QAudioInput(const QAudioDevice &device, QObject *parent) - : QObject(parent), - d(QPlatformMediaIntegration::instance()->createAudioInput(this)) + : QObject(parent) { - d->device = device.mode() == QAudioDevice::Input ? device : QMediaDevices::defaultAudioInput(); - d->setAudioDevice(d->device); + auto maybeAudioInput = QPlatformMediaIntegration::instance()->createAudioInput(this); + if (maybeAudioInput) { + d = maybeAudioInput.value(); + d->device = device.mode() == QAudioDevice::Input ? device : QMediaDevices::defaultAudioInput(); + d->setAudioDevice(d->device); + } else { + d = new QPlatformAudioInput(nullptr); + qWarning() << "Failed to initialize QAudioInput" << maybeAudioInput.error(); + } } QAudioInput::~QAudioInput() @@ -116,7 +86,12 @@ QAudioInput::~QAudioInput() UI volume controls should usually be scaled non-linearly. For example, using a logarithmic scale will produce linear changes in perceived loudness, which is what a user would normally expect from a volume control. - \sa QAudio::convertVolume() + \sa QtAudio::convertVolume() +*/ +/*! + \property QAudioInput::volume + + The property returns the volume of the audio input. */ float QAudioInput::volume() const { diff --git a/src/multimedia/audio/qaudioinput.h b/src/multimedia/audio/qaudioinput.h index 95e337fe2..6f4f6b099 100644 --- a/src/multimedia/audio/qaudioinput.h +++ b/src/multimedia/audio/qaudioinput.h @@ -1,48 +1,12 @@ -/**************************************************************************** -** -** 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 #ifndef QAUDIOINPUTDEVICE_H #define QAUDIOINPUTDEVICE_H #include <QtCore/qobject.h> #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qaudio.h> +#include <QtMultimedia/qtaudio.h> #include <functional> diff --git a/src/multimedia/audio/qaudiooutput.cpp b/src/multimedia/audio/qaudiooutput.cpp index 209ed63ca..3bb52a4d2 100644 --- a/src/multimedia/audio/qaudiooutput.cpp +++ b/src/multimedia/audio/qaudiooutput.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 <qaudiooutput.h> #include <qaudiodevice.h> @@ -67,10 +31,11 @@ } \endqml - You can use AudioOutput together with a QtMultiMedia::MediaPlayer to play audio content, or you can use it - in conjunction with a MultiMedia::CaptureSession to monitor the audio processed by the capture session. + You can use AudioOutput together with a QtMultiMedia::MediaPlayer to play audio content, or you + can use it in conjunction with a MultiMedia::CaptureSession to monitor the audio processed by the + capture session. - \sa VideoOutput AudioInput + \sa VideoOutput, AudioInput */ /*! @@ -88,14 +53,21 @@ */ QAudioOutput::QAudioOutput(QObject *parent) : QAudioOutput(QMediaDevices::defaultAudioOutput(), parent) -{} +{ +} QAudioOutput::QAudioOutput(const QAudioDevice &device, QObject *parent) - : QObject(parent), - d(QPlatformMediaIntegration::instance()->createAudioOutput(this)) + : QObject(parent) { - d->device = device.mode() == QAudioDevice::Output ? device : QMediaDevices::defaultAudioOutput(); - d->setAudioDevice(d->device); + auto maybeAudioOutput = QPlatformMediaIntegration::instance()->createAudioOutput(this); + if (maybeAudioOutput) { + d = maybeAudioOutput.value(); + d->device = device.mode() == QAudioDevice::Output ? device : QMediaDevices::defaultAudioOutput(); + d->setAudioDevice(d->device); + } else { + d = new QPlatformAudioOutput(nullptr); + qWarning() << "Failed to initialize QAudioOutput" << maybeAudioOutput.error(); + } } QAudioOutput::~QAudioOutput() @@ -104,7 +76,6 @@ QAudioOutput::~QAudioOutput() delete d; } - /*! \qmlproperty real QtMultimedia::AudioOutput::volume @@ -120,7 +91,7 @@ QAudioOutput::~QAudioOutput() using a logarithmic scale will produce linear changes in perceived \l{loudness}, which is what a user would normally expect from a volume control. - See \l {QAudio::convertVolume()}{QtMultimedia.convertVolume()} + See \l {QtAudio::convertVolume()}{QtMultimedia.convertVolume()} for more details. */ @@ -138,7 +109,7 @@ QAudioOutput::~QAudioOutput() using a logarithmic scale will produce linear changes in perceived loudness, which is what a user would normally expect from a volume control. - \sa QAudio::convertVolume() + \sa QtAudio::convertVolume() */ float QAudioOutput::volume() const { @@ -235,5 +206,4 @@ void QAudioOutput::setDisconnectFunction(std::function<void()> disconnectFunctio d->disconnectFunction = std::move(disconnectFunction); } - #include "moc_qaudiooutput.cpp" diff --git a/src/multimedia/audio/qaudiooutput.h b/src/multimedia/audio/qaudiooutput.h index cfb3d65d2..643d19f94 100644 --- a/src/multimedia/audio/qaudiooutput.h +++ b/src/multimedia/audio/qaudiooutput.h @@ -1,48 +1,12 @@ -/**************************************************************************** -** -** 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 #ifndef QAUDIOOUTPUTDEVICE_H #define QAUDIOOUTPUTDEVICE_H #include <QtCore/qobject.h> #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qaudio.h> +#include <QtMultimedia/qtaudio.h> #include <functional> diff --git a/src/multimedia/audio/qaudiosink.cpp b/src/multimedia/audio/qaudiosink.cpp index 15d865996..12263d32a 100644 --- a/src/multimedia/audio/qaudiosink.cpp +++ b/src/multimedia/audio/qaudiosink.cpp @@ -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 #include "qaudio.h" @@ -81,21 +45,22 @@ QT_BEGIN_NAMESPACE After the file has finished playing, we need to stop the device: - \snippet multimedia-snippets/audio.cpp Audio output state changed + \snippet multimedia-snippets/audio.cpp Audio output stop At any given time, the QAudioSink will be in one of four states: active, suspended, stopped, or idle. These states are described - by the QAudio::State enum. + by the QtAudio::State enum. State changes are reported through the stateChanged() signal. You can use this signal to, for instance, update the GUI of the application; the mundane example here being changing the state of a \c { play/pause } button. You request a state change directly with suspend(), stop(), reset(), resume(), and start(). - If an error occurs, you can fetch the \l{QAudio::Error}{error - type} with the error() function. Please see the QAudio::Error enum - for a description of the possible errors that are reported. When - an error is encountered, the state changes to QAudio::StoppedState. + If an error occurs, you can fetch the \l{QtAudio::Error}{error + type} with the error() function. Please see the QtAudio::Error enum + for a description of the possible errors that are reported. When + QtAudio::UnderrunError is encountered, the state changes to QtAudio::IdleState, + when another error is encountered, the state changes to QtAudio::StoppedState. You can check for errors by connecting to the stateChanged() signal: @@ -122,14 +87,26 @@ QAudioSink::QAudioSink(const QAudioFormat &format, QObject *parent) QAudioSink::QAudioSink(const QAudioDevice &audioDevice, const QAudioFormat &format, QObject *parent): QObject(parent) { - d = QPlatformMediaDevices::instance()->audioOutputDevice(format, audioDevice); + d = QPlatformMediaIntegration::instance()->mediaDevices()->audioOutputDevice(format, audioDevice, parent); if (d) - connect(d, SIGNAL(stateChanged(QAudio::State)), SIGNAL(stateChanged(QAudio::State))); + connect(d, &QPlatformAudioSink::stateChanged, this, [this](QAudio::State state) { + // if the signal has been emitted from another thread, + // the state may be already changed by main one + if (state == d->state()) + emit stateChanged(state); + }); else qWarning() << ("No audio device detected"); } /*! + \fn bool QAudioSink::isNull() const + + Returns \c true is the QAudioSink instance is \c null, otherwise returns + \c false. +*/ + +/*! Destroys this audio output. This will release any system resources used and free any buffers. @@ -154,11 +131,11 @@ QAudioFormat QAudioSink::format() const \l{QIODevice::ReadWrite}{ReadWrite} modes. If the QAudioSink is able to successfully output audio data, state() returns - QAudio::ActiveState, error() returns QAudio::NoError + QtAudio::ActiveState, error() returns QtAudio::NoError and the stateChanged() signal is emitted. - If a problem occurs during this process, error() returns QAudio::OpenError, - state() returns QAudio::StoppedState and the stateChanged() signal is emitted. + If a problem occurs during this process, error() returns QtAudio::OpenError, + state() returns QtAudio::StoppedState and the stateChanged() signal is emitted. \sa QIODevice */ @@ -179,11 +156,11 @@ void QAudioSink::start(QIODevice* device) if you start another stream. If the QAudioSink is able to access the system's audio device, state() returns - QAudio::IdleState, error() returns QAudio::NoError + QtAudio::IdleState, error() returns QtAudio::NoError and the stateChanged() signal is emitted. - If a problem occurs during this process, error() returns QAudio::OpenError, - state() returns QAudio::StoppedState and the stateChanged() signal is emitted. + If a problem occurs during this process, error() returns QtAudio::OpenError, + state() returns QtAudio::StoppedState and the stateChanged() signal is emitted. \sa QIODevice */ @@ -198,7 +175,7 @@ QIODevice* QAudioSink::start() /*! Stops the audio output, detaching from the system resource. - Sets error() to QAudio::NoError, state() to QAudio::StoppedState and + Sets error() to QtAudio::NoError, state() to QtAudio::StoppedState and emit stateChanged() signal. */ void QAudioSink::stop() @@ -220,7 +197,7 @@ void QAudioSink::reset() /*! Stops processing audio data, preserving buffered audio data. - Sets error() to QAudio::NoError, state() to QAudio::SuspendedState and + Sets error() to QtAudio::NoError, state() to QtAudio::SuspendedState and emits stateChanged() signal. */ void QAudioSink::suspend() @@ -232,10 +209,9 @@ void QAudioSink::suspend() /*! Resumes processing audio data after a suspend(). - Sets error() to QAudio::NoError. - Sets state() to QAudio::ActiveState if you previously called start(QIODevice*). - Sets state() to QAudio::IdleState if you previously called start(). - emits stateChanged() signal. + Sets state() to the state the sink had when suspend() was called, and sets + error() to QAudioError::NoError. This function does nothing if the audio sink's + state is not QtAudio::SuspendedState. */ void QAudioSink::resume() { @@ -246,7 +222,7 @@ void QAudioSink::resume() /*! Returns the number of free bytes available in the audio buffer. - \note The returned value is only valid while in QAudio::ActiveState or QAudio::IdleState + \note The returned value is only valid while in QtAudio::ActiveState or QtAudio::IdleState state, otherwise returns zero. */ qsizetype QAudioSink::bytesFree() const @@ -303,7 +279,7 @@ qint64 QAudioSink::elapsedUSecs() const /*! Returns the error state. */ -QAudio::Error QAudioSink::error() const +QtAudio::Error QAudioSink::error() const { return d ? d->error() : QAudio::OpenError; } @@ -311,7 +287,7 @@ QAudio::Error QAudioSink::error() const /*! Returns the state of audio processing. */ -QAudio::State QAudioSink::state() const +QtAudio::State QAudioSink::state() const { return d ? d->state() : QAudio::StoppedState; } @@ -330,7 +306,7 @@ QAudio::State QAudioSink::state() const UI volume controls should usually be scaled non-linearly. For example, using a logarithmic scale will produce linear changes in perceived loudness, which is what a user would normally expect from a volume control. See - QAudio::convertVolume() for more details. + QtAudio::convertVolume() for more details. */ void QAudioSink::setVolume(qreal volume) { @@ -349,9 +325,13 @@ qreal QAudioSink::volume() const } /*! - \fn QAudioSink::stateChanged(QAudio::State state) + \fn QAudioSink::stateChanged(QtAudio::State state) This signal is emitted when the device \a state has changed. This is the current state of the audio output. + + \note The QtAudio namespace was named QAudio up to and including Qt 6.6. + String-based connections to this signal have to use \c{QAudio::State} as + the parameter type: \c{connect(source, SIGNAL(stateChanged(QAudio::State)), ...);} */ QT_END_NAMESPACE diff --git a/src/multimedia/audio/qaudiosink.h b/src/multimedia/audio/qaudiosink.h index 049011e98..e071e6fbc 100644 --- a/src/multimedia/audio/qaudiosink.h +++ b/src/multimedia/audio/qaudiosink.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 QAUDIOOUTPUT_H @@ -45,7 +9,7 @@ #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qaudio.h> +#include <QtMultimedia/qtaudio.h> #include <QtMultimedia/qaudioformat.h> #include <QtMultimedia/qaudiodevice.h> @@ -85,14 +49,19 @@ public: qint64 processedUSecs() const; qint64 elapsedUSecs() const; - QAudio::Error error() const; - QAudio::State state() const; + QtAudio::Error error() const; + QtAudio::State state() const; void setVolume(qreal); qreal volume() const; Q_SIGNALS: +#if defined(Q_QDOC) + void stateChanged(QtAudio::State state); +#else + // use QAudio here to keep string-based connections working void stateChanged(QAudio::State state); +#endif private: Q_DISABLE_COPY(QAudioSink) diff --git a/src/multimedia/audio/qaudiosource.cpp b/src/multimedia/audio/qaudiosource.cpp index 57af98b39..1ed5e82bc 100644 --- a/src/multimedia/audio/qaudiosource.cpp +++ b/src/multimedia/audio/qaudiosource.cpp @@ -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 #include "qaudio.h" @@ -89,7 +53,7 @@ QT_BEGIN_NAMESPACE At any point in time, QAudioSource will be in one of four states: active, suspended, stopped, or idle. These states are specified by - the QAudio::State enum. You can request a state change directly through + the QtAudio::State enum. You can request a state change directly through suspend(), resume(), stop(), reset(), and start(). The current state is reported by state(). QAudioSink will also signal you when the state changes (stateChanged()). @@ -102,8 +66,8 @@ QT_BEGIN_NAMESPACE which states the QAudioSource has been in. If an error should occur, you can fetch its reason with error(). - The possible error reasons are described by the QAudio::Error - enum. The QAudioSource will enter the \l{QAudio::}{StoppedState} when + The possible error reasons are described by the QtAudio::Error + enum. The QAudioSource will enter the \l{QtAudio::}{StoppedState} when an error is encountered. Connect to the stateChanged() signal to handle the error: @@ -132,15 +96,27 @@ QAudioSource::QAudioSource(const QAudioFormat &format, QObject *parent) QAudioSource::QAudioSource(const QAudioDevice &audioDevice, const QAudioFormat &format, QObject *parent): QObject(parent) { - d = QPlatformMediaDevices::instance()->audioInputDevice(format, audioDevice); - if (d) - connect(d, SIGNAL(stateChanged(QAudio::State)), SIGNAL(stateChanged(QAudio::State))); + d = QPlatformMediaIntegration::instance()->mediaDevices()->audioInputDevice(format, audioDevice, parent); + if (d) { + connect(d, &QPlatformAudioSource::stateChanged, this, [this](QAudio::State state) { + // if the signal has been emitted from another thread, + // the state may be already changed by main one + if (state == d->state()) + emit stateChanged(state); + }); + } else qWarning() << ("No audio device detected"); } /*! + \fn bool QAudioSource::isNull() const + + Returns \c true if the audio source is \c null, otherwise returns \c false. +*/ + +/*! Destroy this audio input. */ @@ -155,11 +131,11 @@ QAudioSource::~QAudioSource() \l{QIODevice::Append}{Append} or \l{QIODevice::ReadWrite}{ReadWrite} modes. If the QAudioSource is able to successfully get audio data, state() returns - either QAudio::ActiveState or QAudio::IdleState, error() returns QAudio::NoError + either QtAudio::ActiveState or QtAudio::IdleState, error() returns QtAudio::NoError and the stateChanged() signal is emitted. - If a problem occurs during this process, error() returns QAudio::OpenError, - state() returns QAudio::StoppedState and the stateChanged() signal is emitted. + If a problem occurs during this process, error() returns QtAudio::OpenError, + state() returns QtAudio::StoppedState and the stateChanged() signal is emitted. \sa QIODevice */ @@ -181,11 +157,11 @@ void QAudioSource::start(QIODevice* device) if you start another stream. If the QAudioSource is able to access the system's audio device, state() returns - QAudio::IdleState, error() returns QAudio::NoError + QtAudio::IdleState, error() returns QtAudio::NoError and the stateChanged() signal is emitted. - If a problem occurs during this process, error() returns QAudio::OpenError, - state() returns QAudio::StoppedState and the stateChanged() signal is emitted. + If a problem occurs during this process, error() returns QtAudio::OpenError, + state() returns QtAudio::StoppedState and the stateChanged() signal is emitted. \sa QIODevice */ @@ -210,7 +186,7 @@ QAudioFormat QAudioSource::format() const /*! Stops the audio input, detaching from the system resource. - Sets error() to QAudio::NoError, state() to QAudio::StoppedState and + Sets error() to QtAudio::NoError, state() to QtAudio::StoppedState and emit stateChanged() signal. */ @@ -233,7 +209,7 @@ void QAudioSource::reset() /*! Stops processing audio data, preserving buffered audio data. - Sets error() to QAudio::NoError, state() to QAudio::SuspendedState and + Sets error() to QtAudio::NoError, state() to QtAudio::SuspendedState and emit stateChanged() signal. */ @@ -246,9 +222,9 @@ void QAudioSource::suspend() /*! Resumes processing audio data after a suspend(). - Sets error() to QAudio::NoError. - Sets state() to QAudio::ActiveState if you previously called start(QIODevice*). - Sets state() to QAudio::IdleState if you previously called start(). + Sets error() to QtAudio::NoError. + Sets state() to QtAudio::ActiveState if you previously called start(QIODevice*). + Sets state() to QtAudio::IdleState if you previously called start(). emits stateChanged() signal. */ @@ -292,7 +268,7 @@ qsizetype QAudioSource::bufferSize() const /*! Returns the amount of audio data available to read in bytes. - Note: returned value is only valid while in QAudio::ActiveState or QAudio::IdleState + Note: returned value is only valid while in QtAudio::ActiveState or QtAudio::IdleState state, otherwise returns zero. */ @@ -364,7 +340,7 @@ qint64 QAudioSource::elapsedUSecs() const Returns the error state. */ -QAudio::Error QAudioSource::error() const +QtAudio::Error QAudioSource::error() const { return d ? d->error() : QAudio::OpenError; } @@ -373,14 +349,18 @@ QAudio::Error QAudioSource::error() const Returns the state of audio processing. */ -QAudio::State QAudioSource::state() const +QtAudio::State QAudioSource::state() const { return d ? d->state() : QAudio::StoppedState; } /*! - \fn QAudioSource::stateChanged(QAudio::State state) + \fn QAudioSource::stateChanged(QtAudio::State state) This signal is emitted when the device \a state has changed. + + \note The QtAudio namespace was named QAudio up to and including Qt 6.6. + String-based connections to this signal have to use \c{QAudio::State} as + the parameter type: \c{connect(source, SIGNAL(stateChanged(QAudio::State)), ...);} */ QT_END_NAMESPACE diff --git a/src/multimedia/audio/qaudiosource.h b/src/multimedia/audio/qaudiosource.h index 9c11b85d3..f0ad0ceb5 100644 --- a/src/multimedia/audio/qaudiosource.h +++ b/src/multimedia/audio/qaudiosource.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 QAUDIOINPUT_H @@ -45,7 +9,7 @@ #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qaudio.h> +#include <QtMultimedia/qtaudio.h> #include <QtMultimedia/qaudioformat.h> #include <QtMultimedia/qaudiodevice.h> @@ -86,11 +50,16 @@ public: qint64 processedUSecs() const; qint64 elapsedUSecs() const; - QAudio::Error error() const; - QAudio::State state() const; + QtAudio::Error error() const; + QtAudio::State state() const; Q_SIGNALS: +#if defined(Q_QDOC) + void stateChanged(QtAudio::State state); +#else + // use QAudio here to keep string-based connections working void stateChanged(QAudio::State state); +#endif private: Q_DISABLE_COPY(QAudioSource) diff --git a/src/multimedia/audio/qaudiostatemachine.cpp b/src/multimedia/audio/qaudiostatemachine.cpp new file mode 100644 index 000000000..2d42200e6 --- /dev/null +++ b/src/multimedia/audio/qaudiostatemachine.cpp @@ -0,0 +1,150 @@ +// Copyright (C) 2023 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 "qaudiostatemachine_p.h" +#include "qaudiosystem_p.h" +#include <qpointer.h> +#include <qdebug.h> + +QT_BEGIN_NAMESPACE + +using Notifier = QAudioStateMachine::Notifier; +using namespace AudioStateMachineUtils; + +QAudioStateMachine::QAudioStateMachine(QAudioStateChangeNotifier ¬ifier) : m_notifier(¬ifier) +{ +} + +QAudioStateMachine::~QAudioStateMachine() = default; + +QAudio::State QAudioStateMachine::state() const +{ + return toAudioState(m_state.load(std::memory_order_acquire)); +} + +QAudio::Error QAudioStateMachine::error() const +{ + return toAudioError(m_state.load(std::memory_order_acquire)); +} + +template <typename StatesChecker, typename NewState> +Notifier QAudioStateMachine::changeState(const StatesChecker &checker, const NewState &newState) +{ + if constexpr (std::is_same_v<RawState, NewState>) + return changeState(checker, [newState](RawState) { return newState; }); + else { + RawState prevState = m_state.load(std::memory_order_relaxed); + const auto exchanged = multipleCompareExchange(m_state, prevState, checker, newState); + + if (Q_LIKELY(exchanged)) + return { this, newState(prevState), prevState }; + + return {}; + } +} + +Notifier QAudioStateMachine::stop(QAudio::Error error, bool shouldDrain, bool forceUpdateError) +{ + auto statesChecker = + makeStatesChecker(QAudio::ActiveState, QAudio::IdleState, QAudio::SuspendedState, + forceUpdateError ? QAudio::StoppedState : QAudio::ActiveState); + + const auto state = toRawState(QAudio::StoppedState, error); + auto getNewState = [&](RawState prevState) { + const bool shouldAddFlag = shouldDrain && toAudioState(prevState) == QAudio::ActiveState; + return shouldAddFlag ? addDrainingFlag(state) : state; + }; + + return changeState(statesChecker, getNewState); +} + +Notifier QAudioStateMachine::start(bool active) +{ + return changeState(makeStatesChecker(QAudio::StoppedState), + toRawState(active ? QAudio::ActiveState : QAudio::IdleState)); +} + +bool QAudioStateMachine::isActiveOrIdle() const +{ + const auto state = this->state(); + return state == QAudio::ActiveState || state == QAudio::IdleState; +} + +bool QAudioStateMachine::onDrained() +{ + return changeState(isDrainingState, removeDrainingFlag); +} + +bool QAudioStateMachine::isDraining() const +{ + return isDrainingState(m_state.load(std::memory_order_acquire)); +} + +std::pair<bool, bool> QAudioStateMachine::getDrainedAndStopped() const +{ + const auto state = m_state.load(std::memory_order_acquire); + return { !isDrainingState(state), toAudioState(state) == QAudio::StoppedState }; +} + +Notifier QAudioStateMachine::suspend() +{ + // Due to the current documentation, we set QAudio::NoError. + // TBD: leave the previous error should be more reasonable (IgnoreError) + const auto error = QAudio::NoError; + auto result = changeState(makeStatesChecker(QAudio::ActiveState, QAudio::IdleState), + toRawState(QAudio::SuspendedState, error)); + + if (result) + m_suspendedInState = result.prevAudioState(); + + return result; +} + +Notifier QAudioStateMachine::resume() +{ + // Due to the current documentation, we set QAudio::NoError. + // TBD: leave the previous error should be more reasonable (IgnoreError) + const auto error = QAudio::NoError; + return changeState(makeStatesChecker(QAudio::SuspendedState), + toRawState(m_suspendedInState, error)); +} + +Notifier QAudioStateMachine::activateFromIdle() +{ + return changeState(makeStatesChecker(QAudio::IdleState), toRawState(QAudio::ActiveState)); +} + +Notifier QAudioStateMachine::updateActiveOrIdle(bool isActive, QAudio::Error error) +{ + const auto state = isActive ? QAudio::ActiveState : QAudio::IdleState; + return changeState(makeStatesChecker(QAudio::ActiveState, QAudio::IdleState), + toRawState(state, error)); +} + +Notifier QAudioStateMachine::setError(QAudio::Error error) +{ + auto fixState = [error](RawState prevState) { return setStateError(prevState, error); }; + return changeState([](RawState) { return true; }, fixState); +} + +Notifier QAudioStateMachine::forceSetState(QAudio::State state, QAudio::Error error) +{ + return changeState([](RawState) { return true; }, toRawState(state, error)); +} + +void QAudioStateMachine::reset(RawState state, RawState prevState) +{ + auto notifier = m_notifier; + + const auto audioState = toAudioState(state); + const auto audioError = toAudioError(state); + + if (toAudioState(prevState) != audioState && notifier) + emit notifier->stateChanged(audioState); + + // check the notifier in case the object was deleted in + if (toAudioError(prevState) != audioError && notifier) + emit notifier->errorChanged(audioError); +} + +QT_END_NAMESPACE diff --git a/src/multimedia/audio/qaudiostatemachine_p.h b/src/multimedia/audio/qaudiostatemachine_p.h new file mode 100644 index 000000000..385453020 --- /dev/null +++ b/src/multimedia/audio/qaudiostatemachine_p.h @@ -0,0 +1,149 @@ +// Copyright (C) 2023 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 QAUDIOSTATEMACHINE_P_H +#define QAUDIOSTATEMACHINE_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "qaudiostatemachineutils_p.h" + +#include <qpointer.h> +#include <atomic> + +QT_BEGIN_NAMESPACE + +class QAudioStateChangeNotifier; + +/* QAudioStateMachine provides an opportunity to + * toggle QAudio::State with QAudio::Error in + * a thread-safe manner. + * The toggling functions return a notifier, + * which notifies about the change via + * QAudioStateChangeNotifier::stateChanged and errorChanged. + * + * The state machine is supposed to be used mostly in + * QAudioSink and QAudioSource implementations. + */ +class Q_MULTIMEDIA_EXPORT QAudioStateMachine +{ +public: + using RawState = AudioStateMachineUtils::RawState; + class Notifier + { + public: + void reset() + { + if (auto stateMachine = std::exchange(m_stateMachine, nullptr)) + stateMachine->reset(m_state, m_prevState); + } + + ~Notifier() { reset(); } + + Notifier(const Notifier &) = delete; + Notifier(Notifier &&other) noexcept + : m_stateMachine(std::exchange(other.m_stateMachine, nullptr)), + m_state(other.m_state), + m_prevState(other.m_prevState) + { + } + + operator bool() const { return m_stateMachine != nullptr; } + + QAudio::State prevAudioState() const { return AudioStateMachineUtils::toAudioState(m_prevState); } + + QAudio::State audioState() const { return AudioStateMachineUtils::toAudioState(m_state); } + + bool isDraining() const { return AudioStateMachineUtils::isDrainingState(m_state); } + + bool isStateChanged() const { return prevAudioState() != audioState(); } + + private: + Notifier(QAudioStateMachine *stateMachine = nullptr, RawState state = QAudio::StoppedState, + RawState prevState = QAudio::StoppedState) + : m_stateMachine(stateMachine), m_state(state), m_prevState(prevState) + { + } + + private: + QAudioStateMachine *m_stateMachine; + RawState m_state; + const RawState m_prevState; + + friend class QAudioStateMachine; + }; + + QAudioStateMachine(QAudioStateChangeNotifier ¬ifier); + + ~QAudioStateMachine(); + + QAudio::State state() const; + + QAudio::Error error() const; + + bool isActiveOrIdle() const; + + bool isDraining() const; + + // atomicaly checks if the state is stopped and marked as drained + std::pair<bool, bool> getDrainedAndStopped() const; + + // Stopped[draining] -> Stopped + bool onDrained(); + + // Active/Idle/Suspended -> Stopped + // or Active -> Stopped[draining] for shouldDrain = true + Notifier stop(QAudio::Error error = QAudio::NoError, bool shouldDrain = false, + bool forceUpdateError = false); + + // Active/Idle/Suspended -> Stopped + Notifier stopOrUpdateError(QAudio::Error error = QAudio::NoError) + { + return stop(error, false, true); + } + + // Stopped -> Active/Idle + Notifier start(bool isActive = true); + + // Active/Idle -> Suspended + saves the exchanged state + Notifier suspend(); + + // Suspended -> saved state (Active/Idle) + Notifier resume(); + + // Idle -> Active + Notifier activateFromIdle(); + + // Active/Idle -> Active/Idle + updateError + Notifier updateActiveOrIdle(bool isActive, QAudio::Error error = QAudio::NoError); + + // Any -> Any; better use more strict methods + Notifier forceSetState(QAudio::State state, QAudio::Error error = QAudio::NoError); + + // force set the error + Notifier setError(QAudio::Error error); + +private: + template <typename StatesChecker, typename NewState> + Notifier changeState(const StatesChecker &statesChecker, const NewState &newState); + + void reset(RawState state, RawState prevState); + +private: + QPointer<QAudioStateChangeNotifier> m_notifier; + std::atomic<RawState> m_state = QAudio::StoppedState; + QAudio::State m_suspendedInState = QAudio::SuspendedState; +}; + +QT_END_NAMESPACE + +#endif // QAUDIOSTATEMACHINE_P_H diff --git a/src/multimedia/audio/qaudiostatemachineutils_p.h b/src/multimedia/audio/qaudiostatemachineutils_p.h new file mode 100644 index 000000000..f80517f77 --- /dev/null +++ b/src/multimedia/audio/qaudiostatemachineutils_p.h @@ -0,0 +1,96 @@ +// Copyright (C) 2023 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 QAUDIOSTATEMACHINEUTILS_P_H +#define QAUDIOSTATEMACHINEUTILS_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "qaudio.h" + +QT_BEGIN_NAMESPACE + +namespace AudioStateMachineUtils { + +using RawState = int; + +constexpr uint32_t AudioStateBitsCount = 8; +constexpr RawState AudioStateMask = 0xFF; +constexpr RawState AudioErrorMask = 0xFF00; +constexpr RawState DrainingFlag = 0x10000; + +static_assert(!(AudioStateMask & DrainingFlag) && !(AudioStateMask & AudioErrorMask) + && !(AudioErrorMask & DrainingFlag), + "Invalid masks"); + +constexpr bool isDrainingState(RawState state) +{ + return (state & DrainingFlag) != 0; +} + +constexpr RawState addDrainingFlag(RawState state) +{ + return state | DrainingFlag; +} + +constexpr RawState removeDrainingFlag(RawState state) +{ + return state & ~DrainingFlag; +} + +constexpr QAudio::State toAudioState(RawState state) +{ + return QAudio::State(state & AudioStateMask); +} + +constexpr QAudio::Error toAudioError(RawState state) +{ + return QAudio::Error((state & AudioErrorMask) >> AudioStateBitsCount); +} + +constexpr RawState toRawState(QAudio::State state, QAudio::Error error = QAudio::NoError) +{ + return state | (error << AudioStateBitsCount); +} + +constexpr RawState setStateError(RawState state, QAudio::Error error) +{ + return (error << AudioStateBitsCount) | (state & ~AudioErrorMask); +} + +template <typename... States> +constexpr auto makeStatesChecker(States... states) +{ + return [=](RawState state) { + state &= (AudioStateMask | DrainingFlag); + return (... || (state == states)); + }; +} + +// ensures compareExchange (testAndSet) operation with opportunity +// to check several states, can be considered as atomic +template <typename T, typename Predicate, typename NewValueGetter> +bool multipleCompareExchange(std::atomic<T> &target, T &prevValue, Predicate predicate, + NewValueGetter newValueGetter) +{ + while (predicate(prevValue)) + if (target.compare_exchange_strong(prevValue, newValueGetter(prevValue), + std::memory_order_acq_rel)) + return true; + + return false; +} +} // namespace AudioStateMachineUtils + +QT_END_NAMESPACE + +#endif // QAUDIOSTATEMACHINEUTILS_P_H diff --git a/src/multimedia/audio/qaudiosystem.cpp b/src/multimedia/audio/qaudiosystem.cpp index f1fd5bb30..355771f6b 100644 --- a/src/multimedia/audio/qaudiosystem.cpp +++ b/src/multimedia/audio/qaudiosystem.cpp @@ -1,254 +1,22 @@ -/**************************************************************************** -** -** 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) 2022 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 <private/qtmultimediaglobal_p.h> #include "qaudiosystem_p.h" -QT_BEGIN_NAMESPACE - -/*! - \class QPlatformAudioSink - \brief The QPlatformAudioSink class is a base class for audio backends. - - \ingroup multimedia - \inmodule QtMultimedia - - QPlatformAudioSink implements audio functionality for - QAudioSink, i.e., QAudioSink routes function calls to - QPlatformAudioSink. For a description of the functionality that - is implemented, see the QAudioSink class and function - descriptions. - - \sa QAudioSink -*/ - -/*! - \fn void QPlatformAudioSink::start(QIODevice* device) - Uses the \a device as the QIODevice to transfer data. -*/ - -/*! - \fn QIODevice* QPlatformAudioSink::start() - Returns a pointer to the QIODevice being used to handle - the data transfer. This QIODevice can be used to write() audio data directly. -*/ - -/*! - \fn void QPlatformAudioSink::stop() - Stops the audio output. -*/ - -/*! - \fn void QPlatformAudioSink::reset() - Drops all audio data in the buffers, resets buffers to zero. -*/ - -/*! - \fn void QPlatformAudioSink::suspend() - Stops processing audio data, preserving buffered audio data. -*/ - -/*! - \fn void QPlatformAudioSink::resume() - Resumes processing audio data after a suspend() -*/ - -/*! - \fn qsizetype QPlatformAudioSink::bytesFree() const - Returns the free space available in bytes in the audio buffer. -*/ - -/*! - \fn void QPlatformAudioSink::setBufferSize(qsizetype value) - Sets the audio buffer size to \a value in bytes. -*/ - -/*! - \fn qsizetype QPlatformAudioSink::bufferSize() const - Returns the audio buffer size in bytes. -*/ - -/*! - \fn qint64 QPlatformAudioSink::processedUSecs() const - Returns the amount of audio data processed since start() was called in milliseconds. -*/ - -/*! - \fn QAudio::Error QPlatformAudioSink::error() const - Returns the error state. -*/ - -/*! - \fn QAudio::State QPlatformAudioSink::state() const - Returns the state of audio processing. -*/ - -/*! - \fn void QPlatformAudioSink::setFormat(const QAudioFormat& fmt) - Set the QAudioFormat to use to \a fmt. - Setting the format is only allowable while in QAudio::StoppedState. -*/ - -/*! - \fn QAudioFormat QPlatformAudioSink::format() const - Returns the QAudioFormat being used. -*/ - -/*! - \fn void QPlatformAudioSink::setVolume(qreal volume) - Sets the volume. - Where \a volume is between 0.0 and 1.0. -*/ +#include <private/qplatformmediadevices_p.h> -/*! - \fn qreal QPlatformAudioSink::volume() const - Returns the volume in the range 0.0 and 1.0. -*/ - -/*! - \fn QPlatformAudioSink::errorChanged(QAudio::Error error) - This signal is emitted when the \a error state has changed. -*/ - -/*! - \fn QPlatformAudioSink::stateChanged(QAudio::State state) - This signal is emitted when the device \a state has changed. -*/ - -/*! - \class QPlatformAudioSource - \brief The QPlatformAudioSource class provides access for QAudioSource to access the audio - device provided by the plugin. - - \ingroup multimedia - \inmodule QtMultimedia - - QAudioDeviceInput keeps an instance of QPlatformAudioSource and - routes calls to functions of the same name to QPlatformAudioSource. - This means that it is QPlatformAudioSource that implements the - audio functionality. For a description of the functionality, see - the QAudioSource class description. - - \sa QAudioSource -*/ - -/*! - \fn void QPlatformAudioSource::start(QIODevice* device) - Uses the \a device as the QIODevice to transfer data. -*/ - -/*! - \fn QIODevice* QPlatformAudioSource::start() - Returns a pointer to the QIODevice being used to handle - the data transfer. This QIODevice can be used to read() audio data directly. -*/ - -/*! - \fn void QPlatformAudioSource::stop() - Stops the audio input. -*/ - -/*! - \fn void QPlatformAudioSource::reset() - Drops all audio data in the buffers, resets buffers to zero. -*/ - -/*! - \fn void QPlatformAudioSource::suspend() - Stops processing audio data, preserving buffered audio data. -*/ - -/*! - \fn void QPlatformAudioSource::resume() - Resumes processing audio data after a suspend(). -*/ - -/*! - \fn qsizetype QPlatformAudioSource::bytesReady() const - Returns the amount of audio data available to read in bytes. -*/ - -/*! - \fn void QPlatformAudioSource::setBufferSize(qsizetype value) - Sets the audio buffer size to \a value in milliseconds. -*/ - -/*! - \fn qsizetype QPlatformAudioSource::bufferSize() const - Returns the audio buffer size in milliseconds. -*/ - -/*! - \fn qint64 QPlatformAudioSource::processedUSecs() const - Returns the amount of audio data processed since start() was called in milliseconds. -*/ - -/*! - \fn QAudio::Error QPlatformAudioSource::error() const - Returns the error state. -*/ - -/*! - \fn QAudio::State QPlatformAudioSource::state() const - Returns the state of audio processing. -*/ +QT_BEGIN_NAMESPACE -/*! - \fn void QPlatformAudioSource::setFormat(const QAudioFormat& fmt) - Set the QAudioFormat to use to \a fmt. - Setting the format is only allowable while in QAudio::StoppedState. -*/ +QAudioStateChangeNotifier::QAudioStateChangeNotifier(QObject *parent) : QObject(parent) { } -/*! - \fn QAudioFormat QPlatformAudioSource::format() const - Returns the QAudioFormat being used -*/ +QPlatformAudioSink::QPlatformAudioSink(QObject *parent) : QAudioStateChangeNotifier(parent) { } -/*! - \fn QPlatformAudioSource::errorChanged(QAudio::Error error) - This signal is emitted when the \a error state has changed. -*/ +qreal QPlatformAudioSink::volume() const +{ + return 1.0; +} -/*! - \fn QPlatformAudioSource::stateChanged(QAudio::State state) - This signal is emitted when the device \a state has changed. -*/ +QPlatformAudioSource::QPlatformAudioSource(QObject *parent) : QAudioStateChangeNotifier(parent) { } QT_END_NAMESPACE diff --git a/src/multimedia/audio/qaudiosystem_p.h b/src/multimedia/audio/qaudiosystem_p.h index a01d5f8ca..4a0650e80 100644 --- a/src/multimedia/audio/qaudiosystem_p.h +++ b/src/multimedia/audio/qaudiosystem_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2022 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) 2022 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 QAUDIOSYSTEM_H #define QAUDIOSYSTEM_H @@ -64,11 +28,23 @@ QT_BEGIN_NAMESPACE class QIODevice; -class Q_MULTIMEDIA_EXPORT QPlatformAudioSink : public QObject +class Q_MULTIMEDIA_EXPORT QAudioStateChangeNotifier : public QObject +{ + Q_OBJECT +public: + QAudioStateChangeNotifier(QObject *parent = nullptr); + +signals: + void errorChanged(QAudio::Error error); + void stateChanged(QAudio::State state); +}; + +class Q_MULTIMEDIA_EXPORT QPlatformAudioSink : public QAudioStateChangeNotifier { Q_OBJECT public: + QPlatformAudioSink(QObject *parent); virtual void start(QIODevice *device) = 0; virtual QIODevice* start() = 0; virtual void stop() = 0; @@ -84,20 +60,17 @@ public: virtual void setFormat(const QAudioFormat& fmt) = 0; virtual QAudioFormat format() const = 0; virtual void setVolume(qreal) {} - virtual qreal volume() const { return 1.0; } + virtual qreal volume() const; QElapsedTimer elapsedTime; - -Q_SIGNALS: - void errorChanged(QAudio::Error error); - void stateChanged(QAudio::State state); }; -class Q_MULTIMEDIA_EXPORT QPlatformAudioSource : public QObject +class Q_MULTIMEDIA_EXPORT QPlatformAudioSource : public QAudioStateChangeNotifier { Q_OBJECT public: + QPlatformAudioSource(QObject *parent); virtual void start(QIODevice *device) = 0; virtual QIODevice* start() = 0; virtual void stop() = 0; @@ -116,10 +89,6 @@ public: virtual qreal volume() const = 0; QElapsedTimer elapsedTime; - -Q_SIGNALS: - void errorChanged(QAudio::Error error); - void stateChanged(QAudio::State state); }; QT_END_NAMESPACE diff --git a/src/multimedia/audio/qsamplecache_p.cpp b/src/multimedia/audio/qsamplecache_p.cpp index 7a069ff66..805ab534e 100644 --- a/src/multimedia/audio/qsamplecache_p.cpp +++ b/src/multimedia/audio/qsamplecache_p.cpp @@ -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 #include "qsamplecache_p.h" #include "qwavedecoder.h" @@ -47,7 +11,7 @@ #include <QtCore/QDebug> #include <QtCore/qloggingcategory.h> -Q_LOGGING_CATEGORY(qLcSampleCache, "qt.multimedia.samplecache") +Q_STATIC_LOGGING_CATEGORY(qLcSampleCache, "qt.multimedia.samplecache") #include <mutex> @@ -166,6 +130,7 @@ QSample* QSampleCache::requestSample(const QUrl& url) { //lock and add first to make sure live loadingThread will not be killed during this function call m_loadingMutex.lock(); + const bool needsThreadStart = m_loadingRefCount == 0; m_loadingRefCount++; m_loadingMutex.unlock(); @@ -174,11 +139,16 @@ QSample* QSampleCache::requestSample(const QUrl& url) QMap<QUrl, QSample*>::iterator it = m_samples.find(url); QSample* sample; if (it == m_samples.end()) { - if (!m_loadingThread.isRunning()) + if (needsThreadStart) { + // Previous thread might be finishing, need to wait for it. If not, this is a no-op. + m_loadingThread.wait(); m_loadingThread.start(); + } sample = new QSample(url, this); m_samples.insert(url, sample); +#if QT_CONFIG(thread) sample->moveToThread(&m_loadingThread); +#endif } else { sample = *it; } @@ -336,7 +306,9 @@ void QSample::addRef() // Called in loading thread void QSample::readSample() { +#if QT_CONFIG(thread) Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread")); +#endif QMutexLocker m(&m_mutex); qint64 read = m_waveDecoder->read(m_soundData.data() + m_sampleReadLength, qMin(m_waveDecoder->bytesAvailable(), @@ -353,7 +325,9 @@ void QSample::readSample() // Called in loading thread void QSample::decoderReady() { +#if QT_CONFIG(thread) Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread")); +#endif QMutexLocker m(&m_mutex); qCDebug(qLcSampleCache) << "QSample: decoder ready"; m_parent->refresh(m_waveDecoder->size()); @@ -379,21 +353,26 @@ QSample::State QSample::state() const // Essentially a second ctor, doesn't need locks (?) void QSample::load() { +#if QT_CONFIG(thread) Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread")); +#endif qCDebug(qLcSampleCache) << "QSample: load [" << m_url << "]"; - m_stream = m_parent->networkAccessManager().get(QNetworkRequest(m_url)); - connect(m_stream, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), SLOT(loadingError(QNetworkReply::NetworkError))); + QNetworkReply *reply = m_parent->networkAccessManager().get(QNetworkRequest(m_url)); + m_stream = reply; + connect(reply, &QNetworkReply::errorOccurred, this, &QSample::loadingError); m_waveDecoder = new QWaveDecoder(m_stream); - connect(m_waveDecoder, SIGNAL(formatKnown()), SLOT(decoderReady())); - connect(m_waveDecoder, SIGNAL(parsingError()), SLOT(decoderError())); - connect(m_waveDecoder, SIGNAL(readyRead()), SLOT(readSample())); + connect(m_waveDecoder, &QWaveDecoder::formatKnown, this, &QSample::decoderReady); + connect(m_waveDecoder, &QWaveDecoder::parsingError, this, &QSample::decoderError); + connect(m_waveDecoder, &QIODevice::readyRead, this, &QSample::readSample); m_waveDecoder->open(QIODevice::ReadOnly); } void QSample::loadingError(QNetworkReply::NetworkError errorCode) { +#if QT_CONFIG(thread) Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread")); +#endif QMutexLocker m(&m_mutex); qCDebug(qLcSampleCache) << "QSample: loading error" << errorCode; cleanup(); @@ -405,7 +384,9 @@ void QSample::loadingError(QNetworkReply::NetworkError errorCode) // Called in loading thread void QSample::decoderError() { +#if QT_CONFIG(thread) Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread")); +#endif QMutexLocker m(&m_mutex); qCDebug(qLcSampleCache) << "QSample: decoder error"; cleanup(); @@ -417,7 +398,9 @@ void QSample::decoderError() // Called in loading thread from decoder when sample is done. Locked already. void QSample::onReady() { +#if QT_CONFIG(thread) Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread")); +#endif m_audioFormat = m_waveDecoder->audioFormat(); qCDebug(qLcSampleCache) << "QSample: load ready format:" << m_audioFormat; cleanup(); diff --git a/src/multimedia/audio/qsamplecache_p.h b/src/multimedia/audio/qsamplecache_p.h index 2bebf5b3b..3ba0c420c 100644 --- a/src/multimedia/audio/qsamplecache_p.h +++ b/src/multimedia/audio/qsamplecache_p.h @@ -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 #ifndef QSAMPLECACHE_P_H #define QSAMPLECACHE_P_H diff --git a/src/multimedia/audio/qsoundeffect.cpp b/src/multimedia/audio/qsoundeffect.cpp index f0bc57520..c403648f9 100644 --- a/src/multimedia/audio/qsoundeffect.cpp +++ b/src/multimedia/audio/qsoundeffect.cpp @@ -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 #include <QtMultimedia/private/qtmultimediaglobal_p.h> #include "qsoundeffect.h" @@ -43,14 +7,39 @@ #include "qaudiodevice.h" #include "qaudiosink.h" #include "qmediadevices.h" +#include "qaudiobuffer.h" #include <QtCore/qloggingcategory.h> +#include <private/qplatformmediadevices_p.h> +#include <private/qplatformmediaintegration_p.h> +#include <private/qplatformaudioresampler_p.h> -Q_LOGGING_CATEGORY(qLcSoundEffect, "qt.multimedia.soundeffect") +Q_STATIC_LOGGING_CATEGORY(qLcSoundEffect, "qt.multimedia.soundeffect") QT_BEGIN_NAMESPACE Q_GLOBAL_STATIC(QSampleCache, sampleCache) +namespace +{ +struct AudioSinkDeleter +{ + void operator ()(QAudioSink* sink) const + { + sink->stop(); + // Investigate:should we just delete? + sink->deleteLater(); + } +}; + +struct SampleDeleter +{ + void operator ()(QSample* sample) const + { + sample->release(); + } +}; +} + class QSoundEffectPrivate : public QIODevice { public: @@ -62,13 +51,14 @@ public: qint64 size() const override { if (m_sample->state() != QSample::Ready) return 0; - return m_loopCount == QSoundEffect::Infinite ? 0 : m_loopCount * m_sample->data().size(); + return m_loopCount == QSoundEffect::Infinite ? 0 : m_loopCount * m_audioBuffer.byteCount(); } qint64 bytesAvailable() const override { if (m_sample->state() != QSample::Ready) return 0; - return m_loopCount == QSoundEffect::Infinite - ? std::numeric_limits<qint64>::max() : m_runningCount * m_sample->data().size() - m_offset; + if (m_loopCount == QSoundEffect::Infinite) + return std::numeric_limits<qint64>::max(); + return m_runningCount * m_audioBuffer.byteCount() - m_offset; } bool isSequential() const override { return m_loopCount == QSoundEffect::Infinite; @@ -92,9 +82,10 @@ public: int m_loopCount = 1; int m_runningCount = 0; bool m_playing = false; - QSoundEffect::Status m_status = QSoundEffect::Null; - QAudioSink *m_audioOutput = nullptr; - QSample *m_sample = nullptr; + QSoundEffect::Status m_status = QSoundEffect::Null; + std::unique_ptr<QAudioSink, AudioSinkDeleter> m_audioSink; + std::unique_ptr<QSample, SampleDeleter> m_sample; + QAudioBuffer m_audioBuffer; bool m_muted = false; float m_volume = 1.0; bool m_sampleReady = false; @@ -108,6 +99,8 @@ QSoundEffectPrivate::QSoundEffectPrivate(QSoundEffect *q, const QAudioDevice &au , m_audioDevice(audioDevice) { open(QIODevice::ReadOnly); + + QPlatformMediaIntegration::instance()->mediaDevices()->prepareAudio(); } void QSoundEffectPrivate::sampleReady() @@ -116,30 +109,67 @@ void QSoundEffectPrivate::sampleReady() return; qCDebug(qLcSoundEffect) << this << "sampleReady: sample size:" << m_sample->data().size(); - disconnect(m_sample, &QSample::error, this, &QSoundEffectPrivate::decoderError); - disconnect(m_sample, &QSample::ready, this, &QSoundEffectPrivate::sampleReady); - if (!m_audioOutput) { - m_audioOutput = new QAudioSink(m_audioDevice, m_sample->format()); - connect(m_audioOutput, &QAudioSink::stateChanged, this, &QSoundEffectPrivate::stateChanged); + disconnect(m_sample.get(), &QSample::error, this, &QSoundEffectPrivate::decoderError); + disconnect(m_sample.get(), &QSample::ready, this, &QSoundEffectPrivate::sampleReady); + if (!m_audioSink) { + const auto audioDevice = + m_audioDevice.isNull() ? QMediaDevices::defaultAudioOutput() : m_audioDevice; + + if (audioDevice.isNull()) { + // We are likely on a virtual machine, for example in CI + qCCritical(qLcSoundEffect) << "Failed to play sound. No audio devices present."; + setStatus(QSoundEffect::Error); + return; + } + + const auto &sampleFormat = m_sample->format(); + const auto sampleChannelConfig = + sampleFormat.channelConfig() == QAudioFormat::ChannelConfigUnknown + ? QAudioFormat::defaultChannelConfigForChannelCount(sampleFormat.channelCount()) + : sampleFormat.channelConfig(); + + if (sampleChannelConfig != audioDevice.channelConfiguration() + && audioDevice.channelConfiguration() != QAudioFormat::ChannelConfigUnknown) { + qCDebug(qLcSoundEffect) << "Create resampler for channels mapping: config" + << sampleFormat.channelConfig() << "=> config" + << audioDevice.channelConfiguration(); + auto outputFormat = sampleFormat; + outputFormat.setChannelConfig(audioDevice.channelConfiguration()); + + const auto resampler = QPlatformMediaIntegration::instance()->createAudioResampler( + m_sample->format(), outputFormat); + if (resampler) + m_audioBuffer = resampler.value()->resample(m_sample->data().constData(), + m_sample->data().size()); + else + qCDebug(qLcSoundEffect) << "Cannot create resampler for channels mapping"; + } + + if (!m_audioBuffer.isValid()) + m_audioBuffer = QAudioBuffer(m_sample->data(), m_sample->format()); + + m_audioSink.reset(new QAudioSink(audioDevice, m_audioBuffer.format())); + + connect(m_audioSink.get(), &QAudioSink::stateChanged, this, &QSoundEffectPrivate::stateChanged); if (!m_muted) - m_audioOutput->setVolume(m_volume); + m_audioSink->setVolume(m_volume); else - m_audioOutput->setVolume(0); + m_audioSink->setVolume(0); } m_sampleReady = true; setStatus(QSoundEffect::Ready); - if (m_playing && m_audioOutput->state() == QAudio::StoppedState) { + if (m_playing && m_audioSink->state() == QAudio::StoppedState) { qCDebug(qLcSoundEffect) << this << "starting playback on audiooutput"; - m_audioOutput->start(this); + m_audioSink->start(this); } } void QSoundEffectPrivate::decoderError() { qWarning("QSoundEffect(qaudio): Error decoding source %ls", qUtf16Printable(m_url.toString())); - disconnect(m_sample, &QSample::ready, this, &QSoundEffectPrivate::sampleReady); - disconnect(m_sample, &QSample::error, this, &QSoundEffectPrivate::decoderError); + disconnect(m_sample.get(), &QSample::ready, this, &QSoundEffectPrivate::sampleReady); + disconnect(m_sample.get(), &QSample::error, this, &QSoundEffectPrivate::decoderError); m_playing = false; setStatus(QSoundEffect::Error); } @@ -148,7 +178,7 @@ void QSoundEffectPrivate::stateChanged(QAudio::State state) { qCDebug(qLcSoundEffect) << this << "stateChanged " << state; if ((state == QAudio::IdleState && m_runningCount == 0) || state == QAudio::StoppedState) - emit q_ptr->stop(); + q_ptr->stop(); } qint64 QSoundEffectPrivate::readData(char *data, qint64 len) @@ -163,8 +193,8 @@ qint64 QSoundEffectPrivate::readData(char *data, qint64 len) qint64 bytesWritten = 0; - const int sampleSize = m_sample->data().size(); - const char* sampleData = m_sample->data().constData(); + const int sampleSize = m_audioBuffer.byteCount(); + const char *sampleData = m_audioBuffer.constData<char>(); while (len && m_runningCount) { int toWrite = qMin(sampleSize - m_offset, len); @@ -214,8 +244,8 @@ void QSoundEffectPrivate::setStatus(QSoundEffect::Status status) void QSoundEffectPrivate::setPlaying(bool playing) { qCDebug(qLcSoundEffect) << this << "setPlaying(" << playing << ")" << m_playing; - if (m_audioOutput) { - m_audioOutput->stop(); + if (m_audioSink) { + m_audioSink->stop(); if (playing && !m_sampleReady) return; } @@ -224,8 +254,8 @@ void QSoundEffectPrivate::setPlaying(bool playing) return; m_playing = playing; - if (m_audioOutput && playing) - m_audioOutput->start(this); + if (m_audioSink && playing) + m_audioSink->start(this); emit q_ptr->playingChanged(); } @@ -316,11 +346,8 @@ QSoundEffect::QSoundEffect(const QAudioDevice &audioDevice, QObject *parent) QSoundEffect::~QSoundEffect() { stop(); - if (d->m_audioOutput) { - d->m_audioOutput->stop(); - d->m_audioOutput->deleteLater(); - d->m_sample->release(); - } + d->m_audioSink.reset(); + d->m_sample.reset(); delete d; } @@ -391,24 +418,21 @@ void QSoundEffect::setSource(const QUrl &url) if (d->m_sample) { if (!d->m_sampleReady) { - QObject::disconnect(d->m_sample, &QSample::error, d, &QSoundEffectPrivate::decoderError); - QObject::disconnect(d->m_sample, &QSample::ready, d, &QSoundEffectPrivate::sampleReady); + disconnect(d->m_sample.get(), &QSample::error, d, &QSoundEffectPrivate::decoderError); + disconnect(d->m_sample.get(), &QSample::ready, d, &QSoundEffectPrivate::sampleReady); } - d->m_sample->release(); - d->m_sample = nullptr; + d->m_sample.reset(); } - if (d->m_audioOutput) { - QObject::disconnect(d->m_audioOutput, &QAudioSink::stateChanged, d, &QSoundEffectPrivate::stateChanged); - d->m_audioOutput->stop(); - d->m_audioOutput->deleteLater(); - d->m_audioOutput = nullptr; + if (d->m_audioSink) { + disconnect(d->m_audioSink.get(), &QAudioSink::stateChanged, d, &QSoundEffectPrivate::stateChanged); + d->m_audioSink.reset(); } d->setStatus(QSoundEffect::Loading); - d->m_sample = sampleCache()->requestSample(url); - QObject::connect(d->m_sample, &QSample::error, d, &QSoundEffectPrivate::decoderError); - QObject::connect(d->m_sample, &QSample::ready, d, &QSoundEffectPrivate::sampleReady); + d->m_sample.reset(sampleCache()->requestSample(url)); + connect(d->m_sample.get(), &QSample::error, d, &QSoundEffectPrivate::decoderError); + connect(d->m_sample.get(), &QSample::ready, d, &QSoundEffectPrivate::sampleReady); switch (d->m_sample->state()) { case QSample::Ready: @@ -486,6 +510,11 @@ void QSoundEffect::setLoopCount(int loopCount) emit loopCountChanged(); } +/*! + \property QSoundEffect::audioDevice + + Returns the QAudioDevice instance. +*/ QAudioDevice QSoundEffect::audioDevice() { return d->m_audioDevice; @@ -530,7 +559,7 @@ int QSoundEffect::loopsRemaining() const UI volume controls should usually be scaled non-linearly. For example, using a logarithmic scale will produce linear changes in perceived loudness, which is what a user would normally expect - from a volume control. See \l {QAudio::convertVolume()}{convertVolume()} + from a volume control. See \l {QtAudio::convertVolume()}{convertVolume()} for more details. */ /*! @@ -544,8 +573,8 @@ int QSoundEffect::loopsRemaining() const */ float QSoundEffect::volume() const { - if (d->m_audioOutput && !d->m_muted) - return d->m_audioOutput->volume(); + if (d->m_audioSink && !d->m_muted) + return d->m_audioSink->volume(); return d->m_volume; } @@ -560,7 +589,7 @@ float QSoundEffect::volume() const UI volume controls should usually be scaled non-linearly. For example, using a logarithmic scale will produce linear changes in perceived loudness, which is what a user would normally expect - from a volume control. See QAudio::convertVolume() for more details. + from a volume control. See QtAudio::convertVolume() for more details. */ void QSoundEffect::setVolume(float volume) { @@ -570,8 +599,8 @@ void QSoundEffect::setVolume(float volume) d->m_volume = volume; - if (d->m_audioOutput && !d->m_muted) - d->m_audioOutput->setVolume(volume); + if (d->m_audioSink && !d->m_muted) + d->m_audioSink->setVolume(volume); emit volumeChanged(); } @@ -606,10 +635,10 @@ void QSoundEffect::setMuted(bool muted) if (d->m_muted == muted) return; - if (muted && d->m_audioOutput) - d->m_audioOutput->setVolume(0); - else if (!muted && d->m_audioOutput && d->m_muted) - d->m_audioOutput->setVolume(d->m_volume); + if (muted && d->m_audioSink) + d->m_audioSink->setVolume(0); + else if (!muted && d->m_audioSink && d->m_muted) + d->m_audioSink->setVolume(d->m_volume); d->m_muted = muted; emit mutedChanged(); diff --git a/src/multimedia/audio/qsoundeffect.h b/src/multimedia/audio/qsoundeffect.h index 5b806b382..eeafc4c9f 100644 --- a/src/multimedia/audio/qsoundeffect.h +++ b/src/multimedia/audio/qsoundeffect.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 QSOUNDEFFECT_H #define QSOUNDEFFECT_H diff --git a/src/multimedia/audio/qaudio.cpp b/src/multimedia/audio/qtaudio.cpp index 2898868a9..fb14e5093 100644 --- a/src/multimedia/audio/qaudio.cpp +++ b/src/multimedia/audio/qtaudio.cpp @@ -1,44 +1,8 @@ -/**************************************************************************** -** -** 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) 2024 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 <qaudio.h> +#include <qtaudio.h> #include <qmath.h> #include <QDebug> @@ -47,16 +11,16 @@ QT_BEGIN_NAMESPACE #define LOG100 4.60517018599 /*! - \namespace QAudio + \namespace QtAudio \ingroup multimedia-namespaces - \brief The QAudio namespace contains enums used by the audio classes. + \brief The QtAudio namespace contains enums used by the audio classes. \inmodule QtMultimedia \ingroup multimedia \ingroup multimedia_audio */ /*! - \enum QAudio::Error + \enum QtAudio::Error \value NoError No errors have occurred \value OpenError An error occurred opening the audio device @@ -66,7 +30,7 @@ QT_BEGIN_NAMESPACE */ /*! - \enum QAudio::State + \enum QtAudio::State \value ActiveState Audio data is being processed, this state is set after start() is called and while audio data is available to be processed. @@ -80,7 +44,7 @@ QT_BEGIN_NAMESPACE */ /*! - \enum QAudio::VolumeScale + \enum QtAudio::VolumeScale This enum defines the different audio volume scales. @@ -95,11 +59,14 @@ QT_BEGIN_NAMESPACE \value DecibelVolumeScale Decibel (dB, amplitude) logarithmic scale. \c -200 is silence and \c 0 is full volume. - \since 5.8 - \sa QAudio::convertVolume() + \sa QtAudio::convertVolume() */ +#if defined(Q_QDOC) +namespace QtAudio +#else namespace QAudio +#endif { /*! @@ -120,7 +87,6 @@ namespace QAudio \snippet multimedia-snippets/audio.cpp Volume conversion - \since 5.8 \sa VolumeScale, QAudioSink::setVolume(), QAudioSource::setVolume(), QSoundEffect::setVolume() */ diff --git a/src/multimedia/audio/qtaudio.h b/src/multimedia/audio/qtaudio.h new file mode 100644 index 000000000..6f6e0e668 --- /dev/null +++ b/src/multimedia/audio/qtaudio.h @@ -0,0 +1,18 @@ +// Copyright (C) 2024 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 QTAUDIO_H +#define QTAUDIO_H + +#if 0 +#pragma qt_class(QtAudio) +#endif + +#include <QtMultimedia/qaudio.h> + +QT_BEGIN_NAMESPACE + +QT_END_NAMESPACE + +#endif // QTAUDIO_H diff --git a/src/multimedia/audio/qwavedecoder.cpp b/src/multimedia/audio/qwavedecoder.cpp index 8d6173443..452363ddc 100644 --- a/src/multimedia/audio/qwavedecoder.cpp +++ b/src/multimedia/audio/qwavedecoder.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 "qwavedecoder.h" @@ -92,7 +56,7 @@ bool QWaveDecoder::open(QIODevice::OpenMode mode) if (canOpen && enoughDataAvailable()) handleData(); else - connect(device, SIGNAL(readyRead()), SLOT(handleData())); + connect(device, &QIODevice::readyRead, this, &QWaveDecoder::handleData); return canOpen; } @@ -127,6 +91,10 @@ qint64 QWaveDecoder::pos() const return device->pos(); } +void QWaveDecoder::setIODevice(QIODevice * /* device */) +{ +} + QAudioFormat QWaveDecoder::audioFormat() const { return format; @@ -175,7 +143,8 @@ qint64 QWaveDecoder::headerLength() qint64 QWaveDecoder::readData(char *data, qint64 maxlen) { - if (!haveFormat || format.bytesPerSample() == 0) + const int bytesPerSample = format.bytesPerSample(); + if (!haveFormat || bytesPerSample == 0) return 0; if (bps == 24) { @@ -199,15 +168,15 @@ qint64 QWaveDecoder::readData(char *data, qint64 maxlen) return l; } - qint64 nSamples = maxlen / format.bytesPerSample(); - maxlen = nSamples * format.bytesPerSample(); + qint64 nSamples = maxlen / bytesPerSample; + maxlen = nSamples * bytesPerSample; int read = device->read(data, maxlen); if (!byteSwap || format.bytesPerFrame() == 1) return read; - nSamples = read / format.bytesPerSample(); - switch (format.bytesPerSample()) { + nSamples = read / bytesPerSample; + switch (bytesPerSample) { case 2: bswap2(data, nSamples); break; @@ -305,7 +274,7 @@ bool QWaveDecoder::writeDataLength() void QWaveDecoder::parsingFailed() { Q_ASSERT(device); - device->disconnect(SIGNAL(readyRead()), this, SLOT(handleData())); + disconnect(device, &QIODevice::readyRead, this, &QWaveDecoder::handleData); emit parsingError(); } @@ -408,8 +377,8 @@ void QWaveDecoder::handleData() } format.setSampleFormat(fmt); - format.setSampleRate(/*qFromBigEndian<quint32>*/(wave.sampleRate)); - format.setChannelCount(/*qFromBigEndian<quint16>*/(wave.numChannels)); + format.setSampleRate(rate); + format.setChannelCount(channels); state = QWaveDecoder::WaitingForDataState; } @@ -417,7 +386,7 @@ void QWaveDecoder::handleData() if (state == QWaveDecoder::WaitingForDataState) { if (findChunk("data")) { - device->disconnect(SIGNAL(readyRead()), this, SLOT(handleData())); + disconnect(device, &QIODevice::readyRead, this, &QWaveDecoder::handleData); chunk descriptor; device->read(reinterpret_cast<char *>(&descriptor), sizeof(chunk)); @@ -431,7 +400,7 @@ void QWaveDecoder::handleData() dataSize = device->size() - headerLength(); haveFormat = true; - connect(device, SIGNAL(readyRead()), SIGNAL(readyRead())); + connect(device, &QIODevice::readyRead, this, &QIODevice::readyRead); emit formatKnown(); return; @@ -474,9 +443,15 @@ bool QWaveDecoder::findChunk(const char *chunkId) if (qstrncmp(descriptor.id, chunkId, 4) == 0) return true; + // A program reading a RIFF file can skip over any chunk whose chunk + // ID it doesn't recognize; it simply skips the number of bytes specified + // by ckSize plus the pad byte, if present. See Multimedia Programming + // Interface and Data Specifications 1.0. IBM / Microsoft. August 1991. pp. 10-11. + const quint32 sizeWithPad = descriptor.size + (descriptor.size & 1); + // It's possible that bytes->available() is less than the chunk size // if it's corrupt. - junkToSkip = qint64(sizeof(chunk) + descriptor.size); + junkToSkip = qint64(sizeof(chunk) + sizeWithPad); // Skip the current amount if (junkToSkip > 0) diff --git a/src/multimedia/audio/qwavedecoder.h b/src/multimedia/audio/qwavedecoder.h index ab6e49ab8..a96e731db 100644 --- a/src/multimedia/audio/qwavedecoder.h +++ b/src/multimedia/audio/qwavedecoder.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 WAVEDECODER_H #define WAVEDECODER_H @@ -98,9 +62,11 @@ private: struct chunk { - char id[4]; - quint32 size; + char id[4]; // A four-character code that identifies the representation of the chunk data + // padded on the right with blank characters (ASCII 32) + quint32 size; // Does not include the size of the id or size fields or the pad byte at the end of payload }; + bool peekChunk(chunk* pChunk, bool handleEndianness = true); struct RIFFHeader diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp index 60b2d99ea..9cfbcc01d 100644 --- a/src/multimedia/camera/qcamera.cpp +++ b/src/multimedia/camera/qcamera.cpp @@ -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 #include "qcamera_p.h" @@ -188,34 +152,23 @@ QT_BEGIN_NAMESPACE See the \l{Camera Overview}{camera overview} for more information. */ - -void QCameraPrivate::_q_error(int error, const QString &errorString) -{ - Q_Q(QCamera); - - this->error = QCamera::Error(error); - this->errorString = errorString; - - emit q->errorChanged(); - emit q->errorOccurred(this->error, errorString); -} - void QCameraPrivate::init(const QCameraDevice &device) { Q_Q(QCamera); - control = QPlatformMediaIntegration::instance()->createCamera(q); - if (!control) { - _q_error(QCamera::CameraError, QString::fromUtf8("Camera not supported")); + auto maybeControl = QPlatformMediaIntegration::instance()->createCamera(q); + if (!maybeControl) { + qWarning() << "Failed to initialize QCamera" << maybeControl.error(); return; } - + control = maybeControl.value(); cameraDevice = !device.isNull() ? device : QMediaDevices::defaultVideoInput(); if (cameraDevice.isNull()) - _q_error(QCamera::CameraError, QString::fromUtf8("No camera detected")); + control->updateError(QCamera::CameraError, QStringLiteral("No camera detected")); control->setCamera(cameraDevice); - q->connect(control, SIGNAL(activeChanged(bool)), q, SIGNAL(activeChanged(bool))); - q->connect(control, SIGNAL(error(int,QString)), q, SLOT(_q_error(int,QString))); + q->connect(control, &QPlatformVideoSource::activeChanged, q, &QCamera::activeChanged); + q->connect(control, &QPlatformCamera::errorChanged, q, &QCamera::errorChanged); + q->connect(control, &QPlatformCamera::errorOccurred, q, &QCamera::errorOccurred); } /*! @@ -279,7 +232,6 @@ QCamera::~QCamera() Q_D(QCamera); if (d->captureSession) d->captureSession->setCamera(nullptr); - Q_ASSERT(!d->captureSession); } /*! @@ -329,12 +281,16 @@ void QCamera::setActive(bool active) */ /*! + \property QCamera::error + Returns the error state of the camera. */ QCamera::Error QCamera::error() const { - return d_func()->error; + Q_D(const QCamera); + + return d->control ? d->control->error() : QCamera::CameraError; } /*! @@ -344,11 +300,16 @@ QCamera::Error QCamera::error() const */ /*! + \property QCamera::errorString + Returns a human readable string describing a camera's error state. */ QString QCamera::errorString() const { - return d_func()->errorString; + Q_D(const QCamera); + + return d->control ? d->control->errorString() + : QStringLiteral("Camera is not supported on the platform"); } /*! \enum QCamera::Feature @@ -378,6 +339,8 @@ QString QCamera::errorString() const */ /*! + \property QCamera::supportedFeatures + Returns the features supported by this camera. \sa QCamera::Feature @@ -449,12 +412,14 @@ QPlatformCamera *QCamera::platformCamera() return d->control; } -/*! \qmlproperty CameraDevice QtMultimedia::Camera::cameraDevice +/*! \qmlproperty cameraDevice QtMultimedia::Camera::cameraDevice Gets or sets the currently active camera device. */ /*! + \property QCamera::cameraDevice + Returns the QCameraDevice object associated with this camera. */ QCameraDevice QCamera::cameraDevice() const @@ -483,16 +448,28 @@ void QCamera::setCameraDevice(const QCameraDevice &cameraDevice) setCameraFormat({}); } -/*! \qmlproperty CameraDevice QtMultimedia::Camera::cameraFormat +/*! \qmlproperty cameraFormat QtMultimedia::Camera::cameraFormat Gets or sets the currently active camera format. - \sa CameraDevice::videoFormats + \note When using the FFMPEG backend on an Android target device if you request + \b YUV420P format, you will receive either a fully planar 4:2:0 YUV420P or a + semi-planar NV12/NV21. This depends on the codec implemented by the device + OEM. + + \sa cameraDevice::videoFormats */ /*! + \property QCamera::cameraFormat + Returns the camera format currently used by the camera. + \note When using the FFMPEG backend on an Android target device if you request + \b YUV420P format, you will receive either a fully planar 4:2:0 YUV420P or a + semi-planar NV12/NV21. This depends on the codec implemented by the device + OEM. + \sa QCameraDevice::videoFormats */ QCameraFormat QCamera::cameraFormat() const @@ -502,8 +479,13 @@ QCameraFormat QCamera::cameraFormat() const } /*! - Tells the camera to use the format desribed by \a format. This can be used to define - as specific resolution and frame rate to be used for recording and image capture. + Tells the camera to use the format described by \a format. This can be used to define + a specific resolution and frame rate to be used for recording and image capture. + + \note When using the FFMPEG backend on an Android target device if you request + \b YUV420P format, you will receive either a fully planar 4:2:0 YUV420P or a + semi-planar NV12/NV21. This depends on the codec implemented by the device + OEM. */ void QCamera::setCameraFormat(const QCameraFormat &format) { @@ -578,6 +560,11 @@ QCamera::FocusMode QCamera::focusMode() const return d->control ? d->control->focusMode() : QCamera::FocusModeAuto; } +/*! + \fn void QCamera::focusModeChanged() + + Signals when the focusMode changes. +*/ void QCamera::setFocusMode(QCamera::FocusMode mode) { Q_D(QCamera); @@ -608,6 +595,8 @@ bool QCamera::isFocusModeSupported(FocusMode mode) const */ /*! + \property QCamera::focusPoint + Returns the point currently used by the auto focus system to focus onto. */ QPointF QCamera::focusPoint() const @@ -650,20 +639,19 @@ QPointF QCamera::customFocusPoint() const void QCamera::setCustomFocusPoint(const QPointF &point) { Q_D(QCamera); - if (!d->control) - return; - d->control->setCustomFocusPoint(point); + if (d->control) + d->control->setCustomFocusPoint(point); } /*! - \qmlproperty float QCamera::focusDistance + \qmlproperty float QtMultimedia::Camera::focusDistance This property return an approximate focus distance of the camera. The value reported is between 0 and 1, 0 being the closest possible focus distance, 1 being as far away as possible. Note that 1 is often, but not always infinity. Setting the focus distance will be ignored unless the focus mode is set to - \l FocusModeManual. + \l {focusMode}{FocusModeManual}. */ /*! @@ -700,6 +688,8 @@ float QCamera::focusDistance() const /*! + \property QCamera::maximumZoomFactor + Returns the maximum zoom factor. This will be \c 1.0 on cameras that do not support zooming. @@ -708,7 +698,7 @@ float QCamera::focusDistance() const float QCamera::maximumZoomFactor() const { Q_D(const QCamera); - return d->control ? d->control->maxZoomFactor() : 1.; + return d->control ? d->control->maxZoomFactor() : 1.f; } /*! @@ -720,6 +710,8 @@ float QCamera::maximumZoomFactor() const */ /*! + \property QCamera::minimumZoomFactor + Returns the minimum zoom factor. This will be \c 1.0 on cameras that do not support zooming. @@ -728,7 +720,7 @@ float QCamera::maximumZoomFactor() const float QCamera::minimumZoomFactor() const { Q_D(const QCamera); - return d->control ? d->control->minZoomFactor() : 1.; + return d->control ? d->control->minZoomFactor() : 1.f; } /*! @@ -748,14 +740,14 @@ float QCamera::minimumZoomFactor() const float QCamera::zoomFactor() const { Q_D(const QCamera); - return d->control ? d->control->zoomFactor() : 1.; + return d->control ? d->control->zoomFactor() : 1.f; } /*! Zooms to a zoom factor \a factor at a rate of 1 factor per second. */ void QCamera::setZoomFactor(float factor) { - zoomTo(factor, 0.); + zoomTo(factor, 0.f); } /*! @@ -781,9 +773,9 @@ void QCamera::setZoomFactor(float factor) */ void QCamera::zoomTo(float factor, float rate) { - Q_ASSERT(rate >= 0.); - if (rate < 0.) - rate = 0.; + Q_ASSERT(rate >= 0.f); + if (rate < 0.f) + rate = 0.f; Q_D(QCamera); if (!d->control) @@ -806,11 +798,15 @@ void QCamera::zoomTo(float factor, float rate) */ /*! - \qmlproperty Camera::FlashMode QtMultimedia::Camera::flashMode + \qmlproperty enumeration QtMultimedia::Camera::flashMode Gets or sets a certain flash mode if the camera has a flash. - \sa QCamera::FlashMode, Camera::isFlashModeSupported, Camera::isFlashReady + \value Camera.FlashOff Flash is Off. + \value Camera.FlashOn Flash is On. + \value Camera.FlashAuto Automatic flash. + + \sa isFlashModeSupported, isFlashReady */ /*! @@ -952,14 +948,11 @@ void QCamera::setExposureMode(QCamera::ExposureMode mode) bool QCamera::isExposureModeSupported(QCamera::ExposureMode mode) const { Q_D(const QCamera); - if (!d->control) - return false; - - return d->control->isExposureModeSupported(mode); + return d->control && d->control->isExposureModeSupported(mode); } /*! - \qmlproperty real QCamera::exposureCompensation + \qmlproperty real QtMultimedia::Camera::exposureCompensation Gets or sets the exposure compensation in EV units. @@ -977,7 +970,7 @@ bool QCamera::isExposureModeSupported(QCamera::ExposureMode mode) const float QCamera::exposureCompensation() const { Q_D(const QCamera); - return d->control ? d->control->exposureCompensation() : 0.; + return d->control ? d->control->exposureCompensation() : 0.f; } void QCamera::setExposureCompensation(float ev) @@ -1075,7 +1068,7 @@ int QCamera::maximumIsoSensitivity() const float QCamera::minimumExposureTime() const { Q_D(const QCamera); - return d->control ? d->control->minExposureTime() : -1.; + return d->control ? d->control->minExposureTime() : -1.f; } /*! @@ -1084,7 +1077,7 @@ float QCamera::minimumExposureTime() const float QCamera::maximumExposureTime() const { Q_D(const QCamera); - return d->control ? d->control->maxExposureTime() : -1.; + return d->control ? d->control->maxExposureTime() : -1.f; } /*! @@ -1127,6 +1120,8 @@ float QCamera::exposureTime() const */ /*! + \property QCamera::manualExposureTime + Set the manual exposure time to \a seconds */ @@ -1235,6 +1230,8 @@ void QCamera::setAutoExposureTime() */ /*! + \property QCamera::whiteBalanceMode + Returns the white balance mode being used. */ QCamera::WhiteBalanceMode QCamera::whiteBalanceMode() const @@ -1270,9 +1267,7 @@ void QCamera::setWhiteBalanceMode(QCamera::WhiteBalanceMode mode) bool QCamera::isWhiteBalanceModeSupported(QCamera::WhiteBalanceMode mode) const { Q_D(const QCamera); - if (!d->control) - return false; - return d->control->isWhiteBalanceModeSupported(mode); + return d->control && d->control->isWhiteBalanceModeSupported(mode); } /*! @@ -1287,6 +1282,8 @@ bool QCamera::isWhiteBalanceModeSupported(QCamera::WhiteBalanceMode mode) const */ /*! + \property QCamera::colorTemperature + Returns the current color temperature if the current white balance mode is \c WhiteBalanceManual. For other modes the return value is undefined. @@ -1339,6 +1336,22 @@ void QCamera::setColorTemperature(int colorTemperature) \value WhiteBalanceSunset Sunset white balance mode. */ +/*! + \fn void QCamera::brightnessChanged() + \internal +*/ +/*! + \fn void QCamera::contrastChanged() + \internal +*/ +/*! + \fn void QCamera::hueChanged() + \internal +*/ +/*! + \fn void QCamera::saturationChanged() + \internal +*/ QT_END_NAMESPACE #include "moc_qcamera.cpp" diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h index 735bdc77a..ce7e83427 100644 --- a/src/multimedia/camera/qcamera.h +++ b/src/multimedia/camera/qcamera.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 QCAMERA_H #define QCAMERA_H @@ -70,7 +34,7 @@ class Q_MULTIMEDIA_EXPORT QCamera : public QObject Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged) Q_PROPERTY(QCameraFormat cameraFormat READ cameraFormat WRITE setCameraFormat NOTIFY cameraFormatChanged) - Q_PROPERTY(FocusMode focusMode READ focusMode WRITE setFocusMode) + Q_PROPERTY(FocusMode focusMode READ focusMode WRITE setFocusMode NOTIFY focusModeChanged) Q_PROPERTY(QPointF focusPoint READ focusPoint NOTIFY focusPointChanged) Q_PROPERTY(QPointF customFocusPoint READ customFocusPoint WRITE setCustomFocusPoint NOTIFY customFocusPointChanged) Q_PROPERTY(float focusDistance READ focusDistance WRITE setFocusDistance NOTIFY focusDistanceChanged) @@ -167,6 +131,7 @@ public: FocusDistance = 0x20 }; Q_DECLARE_FLAGS(Features, Feature) + Q_FLAG(Features) explicit QCamera(QObject *parent = nullptr); explicit QCamera(const QCameraDevice& cameraDevice, QObject *parent = nullptr); @@ -284,9 +249,8 @@ Q_SIGNALS: void exposureCompensationChanged(float); void exposureModeChanged(); - void whiteBalanceModeChanged() const; - void colorTemperatureChanged() const; - + void whiteBalanceModeChanged() QT6_ONLY(const); + void colorTemperatureChanged() QT6_ONLY(const); void brightnessChanged(); void contrastChanged(); void saturationChanged(); @@ -298,7 +262,6 @@ private: friend class QMediaCaptureSession; Q_DISABLE_COPY(QCamera) Q_DECLARE_PRIVATE(QCamera) - Q_PRIVATE_SLOT(d_func(), void _q_error(int, const QString &)) friend class QCameraDevice; }; diff --git a/src/multimedia/camera/qcamera_p.h b/src/multimedia/camera/qcamera_p.h index b9e4e377a..ae1299435 100644 --- a/src/multimedia/camera/qcamera_p.h +++ b/src/multimedia/camera/qcamera_p.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 QCAMERA_P_H #define QCAMERA_P_H @@ -64,25 +28,13 @@ class QCameraPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QCamera) public: - QCameraPrivate() - : QObjectPrivate(), - error(QCamera::NoError) - { - } - void init(const QCameraDevice &device); QMediaCaptureSession *captureSession = nullptr; QPlatformCamera *control = nullptr; - QCamera::Error error; - QString errorString; - QCameraDevice cameraDevice; QCameraFormat cameraFormat; - - void _q_error(int error, const QString &errorString); - void unsetError() { error = QCamera::NoError; errorString.clear(); } }; QT_END_NAMESPACE diff --git a/src/multimedia/camera/qcameradevice.cpp b/src/multimedia/camera/qcameradevice.cpp index e727301e3..63e7fb4c0 100644 --- a/src/multimedia/camera/qcameradevice.cpp +++ b/src/multimedia/camera/qcameradevice.cpp @@ -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 #include "qcameradevice_p.h" @@ -114,7 +78,7 @@ QCameraFormat::~QCameraFormat() = default; */ /*! - \qmlproperty enumeration QtMultimedia::CameraFormat::pixelFormat + \qmlproperty enumeration QtMultimedia::cameraFormat::pixelFormat Holds the pixel format. @@ -125,6 +89,8 @@ QCameraFormat::~QCameraFormat() = default; */ /*! + \property QCameraFormat::pixelFormat + Returns the pixel format. Most commonly this is either QVideoFrameFormat::Format_Jpeg or QVideoFrameFormat::Format_YUVY @@ -138,12 +104,14 @@ QVideoFrameFormat::PixelFormat QCameraFormat::pixelFormat() const noexcept } /*! - \qmlproperty size QtMultimedia::CameraFormat::resolution + \qmlproperty size QtMultimedia::cameraFormat::resolution Returns the resolution. */ /*! + \property QCameraFormat::resolution + Returns the resolution. */ QSize QCameraFormat::resolution() const noexcept @@ -152,12 +120,14 @@ QSize QCameraFormat::resolution() const noexcept } /*! - \qmlproperty real QtMultimedia::CameraFormat::minFrameRate + \qmlproperty real QtMultimedia::cameraFormat::minFrameRate Returns the lowest frame rate defined by this format. */ /*! + \property QCameraFormat::minFrameRate + Returns the lowest frame rate defined by this format. */ float QCameraFormat::minFrameRate() const noexcept @@ -166,18 +136,20 @@ float QCameraFormat::minFrameRate() const noexcept } /*! - \qmlproperty real QtMultimedia::CameraFormat::maxFrameRate + \qmlproperty real QtMultimedia::cameraFormat::maxFrameRate Returns the highest frame rate defined by this format. - In 6.2, the camera will always try to use the maximum frame rate supported by a + The camera will always try to use the maximum frame rate supported by a certain video format. */ /*! + \property QCameraFormat::maxFrameRate + Returns the highest frame rate defined by this format. - In 6.2, the camera will always try to use the highest frame rate supported by a + The camera will always try to use the highest frame rate supported by a certain video format. */ float QCameraFormat::maxFrameRate() const noexcept @@ -237,8 +209,7 @@ bool QCameraFormat::operator==(const QCameraFormat &other) const \snippet multimedia-snippets/camera.cpp Camera selection You can also use QCameraDevice to get general information about a camera - device such as description, physical position on the system, or camera sensor - orientation. + device such as description and physical position on the system. \snippet multimedia-snippets/camera.cpp Camera info @@ -322,6 +293,8 @@ bool QCameraDevice::isNull() const */ /*! + \property QCameraDevice::id + Returns the device id of the camera This is a unique ID to identify the camera and may not be human-readable. @@ -338,6 +311,8 @@ QByteArray QCameraDevice::id() const */ /*! + \property QCameraDevice::isDefault + Returns true if this is the default camera device. */ bool QCameraDevice::isDefault() const @@ -346,6 +321,38 @@ bool QCameraDevice::isDefault() const } /*! + \since 6.7 + \qmlproperty QtVideo::Rotation QtMultimedia::cameraDevice::correctionAngle + + Returns the rotation angle needed to compensate for the physical camera rotation of the camera + compared to its native orientation. In other words, the property represents the clockwise angle + through which the output image needs to be rotated to be upright on the device screen in its + native orientation. Since \a correctionAngle is relative to the native orientation, this value + does not change with altering the device orientation (portrait/landscape). The correction angle + may be non-zero mostly on Android, where native and camera orientations are defined by the manufacturer. + + \image camera_correctionAngle_90.png Example with 90 degrees \a correctionAngle +*/ + +/*! + \since 6.7 + \property QCameraDevice::correctionAngle + + Returns the rotation angle needed to compensate for the physical camera rotation of the camera + compared to its native orientation. In other words, the property represents the clockwise angle + through which the output image needs to be rotated to be upright on the device screen in its + native orientation. Since \a correctionAngle is relative to the native orientation, this value + does not change with altering the device orientation (portrait/landscape). The correction angle + may be non-zero mostly on Android, where native and camera orientations are defined by the manufacturer. + + \image camera_correctionAngle_90.png Example with 90 degrees \a correctionAngle +*/ +QtVideo::Rotation QCameraDevice::correctionAngle() const +{ + return d ? QtVideo::Rotation(d->orientation) : QtVideo::Rotation::None; +} + +/*! \qmlproperty string QtMultimedia::cameraDevice::description Holds a human readable name of the camera. @@ -354,6 +361,8 @@ bool QCameraDevice::isDefault() const */ /*! + \property QCameraDevice::description + Returns the human-readable description of the camera. Use this string to present the device to the user. @@ -392,6 +401,8 @@ QString QCameraDevice::description() const */ /*! + \property QCameraDevice::position + Returns the physical position of the camera on the hardware system. */ QCameraDevice::Position QCameraDevice::position() const @@ -411,12 +422,14 @@ QList<QSize> QCameraDevice::photoResolutions() const } /*! - \qmlproperty CameraFormat QtMultiMedia::CameraDevice::videoFormats + \qmlproperty CameraFormat QtMultimedia::cameraDevice::videoFormats Holds the video formats supported by the camera. */ /*! + \property QCameraDevice::videoFormats + Returns the video formats supported by the camera. */ QList<QCameraFormat> QCameraDevice::videoFormats() const @@ -442,12 +455,16 @@ QCameraDevice& QCameraDevice::operator=(const QCameraDevice& other) = default; #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug d, const QCameraDevice &camera) { - d.maybeSpace() << QStringLiteral("QCameraDevice(name=%1, position=%2, orientation=%3)") - .arg(camera.description()) - .arg(QString::fromLatin1(QCamera::staticMetaObject.enumerator(QCamera::staticMetaObject.indexOfEnumerator("Position")) - .valueToKey(camera.position()))); + d.maybeSpace() << QStringLiteral("QCameraDevice(name=%1, id=%2, position=%3)") + .arg(camera.description()) + .arg(QLatin1StringView(camera.id())) + .arg(QLatin1StringView( + QMetaEnum::fromType<QCameraDevice::Position>().valueToKey( + camera.position()))); return d.space(); } #endif QT_END_NAMESPACE + +#include "moc_qcameradevice.cpp" diff --git a/src/multimedia/camera/qcameradevice.h b/src/multimedia/camera/qcameradevice.h index b58a49687..2a9fac659 100644 --- a/src/multimedia/camera/qcameradevice.h +++ b/src/multimedia/camera/qcameradevice.h @@ -1,45 +1,10 @@ -/**************************************************************************** -** -** 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 QCAMERAINFO_H #define QCAMERAINFO_H +#include <QtMultimedia/qtvideo.h> #include <QtMultimedia/qvideoframe.h> #include <QtCore/qsharedpointer.h> @@ -85,6 +50,7 @@ class Q_MULTIMEDIA_EXPORT QCameraDevice Q_PROPERTY(bool isDefault READ isDefault CONSTANT) Q_PROPERTY(Position position READ position CONSTANT) Q_PROPERTY(QList<QCameraFormat> videoFormats READ videoFormats CONSTANT) + Q_PROPERTY(QtVideo::Rotation correctionAngle READ correctionAngle CONSTANT) public: QCameraDevice(); QCameraDevice(const QCameraDevice& other); @@ -118,6 +84,7 @@ public: QList<QSize> photoResolutions() const; QList<QCameraFormat> videoFormats() const; + QtVideo::Rotation correctionAngle() const; // ### Add zoom and other camera information private: diff --git a/src/multimedia/camera/qcameradevice_p.h b/src/multimedia/camera/qcameradevice_p.h index 6967e09fa..638cc0cae 100644 --- a/src/multimedia/camera/qcameradevice_p.h +++ b/src/multimedia/camera/qcameradevice_p.h @@ -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 #ifndef QCAMERAINFO_P_H #define QCAMERAINFO_P_H @@ -60,10 +24,22 @@ QT_BEGIN_NAMESPACE class QCameraFormatPrivate : public QSharedData { public: - QVideoFrameFormat::PixelFormat pixelFormat; + QVideoFrameFormat::PixelFormat pixelFormat = QVideoFrameFormat::Format_Invalid; QSize resolution; float minFrameRate = 0; float maxFrameRate = 0; + QVideoFrameFormat::ColorRange colorRange = QVideoFrameFormat::ColorRange_Unknown; + + static QVideoFrameFormat::ColorRange getColorRange(const QCameraFormat &format) + { + auto d = handle(format); + return d ? d->colorRange : QVideoFrameFormat::ColorRange_Unknown; + } + + static const QCameraFormatPrivate *handle(const QCameraFormat &format) + { + return format.d.get(); + } QCameraFormat create() { return QCameraFormat(this); } }; @@ -79,6 +55,18 @@ public: QList<QSize> photoResolutions; QList<QCameraFormat> videoFormats; + static const QCameraDevicePrivate *handle(const QCameraDevice &device) + { + return device.d.data(); + } + + bool operator==(const QCameraDevicePrivate &other) const + { + return id == other.id && description == other.description && isDefault == other.isDefault + && position == other.position && orientation == other.orientation + && photoResolutions == other.photoResolutions && videoFormats == other.videoFormats; + } + QCameraDevice create() { return QCameraDevice(this); } }; diff --git a/src/multimedia/camera/qimagecapture.cpp b/src/multimedia/camera/qimagecapture.cpp index 41c3721f2..ecf39935c 100644 --- a/src/multimedia/camera/qimagecapture.cpp +++ b/src/multimedia/camera/qimagecapture.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 <qimagecapture.h> #include <private/qplatformimagecapture_p.h> #include <qmediametadata.h> @@ -118,25 +82,36 @@ QImageCapture::QImageCapture(QObject *parent) { Q_D(QImageCapture); d->q_ptr = this; - d->control = QPlatformMediaIntegration::instance()->createImageCapture(this); - - connect(d->control, SIGNAL(imageExposed(int)), - this, SIGNAL(imageExposed(int))); - connect(d->control, SIGNAL(imageCaptured(int,QImage)), - this, SIGNAL(imageCaptured(int,QImage))); - connect(d->control, SIGNAL(imageMetadataAvailable(int,const QMediaMetaData&)), - this, SIGNAL(imageMetadataAvailable(int,const QMediaMetaData&))); - connect(d->control, SIGNAL(imageAvailable(int,QVideoFrame)), - this, SIGNAL(imageAvailable(int,QVideoFrame))); - connect(d->control, SIGNAL(imageSaved(int,QString)), - this, SIGNAL(imageSaved(int,QString))); - connect(d->control, SIGNAL(readyForCaptureChanged(bool)), - this, SIGNAL(readyForCaptureChanged(bool))); + + auto maybeControl = QPlatformMediaIntegration::instance()->createImageCapture(this); + if (!maybeControl) { + qWarning() << "Failed to initialize QImageCapture" << maybeControl.error(); + d->errorString = maybeControl.error(); + d->error = NotReadyError; + return; + } + + d->control = maybeControl.value(); + connect(d->control, &QPlatformImageCapture::imageExposed, this, &QImageCapture::imageExposed); + connect(d->control, &QPlatformImageCapture::imageCaptured, this, &QImageCapture::imageCaptured); + connect(d->control, &QPlatformImageCapture::imageMetadataAvailable, this, + &QImageCapture::imageMetadataAvailable); + connect(d->control, &QPlatformImageCapture::imageAvailable, this, + &QImageCapture::imageAvailable); + connect(d->control, &QPlatformImageCapture::imageSaved, this, &QImageCapture::imageSaved); + connect(d->control, &QPlatformImageCapture::readyForCaptureChanged, this, + &QImageCapture::readyForCaptureChanged); connect(d->control, SIGNAL(error(int,int,QString)), this, SLOT(_q_error(int,int,QString))); } /*! + \fn void QImageCapture::imageMetadataAvailable(int id, const QMediaMetaData &metaData) + + Signals that an image identified by \a id has \a metaData. +*/ + +/*! \internal */ void QImageCapture::setCaptureSession(QMediaCaptureSession *session) @@ -161,7 +136,7 @@ QImageCapture::~QImageCapture() */ bool QImageCapture::isAvailable() const { - return d_func()->captureSession && d_func()->captureSession->camera(); + return d_func()->control && d_func()->captureSession && d_func()->captureSession->camera(); } /*! @@ -177,6 +152,8 @@ QMediaCaptureSession *QImageCapture::captureSession() const } /*! + \property QImageCapture::error + Returns the current error state. \sa errorString() @@ -188,6 +165,8 @@ QImageCapture::Error QImageCapture::error() const } /*! + \property QImageCapture::errorString + Returns a string describing the current error state. \sa error() @@ -219,7 +198,8 @@ void QImageCapture::setMetaData(const QMediaMetaData &metaData) { Q_D(QImageCapture); d->metaData = metaData; - d->control->setMetaData(d->metaData); + if (d->control) + d->control->setMetaData(d->metaData); emit metaDataChanged(); } @@ -231,8 +211,8 @@ void QImageCapture::addMetaData(const QMediaMetaData &metaData) { Q_D(QImageCapture); auto data = d->metaData; - for (auto k : metaData.keys()) - data.insert(k, metaData.value(k)); + for (auto &&[key, value] : metaData.asKeyValueRange()) + data.insert(key, value); setMetaData(data); } @@ -285,14 +265,13 @@ bool QImageCapture::isReadyForCapture() const int QImageCapture::captureToFile(const QString &file) { Q_D(QImageCapture); - - d->unsetError(); - if (!d->control) { - d->_q_error(-1, NotSupportedFeatureError, QPlatformImageCapture::msgCameraNotReady()); + d->_q_error(-1, d->error, d->errorString); return -1; } + d->unsetError(); + if (!isReadyForCapture()) { d->_q_error(-1, NotReadyError, tr("Could not capture in stopped state")); return -1; @@ -316,18 +295,13 @@ int QImageCapture::captureToFile(const QString &file) int QImageCapture::capture() { Q_D(QImageCapture); - - d->unsetError(); - - if (d->control) + if (!d->control) { + d->_q_error(-1, d->error, d->errorString); + return -1; + } else { + d->unsetError(); return d->control->captureToBuffer(); - - d->error = NotSupportedFeatureError; - d->errorString = tr("Device does not support images capture."); - - d->_q_error(-1, d->error, d->errorString); - - return -1; + } } /*! @@ -375,6 +349,20 @@ int QImageCapture::capture() */ /*! + \enum QImageCapture::FileFormat + + Choose one of the following image formats: + + \value UnspecifiedFormat No format specified + \value JPEG \c .jpg or \c .jpeg format + \value PNG \c .png format + \value WebP \c .webp format + \value Tiff \c .tiff format + \omitvalue LastFileFormat +*/ + + +/*! \property QImageCapture::fileFormat \brief The image format. */ @@ -382,9 +370,7 @@ int QImageCapture::capture() QImageCapture::FileFormat QImageCapture::fileFormat() const { Q_D(const QImageCapture); - if (!d->control) - return UnspecifiedFormat; - return d->control->imageSettings().format(); + return d->control ? d->control->imageSettings().format() : UnspecifiedFormat; } /*! @@ -403,11 +389,19 @@ void QImageCapture::setFileFormat(QImageCapture::FileFormat format) emit fileFormatChanged(); } +/*! + Returns a list of supported file formats. + + \sa {QImageCapture::}{FileFormat} +*/ QList<QImageCapture::FileFormat> QImageCapture::supportedFormats() { return QPlatformMediaIntegration::instance()->formatInfo()->imageFormats; } +/*! + Returns the name of the given format, \a f. +*/ QString QImageCapture::fileFormatName(QImageCapture::FileFormat f) { const char *name = nullptr; @@ -431,6 +425,9 @@ QString QImageCapture::fileFormatName(QImageCapture::FileFormat f) return QString::fromUtf8(name); } +/*! + Returns the description of the given file format, \a f. +*/ QString QImageCapture::fileFormatDescription(QImageCapture::FileFormat f) { const char *name = nullptr; @@ -461,12 +458,16 @@ QString QImageCapture::fileFormatDescription(QImageCapture::FileFormat f) QSize QImageCapture::resolution() const { Q_D(const QImageCapture); - if (!d->control) - return QSize(); - return d->control->imageSettings().resolution(); + return d->control ? d->control->imageSettings().resolution() : QSize{}; } /*! + \fn void QImageCapture::resolutionChanged() + + Signals when the image resolution changes. +*/ + +/*! Sets the \a resolution of the encoded image. An empty QSize indicates the encoder should make an optimal choice based on @@ -514,9 +515,7 @@ void QImageCapture::setResolution(int width, int height) QImageCapture::Quality QImageCapture::quality() const { Q_D(const QImageCapture); - if (!d->control) - return NormalQuality; - return d->control->imageSettings().quality(); + return d->control ? d->control->imageSettings().quality() : NormalQuality; } /*! diff --git a/src/multimedia/camera/qimagecapture.h b/src/multimedia/camera/qimagecapture.h index 5d49c51d3..48608792a 100644 --- a/src/multimedia/camera/qimagecapture.h +++ b/src/multimedia/camera/qimagecapture.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 QCAMERAIMAGECAPTURE_H #define QCAMERAIMAGECAPTURE_H diff --git a/src/multimedia/compat/removed_api.cpp b/src/multimedia/compat/removed_api.cpp new file mode 100644 index 000000000..567024c8e --- /dev/null +++ b/src/multimedia/compat/removed_api.cpp @@ -0,0 +1,16 @@ +// Copyright (C) 2024 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 + +#define QT_MULTIMEDIA_BUILD_REMOVED_API + +#include <QtMultimedia/qtmultimediaglobal.h> + +QT_USE_NAMESPACE + +#if QT_MULTIMEDIA_REMOVED_SINCE(6, 7) + +// #include "qotherheader.h" +// // implement removed functions from qotherheader.h +// order sections alphabetically + +#endif // QT_MULTIMEDIA_REMOVED_SINCE(6, 7) diff --git a/src/multimedia/configure.cmake b/src/multimedia/configure.cmake index efcadfc5c..4bc66e038 100644 --- a/src/multimedia/configure.cmake +++ b/src/multimedia/configure.cmake @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + #### Inputs @@ -19,10 +22,14 @@ qt_find_package(MMRendererCore PROVIDED_TARGETS MMRendererCore::MMRendererCore M qt_find_package(MMRenderer PROVIDED_TARGETS MMRenderer::MMRenderer MODULE_NAME multimedia QMAKE_LIB mmrndclient) qt_find_package(WrapPulseAudio PROVIDED_TARGETS WrapPulseAudio::WrapPulseAudio MODULE_NAME multimedia QMAKE_LIB pulseaudio) qt_find_package(WMF PROVIDED_TARGETS WMF::WMF MODULE_NAME multimedia QMAKE_LIB wmf) -qt_find_package(EGL) +if(TARGET EGL::EGL) + qt_internal_disable_find_package_global_promotion(EGL::EGL) +endif() +qt_find_package(EGL PROVIDED_TARGETS EGL::EGL) + -qt_find_package(FFmpeg OPTIONAL_COMPONENTS AVCODEC AVFORMAT AVUTIL AVDEVICE SWRESAMPLE SWSCALE PROVIDED_TARGETS FFmpeg::avcodec FFmpeg::avformat FFmpeg::avutil FFmpeg::avdevice FFmpeg::swresample FFmpeg::swscale MODULE_NAME multimedia QMAKE_LIB ffmpeg) -qt_find_package(VAAPI COMPONENTS VA DRM PROVIDED_TARGETS VAAPI::VA VAAPI::DRM MODULE_NAME multimedia QMAKE_LIB vaapi) +qt_find_package(FFmpeg OPTIONAL_COMPONENTS AVCODEC AVFORMAT AVUTIL SWRESAMPLE SWSCALE PROVIDED_TARGETS FFmpeg::avcodec FFmpeg::avformat FFmpeg::avutil FFmpeg::swresample FFmpeg::swscale MODULE_NAME multimedia QMAKE_LIB ffmpeg) +qt_find_package(VAAPI COMPONENTS VA DRM PROVIDED_TARGETS VAAPI::VAAPI MODULE_NAME multimedia QMAKE_LIB vaapi) #### Tests @@ -96,28 +103,20 @@ qt_feature("evr" PUBLIC PRIVATE LABEL "evr.h" CONDITION WIN32 AND TEST_evr ) -qt_feature("gstreamer_1_0" PRIVATE - LABEL "GStreamer 1.0" - CONDITION GStreamer_FOUND +qt_feature("gstreamer" PRIVATE + LABEL "QtMM GStreamer plugin" + CONDITION GStreamer_FOUND AND GStreamer_App_FOUND ENABLE INPUT_gstreamer STREQUAL 'yes' DISABLE INPUT_gstreamer STREQUAL 'no' ) -qt_feature("gstreamer" PRIVATE - CONDITION QT_FEATURE_gstreamer_1_0 -) -qt_feature("gstreamer_app" PRIVATE - LABEL "GStreamer App" - CONDITION ( QT_FEATURE_gstreamer_1_0 AND GStreamer_App_FOUND ) -) qt_feature("gstreamer_photography" PRIVATE LABEL "GStreamer Photography" - CONDITION ( QT_FEATURE_gstreamer_1_0 AND GStreamer_Photography_FOUND ) + CONDITION QT_FEATURE_gstreamer AND GStreamer_Photography_FOUND ) qt_feature("gstreamer_gl" PRIVATE LABEL "GStreamer OpenGL" - CONDITION QT_FEATURE_opengl AND QT_FEATURE_gstreamer_1_0 AND GStreamer_Gl_FOUND + CONDITION QT_FEATURE_opengl AND QT_FEATURE_gstreamer AND GStreamer_Gl_FOUND AND EGL_FOUND ) - qt_feature("gpu_vivante" PRIVATE LABEL "Vivante GPU" CONDITION QT_FEATURE_gui AND QT_FEATURE_opengles2 AND TEST_gpu_vivante diff --git a/src/multimedia/darwin/qcoreaudiosessionmanager.mm b/src/multimedia/darwin/qcoreaudiosessionmanager.mm index 264935d74..cee955905 100644 --- a/src/multimedia/darwin/qcoreaudiosessionmanager.mm +++ b/src/multimedia/darwin/qcoreaudiosessionmanager.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 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 "qcoreaudiosessionmanager_p.h" #import <AVFoundation/AVAudioSession.h> diff --git a/src/multimedia/darwin/qcoreaudiosessionmanager_p.h b/src/multimedia/darwin/qcoreaudiosessionmanager_p.h index 7b2a5294f..a6dfe88f4 100644 --- a/src/multimedia/darwin/qcoreaudiosessionmanager_p.h +++ b/src/multimedia/darwin/qcoreaudiosessionmanager_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef IOSAUDIOSESSIONMANAGER_H #define IOSAUDIOSESSIONMANAGER_H 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); } diff --git a/src/multimedia/darwin/qcoreaudioutils_p.h b/src/multimedia/darwin/qcoreaudioutils_p.h index b6730c978..94b6298f3 100644 --- a/src/multimedia/darwin/qcoreaudioutils_p.h +++ b/src/multimedia/darwin/qcoreaudioutils_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef IOSAUDIOUTILS_H #define IOSAUDIOUTILS_H @@ -67,7 +31,7 @@ public: static AudioStreamBasicDescription toAudioStreamBasicDescription(QAudioFormat const& audioFormat); // ownership is transferred to caller, free with ::free() - static std::unique_ptr<AudioChannelLayout> toAudioChannelLayout(const QAudioFormat &format, UInt32 *size); + static Q_MULTIMEDIA_EXPORT std::unique_ptr<AudioChannelLayout> toAudioChannelLayout(const QAudioFormat &format, UInt32 *size); static QAudioFormat::ChannelConfig fromAudioChannelLayout(const AudioChannelLayout *layout); private: diff --git a/src/multimedia/darwin/qdarwinaudiodevice.mm b/src/multimedia/darwin/qdarwinaudiodevice.mm index e23c087f8..8374f4cea 100644 --- a/src/multimedia/darwin/qdarwinaudiodevice.mm +++ b/src/multimedia/darwin/qdarwinaudiodevice.mm @@ -1,48 +1,14 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). -** 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 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 "qdarwinaudiodevice_p.h" #include "qcoreaudioutils_p.h" #include <private/qcore_mac_p.h> -#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) -# include "qcoreaudiosessionmanager_p.h" +#if defined(Q_OS_IOS) +#include "qcoreaudiosessionmanager_p.h" +#else +#include "qmacosaudiodatautils_p.h" #endif #include <QtCore/QDataStream> @@ -72,50 +38,29 @@ QCoreAudioDeviceInfo::QCoreAudioDeviceInfo(const QByteArray &device, QAudioDevic } - QAudioFormat QCoreAudioDeviceInfo::determinePreferredFormat() const { QAudioFormat format; #if defined(Q_OS_MACOS) - UInt32 propSize = 0; - AudioObjectPropertyScope audioDevicePropertyScope = mode == QAudioDevice::Input ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput; - AudioObjectPropertyAddress audioDevicePropertyStreamsAddress = { kAudioDevicePropertyStreams, - audioDevicePropertyScope, - kAudioObjectPropertyElementMaster }; - - if (AudioObjectGetPropertyDataSize(m_deviceId, &audioDevicePropertyStreamsAddress, 0, NULL, &propSize) == noErr) { - - const int sc = propSize / sizeof(AudioStreamID); - - if (sc > 0) { - AudioStreamID* streams = new AudioStreamID[sc]; - - if (AudioObjectGetPropertyData(m_deviceId, &audioDevicePropertyStreamsAddress, 0, NULL, &propSize, streams) == noErr) { - - AudioObjectPropertyAddress audioDevicePhysicalFormatPropertyAddress = { kAudioStreamPropertyPhysicalFormat, - kAudioObjectPropertyScopeGlobal, - kAudioObjectPropertyElementMaster }; - - for (int i = 0; i < sc; ++i) { - if (AudioObjectGetPropertyDataSize(streams[i], &audioDevicePhysicalFormatPropertyAddress, 0, NULL, &propSize) == noErr) { - AudioStreamBasicDescription sf; - - if (AudioObjectGetPropertyData(streams[i], &audioDevicePhysicalFormatPropertyAddress, 0, NULL, &propSize, &sf) == noErr) { - format = CoreAudioUtils::toQAudioFormat(sf); - break; - } else { - qWarning() << "QAudioDevice: Unable to find perferedFormat for stream"; - } - } else { - qWarning() << "QAudioDevice: Unable to find size of perferedFormat for stream"; - } - } + const auto audioDevicePropertyStreamsAddress = + makePropertyAddress(kAudioDevicePropertyStreams, mode); + + if (auto streamIDs = getAudioData<AudioStreamID>(m_deviceId, audioDevicePropertyStreamsAddress, + "propertyStreams")) { + const auto audioDevicePhysicalFormatPropertyAddress = + makePropertyAddress(kAudioStreamPropertyPhysicalFormat, mode); + + for (auto streamID : *streamIDs) { + if (auto streamDescription = getAudioObject<AudioStreamBasicDescription>( + streamID, audioDevicePhysicalFormatPropertyAddress, + "prefferedPhysicalFormat")) { + format = CoreAudioUtils::toQAudioFormat(*streamDescription); + break; } - - delete[] streams; } } + if (!format.isValid()) #endif { @@ -132,22 +77,14 @@ QAudioFormat QCoreAudioDeviceInfo::determinePreferredFormat() const QString QCoreAudioDeviceInfo::getDescription() const { #ifdef Q_OS_MACOS - CFStringRef name; - UInt32 size = sizeof(CFStringRef); - AudioObjectPropertyScope audioPropertyScope = mode == QAudioDevice::Input ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput; - - AudioObjectPropertyAddress audioDeviceNamePropertyAddress = { kAudioObjectPropertyName, - audioPropertyScope, - kAudioObjectPropertyElementMaster }; - - if (AudioObjectGetPropertyData(m_deviceId, &audioDeviceNamePropertyAddress, 0, NULL, &size, &name) != noErr) { - qWarning() << "QAudioDevice: Unable to find device description"; - return QString(); + const auto propertyAddress = makePropertyAddress(kAudioObjectPropertyName, mode); + if (auto name = + getAudioObject<CFStringRef>(m_deviceId, propertyAddress, "Device Description")) { + auto deleter = qScopeGuard([&name]() { CFRelease(*name); }); + return QString::fromCFString(*name); } - QString s = QString::fromCFString(name); - CFRelease(name); - return s; + return {}; #else return QString::fromUtf8(id); #endif @@ -156,16 +93,12 @@ QString QCoreAudioDeviceInfo::getDescription() const void QCoreAudioDeviceInfo::getChannelLayout() { #ifdef Q_OS_MACOS - AudioObjectPropertyAddress audioDeviceChannelLayoutPropertyAddress = { kAudioDevicePropertyPreferredChannelLayout, - (mode == QAudioDevice::Input ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput), - kAudioObjectPropertyElementMaster }; - UInt32 propSize; - if (AudioObjectGetPropertyDataSize(m_deviceId, &audioDeviceChannelLayoutPropertyAddress, 0, nullptr, &propSize) == noErr) { - AudioChannelLayout *layout = static_cast<AudioChannelLayout *>(malloc(propSize)); - if (AudioObjectGetPropertyData(m_deviceId, &audioDeviceChannelLayoutPropertyAddress, 0, nullptr, &propSize, layout) == noErr) { - channelConfiguration = CoreAudioUtils::fromAudioChannelLayout(layout); - } - free(layout); + const auto propertyAddress = + makePropertyAddress(kAudioDevicePropertyPreferredChannelLayout, mode); + if (auto data = getAudioData<char>(m_deviceId, propertyAddress, "prefferedChannelLayout", + sizeof(AudioChannelLayout))) { + const auto *layout = reinterpret_cast<const AudioChannelLayout *>(data->data()); + channelConfiguration = CoreAudioUtils::fromAudioChannelLayout(layout); } #else channelConfiguration = (mode == QAudioDevice::Input) ? QAudioFormat::ChannelConfigMono : QAudioFormat::ChannelConfigStereo; diff --git a/src/multimedia/darwin/qdarwinaudiodevice_p.h b/src/multimedia/darwin/qdarwinaudiodevice_p.h index ab6758118..637c5d197 100644 --- a/src/multimedia/darwin/qdarwinaudiodevice_p.h +++ b/src/multimedia/darwin/qdarwinaudiodevice_p.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 IOSAUDIODEVICEINFO_H #define IOSAUDIODEVICEINFO_H diff --git a/src/multimedia/darwin/qdarwinaudiosink.mm b/src/multimedia/darwin/qdarwinaudiosink.mm index 49443d234..9242bb2f0 100644 --- a/src/multimedia/darwin/qdarwinaudiosink.mm +++ b/src/multimedia/darwin/qdarwinaudiosink.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 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 "qdarwinaudiosink_p.h" #include "qcoreaudiosessionmanager_p.h" #include "qdarwinaudiodevice_p.h" @@ -49,7 +13,7 @@ #include <AudioUnit/AudioUnit.h> #include <AudioToolbox/AudioToolbox.h> -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) # include <AudioUnit/AudioComponent.h> #endif @@ -59,24 +23,29 @@ QT_BEGIN_NAMESPACE -QDarwinAudioSinkBuffer::QDarwinAudioSinkBuffer(int bufferSize, int maxPeriodSize, const QAudioFormat &audioFormat) - : m_deviceError(false) - , m_maxPeriodSize(maxPeriodSize) - , m_device(0) +static int audioRingBufferSize(int bufferSize, int maxPeriodSize) { - m_buffer = new CoreAudioRingBuffer(bufferSize + (bufferSize % maxPeriodSize == 0 ? 0 : maxPeriodSize - (bufferSize % maxPeriodSize))); - m_bytesPerFrame = audioFormat.bytesPerFrame(); - m_periodTime = m_maxPeriodSize / m_bytesPerFrame * 1000 / audioFormat.sampleRate(); - - m_fillTimer = new QTimer(this); - connect(m_fillTimer, SIGNAL(timeout()), SLOT(fillBuffer())); + // TODO: review this code + return bufferSize + + (bufferSize % maxPeriodSize == 0 ? 0 : maxPeriodSize - (bufferSize % maxPeriodSize)); } -QDarwinAudioSinkBuffer::~QDarwinAudioSinkBuffer() +QDarwinAudioSinkBuffer::QDarwinAudioSinkBuffer(int bufferSize, int maxPeriodSize, + const QAudioFormat &audioFormat) + : m_maxPeriodSize(maxPeriodSize), + m_bytesPerFrame(audioFormat.bytesPerFrame()), + m_periodTime(maxPeriodSize / m_bytesPerFrame * 1000 / audioFormat.sampleRate()), + m_buffer( + std::make_unique<CoreAudioRingBuffer>(audioRingBufferSize(bufferSize, maxPeriodSize))) { - delete m_buffer; + m_fillTimer = new QTimer(this); + m_fillTimer->setTimerType(Qt::PreciseTimer); + m_fillTimer->setInterval(m_buffer->size() / 2 / m_maxPeriodSize * m_periodTime); + connect(m_fillTimer, &QTimer::timeout, this, &QDarwinAudioSinkBuffer::fillBuffer); } +QDarwinAudioSinkBuffer::~QDarwinAudioSinkBuffer() = default; + qint64 QDarwinAudioSinkBuffer::readFrames(char *data, qint64 maxFrames) { bool wecan = true; @@ -137,31 +106,46 @@ int QDarwinAudioSinkBuffer::available() const return m_buffer->free(); } +bool QDarwinAudioSinkBuffer::deviceAtEnd() const +{ + return m_deviceAtEnd; +} + void QDarwinAudioSinkBuffer::reset() { m_buffer->reset(); - m_device = 0; - m_deviceError = false; + setFillingEnabled(false); + setPrefetchDevice(nullptr); } void QDarwinAudioSinkBuffer::setPrefetchDevice(QIODevice *device) { - if (m_device != device) { - m_device = device; - if (m_device != 0) - fillBuffer(); - } + if (std::exchange(m_device, device) == device) + return; + + m_deviceError = false; + m_deviceAtEnd = device && device->atEnd(); + const auto wasFillingEnabled = m_fillingEnabled; + setFillingEnabled(false); + setFillingEnabled(wasFillingEnabled); } -void QDarwinAudioSinkBuffer::startFillTimer() +QIODevice *QDarwinAudioSinkBuffer::prefetchDevice() const { - if (m_device != 0) - m_fillTimer->start(m_buffer->size() / 2 / m_maxPeriodSize * m_periodTime); + return m_device; } -void QDarwinAudioSinkBuffer::stopFillTimer() +void QDarwinAudioSinkBuffer::setFillingEnabled(bool enabled) { - m_fillTimer->stop(); + if (std::exchange(m_fillingEnabled, enabled) == enabled) + return; + + if (!enabled) + m_fillTimer->stop(); + else if (m_device) { + fillBuffer(); + m_fillTimer->start(); + } } void QDarwinAudioSinkBuffer::fillBuffer() @@ -178,12 +162,13 @@ void QDarwinAudioSinkBuffer::fillBuffer() if (region.second > 0) { region.second = m_device->read(region.first, region.second); + m_deviceAtEnd = m_device->atEnd(); if (region.second > 0) filled += region.second; else if (region.second == 0) wecan = false; else if (region.second < 0) { - m_fillTimer->stop(); + setFillingEnabled(false); region.second = 0; m_deviceError = true; } @@ -219,8 +204,8 @@ qint64 QDarwinAudioSinkDevice::writeData(const char *data, qint64 len) return m_audioBuffer->writeBytes(data, len); } -QDarwinAudioSink::QDarwinAudioSink(const QAudioDevice &device) - : m_audioDeviceInfo(device) +QDarwinAudioSink::QDarwinAudioSink(const QAudioDevice &device, QObject *parent) + : QPlatformAudioSink(parent), m_audioDeviceInfo(device), m_stateMachine(*this) { QAudioDevice di = device; if (di.isNull()) @@ -233,7 +218,8 @@ QDarwinAudioSink::QDarwinAudioSink(const QAudioDevice &device) m_device = di.id(); m_clockFrequency = CoreAudioUtils::frequency() / 1000; - m_audioThreadState.storeRelaxed(Stopped); + + connect(this, &QDarwinAudioSink::stateChanged, this, &QDarwinAudioSink::updateAudioDevice); } QDarwinAudioSink::~QDarwinAudioSink() @@ -243,106 +229,77 @@ QDarwinAudioSink::~QDarwinAudioSink() void QDarwinAudioSink::start(QIODevice *device) { - QIODevice* op = device; + reset(); if (!m_audioDeviceInfo.isFormatSupported(m_audioFormat) || !open()) { - m_stateCode = QAudio::StoppedState; - m_errorCode = QAudio::OpenError; + m_stateMachine.setError(QAudio::OpenError); return; } - reset(); - m_audioBuffer->reset(); - m_audioBuffer->setPrefetchDevice(op); - - if (op == 0) { - op = m_audioIO; - m_stateCode = QAudio::IdleState; + if (!device) { + m_stateMachine.setError(QAudio::IOError); + return; } - else - m_stateCode = QAudio::ActiveState; - // Start + m_audioBuffer->setPrefetchDevice(device); + m_pullMode = true; - m_errorCode = QAudio::NoError; m_totalFrames = 0; - if (m_stateCode == QAudio::ActiveState) - audioThreadStart(); - - emit stateChanged(m_stateCode); + m_stateMachine.start(); } QIODevice *QDarwinAudioSink::start() { + reset(); + if (!m_audioDeviceInfo.isFormatSupported(m_audioFormat) || !open()) { - m_stateCode = QAudio::StoppedState; - m_errorCode = QAudio::OpenError; + m_stateMachine.setError(QAudio::OpenError); return m_audioIO; } - reset(); - m_audioBuffer->reset(); - m_audioBuffer->setPrefetchDevice(0); - - m_stateCode = QAudio::IdleState; - - // Start m_pullMode = false; - m_errorCode = QAudio::NoError; m_totalFrames = 0; - emit stateChanged(m_stateCode); + m_stateMachine.start(false); return m_audioIO; } void QDarwinAudioSink::stop() { - if (m_stateCode == QAudio::StoppedState) - return; + if (m_audioBuffer) + m_audioBuffer->setFillingEnabled(false); + + if (auto notifier = m_stateMachine.stop(QAudio::NoError, true)) { + Q_ASSERT((notifier.prevAudioState() == QAudio::ActiveState) == notifier.isDraining()); + if (notifier.isDraining() && !m_drainSemaphore.tryAcquire(1, 500)) { + const bool wasDraining = m_stateMachine.onDrained(); - audioThreadDrain(); + qWarning() << "Failed wait for getting sink drained; was draining:" << wasDraining; - m_stateCode = QAudio::StoppedState; - m_errorCode = QAudio::NoError; - emit stateChanged(m_stateCode); + // handle a rare corner case when the audio thread managed to release the semaphore in + // the time window between tryAcquire and onDrained + if (!wasDraining) + m_drainSemaphore.acquire(); + } + } } void QDarwinAudioSink::reset() { - if (m_stateCode == QAudio::StoppedState) - return; - - audioThreadStop(); - - m_stateCode = QAudio::StoppedState; - m_errorCode = QAudio::NoError; - emit stateChanged(m_stateCode); + onAudioDeviceDrained(); + m_stateMachine.stopOrUpdateError(); } void QDarwinAudioSink::suspend() { - if (m_stateCode != QAudio::ActiveState && m_stateCode != QAudio::IdleState) - return; - - audioThreadStop(); - - m_stateCode = QAudio::SuspendedState; - m_errorCode = QAudio::NoError; - emit stateChanged(m_stateCode); + m_stateMachine.suspend(); } void QDarwinAudioSink::resume() { - if (m_stateCode != QAudio::SuspendedState) - return; - - audioThreadStart(); - - m_stateCode = m_pullMode ? QAudio::ActiveState : QAudio::IdleState; - m_errorCode = QAudio::NoError; - emit stateChanged(m_stateCode); + m_stateMachine.resume(); } qsizetype QDarwinAudioSink::bytesFree() const @@ -352,7 +309,7 @@ qsizetype QDarwinAudioSink::bytesFree() const void QDarwinAudioSink::setBufferSize(qsizetype value) { - if (m_stateCode == QAudio::StoppedState) + if (state() == QAudio::StoppedState) m_internalBufferSize = value; } @@ -368,17 +325,17 @@ qint64 QDarwinAudioSink::processedUSecs() const QAudio::Error QDarwinAudioSink::error() const { - return m_errorCode; + return m_stateMachine.error(); } QAudio::State QDarwinAudioSink::state() const { - return m_stateCode; + return m_stateMachine.state(); } void QDarwinAudioSink::setFormat(const QAudioFormat &format) { - if (m_stateCode == QAudio::StoppedState) + if (state() == QAudio::StoppedState) m_audioFormat = format; } @@ -393,7 +350,7 @@ void QDarwinAudioSink::setVolume(qreal volume) if (!m_isOpen) return; -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) //on OS X the volume can be set directly on the AudioUnit if (AudioUnitSetParameter(m_audioUnit, kHALOutputParam_Volume, @@ -410,22 +367,9 @@ qreal QDarwinAudioSink::volume() const return m_cachedVolume; } -void QDarwinAudioSink::deviceStopped() -{ - emit stateChanged(m_stateCode); -} - void QDarwinAudioSink::inputReady() { - if (m_stateCode != QAudio::IdleState) - return; - - audioThreadStart(); - - m_stateCode = QAudio::ActiveState; - m_errorCode = QAudio::NoError; - - emit stateChanged(m_stateCode); + m_stateMachine.activateFromIdle(); } OSStatus QDarwinAudioSink::renderCallback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumberFrames, AudioBufferList *ioData) @@ -437,15 +381,15 @@ OSStatus QDarwinAudioSink::renderCallback(void *inRefCon, AudioUnitRenderActionF QDarwinAudioSink* d = static_cast<QDarwinAudioSink*>(inRefCon); - const int threadState = d->m_audioThreadState.fetchAndAddAcquire(0); - if (threadState == Stopped) { + const auto [drained, stopped] = d->m_stateMachine.getDrainedAndStopped(); + + if (drained && stopped) { ioData->mBuffers[0].mDataByteSize = 0; - d->audioDeviceStop(); - } - else { + } else { const UInt32 bytesPerFrame = d->m_streamFormat.mBytesPerFrame; qint64 framesRead; + Q_ASSERT(ioData->mBuffers[0].mDataByteSize / bytesPerFrame == inNumberFrames); framesRead = d->m_audioBuffer->readFrames((char*)ioData->mBuffers[0].mData, ioData->mBuffers[0].mDataByteSize / bytesPerFrame); @@ -454,8 +398,7 @@ OSStatus QDarwinAudioSink::renderCallback(void *inRefCon, AudioUnitRenderActionF d->m_totalFrames += framesRead; #if defined(Q_OS_MACOS) - // If playback is already stopped. - if (threadState != Running) { + if (stopped) { qreal oldVolume = d->m_cachedVolume; // Decrease volume smoothly. d->setVolume(d->m_volume / 2); @@ -475,14 +418,10 @@ OSStatus QDarwinAudioSink::renderCallback(void *inRefCon, AudioUnitRenderActionF } else { ioData->mBuffers[0].mDataByteSize = 0; - if (framesRead == 0) { - if (threadState == Draining) - d->audioDeviceStop(); - else - d->audioDeviceIdle(); - } + if (framesRead == 0) + d->onAudioDeviceIdle(); else - d->audioDeviceError(); + d->onAudioDeviceError(); } } @@ -498,7 +437,7 @@ bool QDarwinAudioSink::open() CoreAudioSessionManager::instance().setActive(true); #endif - if (m_errorCode != QAudio::NoError) + if (error() != QAudio::NoError) return false; if (m_isOpen) { @@ -508,7 +447,7 @@ bool QDarwinAudioSink::open() AudioComponentDescription componentDescription; componentDescription.componentType = kAudioUnitType_Output; -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) componentDescription.componentSubType = kAudioUnitSubType_HALOutput; #else componentDescription.componentSubType = kAudioUnitSubType_RemoteIO; @@ -543,7 +482,7 @@ bool QDarwinAudioSink::open() return false; } -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) //Set Audio Device if (AudioUnitSetProperty(m_audioUnit, kAudioOutputUnitProperty_CurrentDevice, @@ -574,7 +513,7 @@ bool QDarwinAudioSink::open() // Allocate buffer UInt32 numberOfFrames = 0; -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) size = sizeof(UInt32); if (AudioUnitGetProperty(m_audioUnit, kAudioDevicePropertyBufferFrameSize, @@ -597,10 +536,12 @@ bool QDarwinAudioSink::open() else m_internalBufferSize -= m_internalBufferSize % m_streamFormat.mBytesPerFrame; - m_audioBuffer = new QDarwinAudioSinkBuffer(m_internalBufferSize, m_periodSizeBytes, m_audioFormat); - connect(m_audioBuffer, SIGNAL(readyRead()), SLOT(inputReady())); //Pull + m_audioBuffer = std::make_unique<QDarwinAudioSinkBuffer>(m_internalBufferSize, + m_periodSizeBytes, m_audioFormat); + connect(m_audioBuffer.get(), &QDarwinAudioSinkBuffer::readyRead, this, + &QDarwinAudioSink::inputReady); // Pull - m_audioIO = new QDarwinAudioSinkDevice(m_audioBuffer, this); + m_audioIO = new QDarwinAudioSinkDevice(m_audioBuffer.get(), this); //Init if (AudioUnitInitialize(m_audioUnit)) { @@ -618,77 +559,49 @@ bool QDarwinAudioSink::open() void QDarwinAudioSink::close() { if (m_audioUnit != 0) { - AudioOutputUnitStop(m_audioUnit); + m_stateMachine.stop(); + AudioUnitUninitialize(m_audioUnit); AudioComponentInstanceDispose(m_audioUnit); + m_audioUnit = 0; } - delete m_audioBuffer; -} - -void QDarwinAudioSink::audioThreadStart() -{ - QMutexLocker lock(&m_mutex); - startTimers(); - m_audioThreadState.storeRelaxed(Running); - AudioOutputUnitStart(m_audioUnit); + m_audioBuffer.reset(); } -void QDarwinAudioSink::audioThreadStop() +void QDarwinAudioSink::onAudioDeviceIdle() { - QMutexLocker lock(&m_mutex); - stopTimers(); - if (m_audioThreadState.testAndSetAcquire(Running, Stopped)) - m_threadFinished.wait(&m_mutex, 500); + const bool atEnd = m_audioBuffer->deviceAtEnd(); + if (!m_stateMachine.updateActiveOrIdle(false, atEnd ? QAudio::NoError : QAudio::UnderrunError)) + onAudioDeviceDrained(); } -void QDarwinAudioSink::audioThreadDrain() +void QDarwinAudioSink::onAudioDeviceDrained() { - QMutexLocker lock(&m_mutex); - stopTimers(); - if (m_audioThreadState.testAndSetAcquire(Running, Draining)) - m_threadFinished.wait(&m_mutex, 500); + if (m_stateMachine.onDrained()) + m_drainSemaphore.release(); } -void QDarwinAudioSink::audioDeviceStop() +void QDarwinAudioSink::onAudioDeviceError() { - AudioOutputUnitStop(m_audioUnit); - m_audioThreadState.storeRelaxed(Stopped); - m_threadFinished.wakeOne(); -} - -void QDarwinAudioSink::audioDeviceIdle() -{ - if (m_stateCode != QAudio::ActiveState) - return; - - audioDeviceStop(); - - m_errorCode = QAudio::UnderrunError; - m_stateCode = QAudio::IdleState; - QMetaObject::invokeMethod(this, "deviceStopped", Qt::QueuedConnection); + m_stateMachine.stop(QAudio::IOError); } -void QDarwinAudioSink::audioDeviceError() +void QDarwinAudioSink::updateAudioDevice() { - if (m_stateCode != QAudio::ActiveState) - return; + const auto state = m_stateMachine.state(); - audioDeviceStop(); - - m_errorCode = QAudio::IOError; - m_stateCode = QAudio::StoppedState; - QMetaObject::invokeMethod(this, "deviceStopped", Qt::QueuedConnection); -} + Q_ASSERT(m_audioBuffer); + Q_ASSERT(m_audioUnit); -void QDarwinAudioSink::startTimers() -{ - m_audioBuffer->startFillTimer(); -} + if (state == QAudio::StoppedState) + m_audioBuffer->reset(); + else + m_audioBuffer->setFillingEnabled(state != QAudio::SuspendedState); -void QDarwinAudioSink::stopTimers() -{ - m_audioBuffer->stopFillTimer(); + const bool unitStarted = state == QAudio::ActiveState; + if (std::exchange(m_audioUnitStarted, unitStarted) != unitStarted) + (unitStarted ? AudioOutputUnitStart : AudioOutputUnitStop)(m_audioUnit); } QT_END_NAMESPACE diff --git a/src/multimedia/darwin/qdarwinaudiosink_p.h b/src/multimedia/darwin/qdarwinaudiosink_p.h index bc72c50a1..1fddcb205 100644 --- a/src/multimedia/darwin/qdarwinaudiosink_p.h +++ b/src/multimedia/darwin/qdarwinaudiosink_p.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 IOSAUDIOOUTPUT_H #define IOSAUDIOOUTPUT_H @@ -51,17 +15,17 @@ // #include <private/qaudiosystem_p.h> +#include <private/qaudiostatemachine_p.h> -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) # include <CoreAudio/CoreAudio.h> #endif #include <AudioUnit/AudioUnit.h> #include <CoreAudio/CoreAudioTypes.h> #include <QtCore/QIODevice> -#include <QtCore/QWaitCondition> -#include <QtCore/QMutex> #include <qdarwinaudiodevice_p.h> +#include <qsemaphore.h> QT_BEGIN_NAMESPACE @@ -82,12 +46,16 @@ public: qint64 writeBytes(const char *data, qint64 maxSize); int available() const; + + bool deviceAtEnd() const; + void reset(); void setPrefetchDevice(QIODevice *device); - void startFillTimer(); - void stopFillTimer(); + QIODevice *prefetchDevice() const; + + void setFillingEnabled(bool enabled); signals: void readyRead(); @@ -96,13 +64,15 @@ private slots: void fillBuffer(); private: - bool m_deviceError; - int m_maxPeriodSize; - int m_bytesPerFrame; - int m_periodTime; - QIODevice *m_device; - QTimer *m_fillTimer; - CoreAudioRingBuffer *m_buffer; + bool m_deviceError = false; + bool m_fillingEnabled = false; + bool m_deviceAtEnd = false; + const int m_maxPeriodSize = 0; + const int m_bytesPerFrame = 0; + const int m_periodTime = 0; + QIODevice *m_device = nullptr; + QTimer *m_fillTimer = nullptr; + std::unique_ptr<CoreAudioRingBuffer> m_buffer; }; class QDarwinAudioSinkDevice : public QIODevice @@ -125,7 +95,7 @@ class QDarwinAudioSink : public QPlatformAudioSink Q_OBJECT public: - QDarwinAudioSink(const QAudioDevice &device); + QDarwinAudioSink(const QAudioDevice &device, QObject *parent); ~QDarwinAudioSink(); void start(QIODevice *device); @@ -147,15 +117,11 @@ public: qreal volume() const; private slots: - void deviceStopped(); void inputReady(); + void updateAudioDevice(); private: - enum { - Running, - Draining, - Stopped - }; + enum ThreadState { Running, Draining, Stopped }; static OSStatus renderCallback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, @@ -166,15 +132,9 @@ private: bool open(); void close(); - void audioThreadStart(); - void audioThreadStop(); - void audioThreadDrain(); - void audioDeviceStop(); - void audioDeviceIdle(); - void audioDeviceError(); - - void startTimers(); - void stopTimers(); + void onAudioDeviceIdle(); + void onAudioDeviceError(); + void onAudioDeviceDrained(); QAudioDevice m_audioDeviceInfo; QByteArray m_device; @@ -191,20 +151,18 @@ private: AudioDeviceID m_audioDeviceId; #endif AudioUnit m_audioUnit = 0; + bool m_audioUnitStarted = false; Float64 m_clockFrequency = 0; AudioStreamBasicDescription m_streamFormat; - QDarwinAudioSinkBuffer *m_audioBuffer = nullptr; - QAtomicInt m_audioThreadState; - QWaitCondition m_threadFinished; - QMutex m_mutex; + std::unique_ptr<QDarwinAudioSinkBuffer> m_audioBuffer; qreal m_cachedVolume = 1.; #if defined(Q_OS_MACOS) qreal m_volume = 1.; #endif bool m_pullMode = false; - QAudio::Error m_errorCode = QAudio::NoError; - QAudio::State m_stateCode = QAudio::StoppedState; + QAudioStateMachine m_stateMachine; + QSemaphore m_drainSemaphore; }; QT_END_NAMESPACE diff --git a/src/multimedia/darwin/qdarwinaudiosource.mm b/src/multimedia/darwin/qdarwinaudiosource.mm index 7f9b9bc95..4c1345fb8 100644 --- a/src/multimedia/darwin/qdarwinaudiosource.mm +++ b/src/multimedia/darwin/qdarwinaudiosource.mm @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2022 The Qt Company Ltd and/or its subsidiary(-ies). -** 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) 2022 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 "qdarwinaudiosource_p.h" #include "qcoreaudiosessionmanager_p.h" #include "qdarwinaudiodevice_p.h" @@ -43,7 +7,7 @@ #include "qdarwinmediadevices_p.h" #include <qmediadevices.h> -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) # include <AudioUnit/AudioComponent.h> #endif @@ -205,7 +169,7 @@ QDarwinAudioSourceBuffer::QDarwinAudioSourceBuffer(int bufferSize, int maxPeriod m_inputBufferList = new QCoreAudioBufferList(m_inputFormat); m_flushTimer = new QTimer(this); - connect(m_flushTimer, SIGNAL(timeout()), SLOT(flushBuffer())); + connect(m_flushTimer, SIGNAL(timeout()), this, SLOT(flushBuffer())); if (CoreAudioUtils::toQAudioFormat(inputFormat) != CoreAudioUtils::toQAudioFormat(outputFormat)) { if (AudioConverterNew(&m_inputFormat, &m_outputFormat, &m_audioConverter) != noErr) { @@ -432,7 +396,7 @@ QDarwinAudioSourceDevice::QDarwinAudioSourceDevice(QDarwinAudioSourceBuffer *aud , m_audioBuffer(audioBuffer) { open(QIODevice::ReadOnly | QIODevice::Unbuffered); - connect(m_audioBuffer, SIGNAL(readyRead()), SIGNAL(readyRead())); + connect(m_audioBuffer, SIGNAL(readyRead()), this, SIGNAL(readyRead())); } qint64 QDarwinAudioSourceDevice::readData(char *data, qint64 len) @@ -448,8 +412,9 @@ qint64 QDarwinAudioSourceDevice::writeData(const char *data, qint64 len) return 0; } -QDarwinAudioSource::QDarwinAudioSource(const QAudioDevice &device) - : m_audioDeviceInfo(device) +QDarwinAudioSource::QDarwinAudioSource(const QAudioDevice &device, QObject *parent) + : QPlatformAudioSource(parent) + , m_audioDeviceInfo(device) , m_isOpen(false) , m_internalBufferSize(DEFAULT_BUFFER_SIZE) , m_totalFrames(0) @@ -489,7 +454,7 @@ bool QDarwinAudioSource::open() AudioComponentDescription componentDescription; componentDescription.componentType = kAudioUnitType_Output; -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) componentDescription.componentSubType = kAudioUnitSubType_HALOutput; #else componentDescription.componentSubType = kAudioUnitSubType_RemoteIO; @@ -548,7 +513,7 @@ bool QDarwinAudioSource::open() return false; } -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) //Set Audio Device if (AudioUnitSetProperty(m_audioUnit, kAudioOutputUnitProperty_CurrentDevice, @@ -564,7 +529,7 @@ bool QDarwinAudioSource::open() //set format m_streamFormat = CoreAudioUtils::toAudioStreamBasicDescription(m_audioFormat); -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) UInt32 size = 0; if (m_audioFormat == m_audioDeviceInfo.preferredFormat()) { @@ -577,7 +542,7 @@ bool QDarwinAudioSource::open() 1, &m_deviceFormat, sizeof(m_deviceFormat)); -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) } else { size = sizeof(m_deviceFormat); if (AudioUnitGetProperty(m_audioUnit, @@ -604,7 +569,7 @@ bool QDarwinAudioSource::open() //setup buffers UInt32 numberOfFrames; -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) size = sizeof(UInt32); if (AudioUnitGetProperty(m_audioUnit, kAudioDevicePropertyBufferFrameSize, diff --git a/src/multimedia/darwin/qdarwinaudiosource_p.h b/src/multimedia/darwin/qdarwinaudiosource_p.h index 681230994..87c3c1070 100644 --- a/src/multimedia/darwin/qdarwinaudiosource_p.h +++ b/src/multimedia/darwin/qdarwinaudiosource_p.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 IOSAUDIOINPUT_H #define IOSAUDIOINPUT_H @@ -201,7 +165,7 @@ class QDarwinAudioSource : public QPlatformAudioSource Q_OBJECT public: - QDarwinAudioSource(const QAudioDevice &device); + QDarwinAudioSource(const QAudioDevice &device, QObject *parent); ~QDarwinAudioSource(); void start(QIODevice *device); @@ -262,7 +226,7 @@ private: QAudioFormat m_audioFormat; QIODevice *m_audioIO; AudioUnit m_audioUnit; -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) AudioDeviceID m_audioDeviceId; #endif Float64 m_clockFrequency; diff --git a/src/multimedia/darwin/qdarwinmediadevices.mm b/src/multimedia/darwin/qdarwinmediadevices.mm index 1770e3707..b0a108935 100644 --- a/src/multimedia/darwin/qdarwinmediadevices.mm +++ b/src/multimedia/darwin/qdarwinmediadevices.mm @@ -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 "qdarwinmediadevices_p.h" #include "qmediadevices.h" @@ -44,206 +8,262 @@ #include "qdarwinaudiosource_p.h" #include "qdarwinaudiosink_p.h" +#include <qloggingcategory.h> + #include <qdebug.h> -#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) +#if defined(Q_OS_IOS) #include "qcoreaudiosessionmanager_p.h" #import <AVFoundation/AVFoundation.h> +#else +#include "qmacosaudiodatautils_p.h" +#endif + +#if defined(Q_OS_MACOS) +static Q_LOGGING_CATEGORY(qLcDarwinMediaDevices, "qt.multimedia.darwin.mediaDevices") #endif QT_BEGIN_NAMESPACE +template<typename... Args> +QAudioDevice createAudioDevice(bool isDefault, Args &&...args) +{ + auto *dev = new QCoreAudioDeviceInfo(std::forward<Args>(args)...); + dev->isDefault = isDefault; + return dev->create(); +} + #if defined(Q_OS_MACOS) -AudioDeviceID defaultAudioDevice(QAudioDevice::Mode mode) + +static AudioDeviceID defaultAudioDevice(QAudioDevice::Mode mode) { - AudioDeviceID audioDevice; - UInt32 size = sizeof(audioDevice); const AudioObjectPropertySelector selector = (mode == QAudioDevice::Output) ? kAudioHardwarePropertyDefaultOutputDevice : kAudioHardwarePropertyDefaultInputDevice; - AudioObjectPropertyAddress defaultDevicePropertyAddress = { selector, - kAudioObjectPropertyScopeGlobal, - kAudioObjectPropertyElementMaster }; - - if (AudioObjectGetPropertyData(kAudioObjectSystemObject, - &defaultDevicePropertyAddress, - 0, NULL, &size, &audioDevice) != noErr) { - qWarning("QAudioDevice: Unable to find default %s device", (mode == QAudioDevice::Output) ? "output" : "input"); - return 0; + const AudioObjectPropertyAddress propertyAddress = { + selector, + kAudioObjectPropertyScopeGlobal, + kAudioObjectPropertyElementMain, + }; + + if (auto audioDevice = getAudioObject<AudioDeviceID>(kAudioObjectSystemObject, propertyAddress, + "Default Device")) { + return *audioDevice; } - return audioDevice; + return 0; } static QByteArray uniqueId(AudioDeviceID device, QAudioDevice::Mode mode) { - CFStringRef name; - UInt32 size = sizeof(CFStringRef); - - AudioObjectPropertyScope audioPropertyScope = mode == QAudioDevice::Input ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput; - - AudioObjectPropertyAddress audioDeviceNamePropertyAddress = { kAudioDevicePropertyDeviceUID, - audioPropertyScope, - kAudioObjectPropertyElementMaster }; + const AudioObjectPropertyAddress propertyAddress = + makePropertyAddress(kAudioDevicePropertyDeviceUID, mode); - if (AudioObjectGetPropertyData(device, &audioDeviceNamePropertyAddress, 0, NULL, &size, &name) != noErr) { - qWarning() << "QAudioDevice: Unable to get device UID"; - return QByteArray(); + if (auto name = getAudioObject<CFStringRef>(device, propertyAddress, "Device UID")) { + QString s = QString::fromCFString(*name); + CFRelease(*name); + return s.toUtf8(); } - QString s = QString::fromCFString(name); - CFRelease(name); - return s.toUtf8(); + return QByteArray(); } -QList<QAudioDevice> availableAudioDevices(QAudioDevice::Mode mode) +static QList<QAudioDevice> availableAudioDevices(QAudioDevice::Mode mode) { - QList<QAudioDevice> devices; AudioDeviceID defaultDevice = defaultAudioDevice(mode); - if (defaultDevice != 0) { - auto *dev = new QCoreAudioDeviceInfo(defaultDevice, uniqueId(defaultDevice, mode), mode); - dev->isDefault = true; - devices << dev->create(); + if (defaultDevice != 0) + devices << createAudioDevice(true, defaultDevice, uniqueId(defaultDevice, mode), mode); + + const AudioObjectPropertyAddress audioDevicesPropertyAddress = { + kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, + kAudioObjectPropertyElementMain + }; + + if (auto audioDevices = getAudioData<AudioDeviceID>( + kAudioObjectSystemObject, audioDevicesPropertyAddress, "Audio Devices")) { + const AudioObjectPropertyAddress audioDeviceStreamFormatPropertyAddress = + makePropertyAddress(kAudioDevicePropertyStreamFormat, mode); + + for (const auto &device : *audioDevices) { + if (device == defaultDevice) + continue; + + if (getAudioObject<AudioStreamBasicDescription>(device, + audioDeviceStreamFormatPropertyAddress, + nullptr /*don't print logs*/)) { + devices << createAudioDevice(false, device, uniqueId(device, mode), mode); + } + } } - UInt32 propSize = 0; - AudioObjectPropertyAddress audioDevicesPropertyAddress = { kAudioHardwarePropertyDevices, - kAudioObjectPropertyScopeGlobal, - kAudioObjectPropertyElementMaster }; + return devices; +} - if (AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, - &audioDevicesPropertyAddress, - 0, NULL, &propSize) == noErr) { +static OSStatus audioDeviceChangeListener(AudioObjectID id, UInt32, + const AudioObjectPropertyAddress *address, void *ptr) +{ + Q_ASSERT(address); + Q_ASSERT(ptr); + + QDarwinMediaDevices *instance = static_cast<QDarwinMediaDevices *>(ptr); + + qCDebug(qLcDarwinMediaDevices) + << "audioDeviceChangeListener: id:" << id << "address: " << address->mSelector + << address->mScope << address->mElement; + + switch (address->mSelector) { + case kAudioHardwarePropertyDefaultInputDevice: + instance->onInputsUpdated(); + break; + case kAudioHardwarePropertyDefaultOutputDevice: + instance->onOutputsUpdated(); + break; + default: + instance->onInputsUpdated(); + instance->onOutputsUpdated(); + break; + } + + return 0; +} - const int dc = propSize / sizeof(AudioDeviceID); +static constexpr AudioObjectPropertyAddress listenerAddresses[] = { + { kAudioHardwarePropertyDefaultInputDevice, kAudioObjectPropertyScopeGlobal, + kAudioObjectPropertyElementMain }, + { kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal, + kAudioObjectPropertyElementMain }, + { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, + kAudioObjectPropertyElementMain } +}; - if (dc > 0) { - AudioDeviceID* audioDevices = new AudioDeviceID[dc]; +static void setAudioListeners(QDarwinMediaDevices &instance) +{ + for (const auto &address : listenerAddresses) { + const auto err = AudioObjectAddPropertyListener(kAudioObjectSystemObject, &address, + audioDeviceChangeListener, &instance); + + if (err) + qWarning() << "Fail to add listener. mSelector:" << address.mSelector + << "mScope:" << address.mScope << "mElement:" << address.mElement + << "err:" << err; + } +} - if (AudioObjectGetPropertyData(kAudioObjectSystemObject, &audioDevicesPropertyAddress, 0, NULL, &propSize, audioDevices) == noErr) { - for (int i = 0; i < dc; ++i) { - if (audioDevices[i] == defaultDevice) - continue; +static void removeAudioListeners(QDarwinMediaDevices &instance) +{ + for (const auto &address : listenerAddresses) { + const auto err = AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &address, + audioDeviceChangeListener, &instance); + + if (err) + qWarning() << "Fail to remove listener. mSelector:" << address.mSelector + << "mScope:" << address.mScope << "mElement:" << address.mElement + << "err:" << err; + } +} - AudioStreamBasicDescription sf; - UInt32 size = sizeof(AudioStreamBasicDescription); - AudioObjectPropertyAddress audioDeviceStreamFormatPropertyAddress = { kAudioDevicePropertyStreamFormat, - (mode == QAudioDevice::Input ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput), - kAudioObjectPropertyElementMaster }; +#elif defined(Q_OS_IOS) - if (AudioObjectGetPropertyData(audioDevices[i], &audioDeviceStreamFormatPropertyAddress, 0, NULL, &size, &sf) == noErr) - devices << (new QCoreAudioDeviceInfo(audioDevices[i], uniqueId(audioDevices[i], mode), mode))->create(); - } - } +static QList<QAudioDevice> availableAudioDevices(QAudioDevice::Mode mode) +{ + QList<QAudioDevice> devices; - delete[] audioDevices; + if (mode == QAudioDevice::Output) { + devices.append(createAudioDevice(true, "default", QAudioDevice::Output)); + } else { + AVCaptureDevice *defaultDevice = + [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeAudio]; + + // TODO: Support Bluetooth and USB devices + AVCaptureDeviceDiscoverySession *captureDeviceDiscoverySession = + [AVCaptureDeviceDiscoverySession + discoverySessionWithDeviceTypes:@[ AVCaptureDeviceTypeBuiltInMicrophone ] + mediaType:AVMediaTypeAudio + position:AVCaptureDevicePositionUnspecified]; + + NSArray *captureDevices = [captureDeviceDiscoverySession devices]; + for (AVCaptureDevice *device in captureDevices) { + const bool isDefault = + defaultDevice && [defaultDevice.uniqueID isEqualToString:device.uniqueID]; + devices.append(createAudioDevice(isDefault, + QString::fromNSString(device.uniqueID).toUtf8(), + QAudioDevice::Input)); } } return devices; } -static OSStatus -audioDeviceChangeListener(AudioObjectID, UInt32, const AudioObjectPropertyAddress*, void* ptr) +static void setAudioListeners(QDarwinMediaDevices &) { - QDarwinMediaDevices *m = static_cast<QDarwinMediaDevices *>(ptr); - m->updateAudioDevices(); - return 0; + // ### This should use the audio session manager +} + +static void removeAudioListeners(QDarwinMediaDevices &) +{ + // ### This should use the audio session manager } + #endif QDarwinMediaDevices::QDarwinMediaDevices() : QPlatformMediaDevices() { - -#ifdef Q_OS_MACOS - OSStatus err = noErr; - AudioObjectPropertyAddress *audioDevicesAddress = new AudioObjectPropertyAddress{ kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster }; - m_audioDevicesProperty = audioDevicesAddress; - err = AudioObjectAddPropertyListener(kAudioObjectSystemObject, audioDevicesAddress, audioDeviceChangeListener, this); - if (err) - qDebug("error on AudioObjectAddPropertyListener"); -#else - // ### This should use the audio session manager +#ifdef Q_OS_MACOS // TODO: implement setAudioListeners, removeAudioListeners for Q_OS_IOS, after + // that - remove or modify the define + m_cachedAudioInputs = availableAudioDevices(QAudioDevice::Input); + m_cachedAudioOutputs = availableAudioDevices(QAudioDevice::Output); #endif - updateAudioDevices(); + + setAudioListeners(*this); } QDarwinMediaDevices::~QDarwinMediaDevices() { - -#ifdef Q_OS_MACOS - AudioObjectRemovePropertyListener(kAudioObjectSystemObject, (AudioObjectPropertyAddress *)m_audioDevicesProperty, audioDeviceChangeListener, this); -#endif + removeAudioListeners(*this); } QList<QAudioDevice> QDarwinMediaDevices::audioInputs() const { -#ifdef Q_OS_IOS - AVCaptureDevice *defaultDevice = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeAudio]; - - // TODO: Support Bluetooth and USB devices - QList<QAudioDevice> devices; - AVCaptureDeviceDiscoverySession *captureDeviceDiscoverySession = [AVCaptureDeviceDiscoverySession - discoverySessionWithDeviceTypes:@[AVCaptureDeviceTypeBuiltInMicrophone] - mediaType:AVMediaTypeAudio - position:AVCaptureDevicePositionUnspecified]; - - NSArray *captureDevices = [captureDeviceDiscoverySession devices]; - for (AVCaptureDevice *device in captureDevices) { - auto *dev = new QCoreAudioDeviceInfo(QString::fromNSString(device.uniqueID).toUtf8(), QAudioDevice::Input); - if (defaultDevice && [defaultDevice.uniqueID isEqualToString:device.uniqueID]) - dev->isDefault = true; - devices << dev->create(); - } - return devices; -#else return availableAudioDevices(QAudioDevice::Input); -#endif } QList<QAudioDevice> QDarwinMediaDevices::audioOutputs() const { -#ifdef Q_OS_IOS - QList<QAudioDevice> devices; - auto *dev = new QCoreAudioDeviceInfo("default", QAudioDevice::Output); - dev->isDefault = true; - devices.append(dev->create()); - return devices; -#else return availableAudioDevices(QAudioDevice::Output); -#endif } -void QDarwinMediaDevices::updateAudioDevices() +void QDarwinMediaDevices::onInputsUpdated() { -#ifdef Q_OS_MACOS - QList<QAudioDevice> inputs = availableAudioDevices(QAudioDevice::Input); - if (m_audioInputs != inputs) { - m_audioInputs = inputs; - audioInputsChanged(); + auto inputs = availableAudioDevices(QAudioDevice::Input); + if (m_cachedAudioInputs != inputs) { + m_cachedAudioInputs = inputs; + emit audioInputsChanged(); } +} - QList<QAudioDevice> outputs = availableAudioDevices(QAudioDevice::Output); - if (m_audioOutputs!= outputs) { - m_audioOutputs = outputs; - audioOutputsChanged(); +void QDarwinMediaDevices::onOutputsUpdated() +{ + auto outputs = availableAudioDevices(QAudioDevice::Output); + if (m_cachedAudioOutputs != outputs) { + m_cachedAudioOutputs = outputs; + emit audioOutputsChanged(); } -#endif } -QPlatformAudioSource *QDarwinMediaDevices::createAudioSource(const QAudioDevice &info) +QPlatformAudioSource *QDarwinMediaDevices::createAudioSource(const QAudioDevice &info, + QObject *parent) { - return new QDarwinAudioSource(info); + return new QDarwinAudioSource(info, parent); } -QPlatformAudioSink *QDarwinMediaDevices::createAudioSink(const QAudioDevice &info) +QPlatformAudioSink *QDarwinMediaDevices::createAudioSink(const QAudioDevice &info, + QObject *parent) { - return new QDarwinAudioSink(info); + return new QDarwinAudioSink(info, parent); } - QT_END_NAMESPACE diff --git a/src/multimedia/darwin/qdarwinmediadevices_p.h b/src/multimedia/darwin/qdarwinmediadevices_p.h index 95fda5ee0..0c7a45433 100644 --- a/src/multimedia/darwin/qdarwinmediadevices_p.h +++ b/src/multimedia/darwin/qdarwinmediadevices_p.h @@ -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 #ifndef QDARWINMEDIADEVICES_H #define QDARWINMEDIADEVICES_H @@ -63,22 +27,21 @@ class QDarwinMediaDevices : public QPlatformMediaDevices { public: QDarwinMediaDevices(); - ~QDarwinMediaDevices(); + ~QDarwinMediaDevices() override; QList<QAudioDevice> audioInputs() const override; QList<QAudioDevice> audioOutputs() const override; - QPlatformAudioSource *createAudioSource(const QAudioDevice &info) override; - QPlatformAudioSink *createAudioSink(const QAudioDevice &info) override; + QPlatformAudioSource *createAudioSource(const QAudioDevice &info, + QObject *parent) override; + QPlatformAudioSink *createAudioSink(const QAudioDevice &info, + QObject *parent) override; - void updateAudioDevices(); + void onInputsUpdated(); + void onOutputsUpdated(); private: - QList<QAudioDevice> m_audioInputs; - QList<QAudioDevice> m_audioOutputs; - -#ifdef Q_OS_MACOS - void *m_audioDevicesProperty; -#endif + QList<QAudioDevice> m_cachedAudioInputs; + QList<QAudioDevice> m_cachedAudioOutputs; }; QT_END_NAMESPACE diff --git a/src/multimedia/darwin/qmacosaudiodatautils_p.h b/src/multimedia/darwin/qmacosaudiodatautils_p.h new file mode 100644 index 000000000..8cc2f8440 --- /dev/null +++ b/src/multimedia/darwin/qmacosaudiodatautils_p.h @@ -0,0 +1,112 @@ +// 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 + +#ifndef QMACOSAUDIODATAUTILS_P_H +#define QMACOSAUDIODATAUTILS_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <CoreAudio/AudioHardware.h> + +#include "qaudiodevice.h" +#include "qdebug.h" + +#include <optional> +#include <vector> +#include <algorithm> + +QT_BEGIN_NAMESPACE + +template<typename... Args> +void printUnableToReadWarning(const char *logName, AudioObjectID objectID, const AudioObjectPropertyAddress &address, Args &&...args) +{ + if (!logName) + return; + + char scope[5] = {0}; + memcpy(&scope, &address.mScope, 4); + std::reverse(scope, scope + 4); + + auto warn = qWarning(); + warn << "Unable to read property" << logName << "for object" << objectID << ", scope" << scope << ";"; + (warn << ... << args); + warn << "\n If the warning is unexpected use test_audio_config to get comprehensive audio info and report a bug"; +} + +inline static AudioObjectPropertyAddress +makePropertyAddress(AudioObjectPropertySelector selector, QAudioDevice::Mode mode, + AudioObjectPropertyElement element = kAudioObjectPropertyElementMain) +{ + return { selector, + mode == QAudioDevice::Input ? kAudioDevicePropertyScopeInput + : kAudioDevicePropertyScopeOutput, + element }; +} + +inline static bool getAudioData(AudioObjectID objectID, const AudioObjectPropertyAddress &address, + void *dst, UInt32 dstSize, const char *logName) +{ + UInt32 readBytes = dstSize; + const auto res = AudioObjectGetPropertyData(objectID, &address, 0, nullptr, &readBytes, dst); + + if (res != noErr) + printUnableToReadWarning(logName, objectID, address, "Err:", res); + else if (readBytes != dstSize) + printUnableToReadWarning(logName, objectID, address, "Data size", readBytes, "VS", dstSize, + "expected"); + else + return true; + + return false; +} + +template<typename T> +std::optional<std::vector<T>> getAudioData(AudioObjectID objectID, + const AudioObjectPropertyAddress &address, + const char *logName, size_t minDataSize = 0) +{ + static_assert(std::is_trivial_v<T>, "A trivial type is expected"); + + UInt32 size = 0; + const auto res = AudioObjectGetPropertyDataSize(objectID, &address, 0, nullptr, &size); + + if (res != noErr) { + printUnableToReadWarning(logName, objectID, address, + "AudioObjectGetPropertyDataSize failed, Err:", res); + } else if (size / sizeof(T) < minDataSize) { + printUnableToReadWarning(logName, objectID, address, "Data size is too small:", size, "VS", + minDataSize * sizeof(T), "bytes"); + } else { + std::vector<T> data(size / sizeof(T)); + if (getAudioData(objectID, address, data.data(), data.size() * sizeof(T), logName)) + return { std::move(data) }; + } + + return {}; +} + +template<typename T> +std::optional<T> getAudioObject(AudioObjectID objectID, const AudioObjectPropertyAddress &address, + const char *logName) +{ + static_assert(std::is_trivial_v<T>, "A trivial type is expected"); + + T object{}; + if (getAudioData(objectID, address, &object, sizeof(T), logName)) + return { object }; + + return {}; +} + +QT_END_NAMESPACE + +#endif // QMACOSAUDIODATAUTILS_P_H diff --git a/src/multimedia/doc/QtMultimediaDoc b/src/multimedia/doc/QtMultimediaDoc index 13b8e7229..e57c3595b 100644 --- a/src/multimedia/doc/QtMultimediaDoc +++ b/src/multimedia/doc/QtMultimediaDoc @@ -1,9 +1,2 @@ #include <QtMultimedia/QtMultimedia> #include <QtMultimediaWidgets/QtMultimediaWidgets> - -#include "../audio/qaudiosystem_p.h" -#include "../platform/qplatformaudiodecoder_p.h" -#include "../platform/qplatformcamera_p.h" -#include "../platform/qplatformmediarecorder_p.h" -#include "../platform/qplatformimagecapture_p.h" -#include "../platform/qplatformvideosink_p.h" diff --git a/src/multimedia/doc/qtmultimedia.qdocconf b/src/multimedia/doc/qtmultimedia.qdocconf index f93091179..97e6dc696 100644 --- a/src/multimedia/doc/qtmultimedia.qdocconf +++ b/src/multimedia/doc/qtmultimedia.qdocconf @@ -1,6 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) include($QT_INSTALL_DOCS/config/exampleurl-qtmultimedia.qdocconf) -include(../../../examples/multimedia/video/mediaplayer/doc/qmlmediaplayer.qdocconf) project = QtMultimedia description = Qt Multimedia Documentation @@ -9,6 +8,8 @@ version = $QT_VERSION moduleheader = QtMultimediaDoc includepaths += . +examplesinstallpath = multimedia + # The following parameters are for creating a qhp file, the qhelpgenerator # program can convert the qhp file into a qch file which can be opened in # Qt Assistant and/or Qt Creator. @@ -37,7 +38,7 @@ qhp.QtMultimedia.subprojects.widgetclasses.sortPages = true qhp.QtMultimedia.subprojects.qmltypes.title = QML Types qhp.QtMultimedia.subprojects.qmltypes.indexTitle = Qt Multimedia QML Types -qhp.QtMultimedia.subprojects.qmltypes.selectors = qmlclass +qhp.QtMultimedia.subprojects.qmltypes.selectors = qmltype qhp.QtMultimedia.subprojects.qmltypes.sortPages = true qhp.QtMultimedia.subprojects.examples.title = Examples @@ -45,24 +46,22 @@ qhp.QtMultimedia.subprojects.examples.indexTitle = Qt Multimedia Examples qhp.QtMultimedia.subprojects.examples.selectors = doc:example qhp.QtMultimedia.subprojects.examples.sortPages = true -exampledirs += ../../../examples \ +exampledirs += ../../../examples/multimedia \ + ../../../examples/multimediawidgets \ snippets \ ../../multimediawidgets/doc/snippets -manifestmeta.highlighted.names = "QtMultimedia/QML Media Player Example" \ - "QtMultimedia/Media Player Example" \ - "QtMultimedia/Camera Example" \ - "QtMultimedia/QML Recorder Example" \ - -headerdirs += ../.. +headerdirs += .. \ + ../../multimediawidgets \ + ../../multimediaquick imagedirs += src/images \ -sourcedirs += ../.. - -excludedirs += ../../gsttools +sourcedirs += .. \ + ../../multimediawidgets \ + ../../multimediaquick -depends += qtcore qtdoc qtgui qtquick qtqml qtwidgets qtnetwork qmake qtcmake qtquickcontrols +depends += qtcore qtdoc qtgui qtquick qtqml qtwidgets qtnetwork qmake qtcmake qtquickcontrols qtspatialaudio # Ignore \since commands for versions earlier than 6.3 ignoresince = 6.3 @@ -71,5 +70,13 @@ navigation.landingpage = "Qt Multimedia" navigation.cppclassespage = "Qt Multimedia C++ Classes" navigation.qmltypespage = "Qt Multimedia QML Types" +# Highlighted examples in Graphics & Multimedia category +manifestmeta.highlighted.names = \ + "QtMultimedia/Screen Capture Example" \ + "QtMultimedia/QML Video Recorder" + +# Highlighted examples in Mobile category +manifestmeta.highlighted.names += "QtMultimedia/QML Camera Application" + # Fail the documentation build if there are more warnings than the limit warninglimit = 0 diff --git a/src/multimedia/doc/snippets/CMakeLists.txt b/src/multimedia/doc/snippets/CMakeLists.txt index e178b6c10..c3937477b 100644 --- a/src/multimedia/doc/snippets/CMakeLists.txt +++ b/src/multimedia/doc/snippets/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + cmake_minimum_required(VERSION 3.16) project(multimedia_cppsnippets) diff --git a/src/multimedia/doc/snippets/doc_src_qtmultimedia.cpp b/src/multimedia/doc/snippets/doc_src_qtmultimedia.cpp deleted file mode 100644 index a56283474..000000000 --- a/src/multimedia/doc/snippets/doc_src_qtmultimedia.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//! [0] -#include <QtMultimedia> -//! [0] diff --git a/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp b/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp index 24045adab..565f7b29b 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp +++ b/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Mobility Components. -** -** $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 BSD-3-Clause /* Audio related snippets */ #include <QFile> @@ -87,9 +51,9 @@ void AudioInputExample::setup() } audio = new QAudioSource(format, this); - connect(audio, SIGNAL(stateChanged(QAudio::State)), this, SLOT(handleStateChanged(QAudio::State))); + connect(audio, &QAudioSource::stateChanged, this, &AudioInputExample::handleStateChanged); - QTimer::singleShot(3000, this, SLOT(stopRecording())); + QTimer::singleShot(3000, this, &AudioInputExample::stopRecording); audio->start(&destinationFile); // Records audio for 3000ms } @@ -135,6 +99,7 @@ public: public Q_SLOTS: void handleStateChanged(QAudio::State newState); + void stopAudioOutput(); private: //! [Audio output class members] @@ -156,27 +121,34 @@ void AudioOutputExample::setup() format.setChannelCount(1); format.setSampleFormat(QAudioFormat::UInt8); - QAudioDevice info(QAudioDevice::defaultOutputDevice()); + QAudioDevice info(QMediaDevices::defaultAudioOutput()); if (!info.isFormatSupported(format)) { qWarning() << "Raw audio format not supported by backend, cannot play audio."; return; } audio = new QAudioSink(format, this); - connect(audio, SIGNAL(stateChanged(QAudio::State)), this, SLOT(handleStateChanged(QAudio::State))); + connect(audio, QAudioSink::stateChanged, this, &AudioInputExample::handleStateChanged); audio->start(&sourceFile); } //! [Audio output setup] +//! [Audio output stop] +void AudioOutputExample::stopAudioOutput() +{ + audio->stop(); + sourceFile.close(); + delete audio; +} +//! [Audio output stop] + //! [Audio output state changed] void AudioOutputExample::handleStateChanged(QAudio::State newState) { switch (newState) { case QAudio::IdleState: // Finished playing (no more data) - audio->stop(); - sourceFile.close(); - delete audio; + AudioOutputExample::stopAudioOutput(); break; case QAudio::StoppedState: @@ -203,9 +175,9 @@ void AudioDeviceInfo() //! [Setting audio format] //! [Dumping audio formats] - const auto deviceInfos = QMediaDevices::availableDevices(QAudioDevice::Output); - for (const QAudioDevice &deviceInfo : deviceInfos) - qDebug() << "Device: " << deviceInfo.description(); + const auto devices = QMediaDevices::audioOutputs(); + for (const QAudioDevice &device : devices) + qDebug() << "Device: " << device.description(); //! [Dumping audio formats] } @@ -231,7 +203,7 @@ void AudioDecodingExample::decode() decoder->setAudioFormat(desiredFormat); decoder->setSource("level1.mp3"); - connect(decoder, SIGNAL(bufferReady()), this, SLOT(readBuffer())); + connect(decoder, &QAudioDecoder::bufferReady, this, &AudioDecodingExample::readBuffer); decoder->start(); // Now wait for bufferReady() signal and call decoder->read() @@ -245,9 +217,9 @@ void applyVolume(int volumeSliderValue) { // volumeSliderValue is in the range [0..100] - qreal linearVolume = QAudio::convertVolume(volumeSliderValue / qreal(100.0), - QAudio::LogarithmicVolumeScale, - QAudio::LinearVolumeScale); + qreal linearVolume = QtAudio::convertVolume(volumeSliderValue / qreal(100.0), + QtAudio::LogarithmicVolumeScale, + QtAudio::LinearVolumeScale); player.setVolume(qRound(linearVolume * 100)); } diff --git a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp index 7c7b5e5a0..053af088f 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp +++ b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Mobility Components. -** -** $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 BSD-3-Clause /* Camera snippets */ @@ -201,8 +165,6 @@ void camera_info() qDebug() << "The camera is on the front face of the hardware system."; else if (cameraDevice.position() == QCameraDevice::BackFace) qDebug() << "The camera is on the back face of the hardware system."; - - qDebug() << "The camera sensor orientation is " << cameraDevice.orientation() << " degrees."; //! [Camera info] } diff --git a/src/multimedia/doc/snippets/multimedia-snippets/devices.cpp b/src/multimedia/doc/snippets/multimedia-snippets/devices.cpp new file mode 100644 index 000000000..652400364 --- /dev/null +++ b/src/multimedia/doc/snippets/multimedia-snippets/devices.cpp @@ -0,0 +1,38 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +#include <QAudioDevice> +#include <QCameraDevice> +#include <QMediaDevices> +#include <QString> +#include <QTextStream> + +int main(int argc, char *argv[]) +{ + Q_UNUSED(argc); + Q_UNUSED(argv); + + QTextStream out(stdout); + + //! [Media Audio Input Device Enumeration] + const QList<QAudioDevice> audioDevices = QMediaDevices::audioInputs(); + for (const QAudioDevice &device : audioDevices) + { + out << "ID: " << device.id() << Qt::endl; + out << "Description: " << device.description() << Qt::endl; + out << "Is default: " << (device.isDefault() ? "Yes" : "No") << Qt::endl; + } + //! [Media Audio Input Device Enumeration] + + //! [Media Video Input Device Enumeration] + const QList<QCameraDevice> videoDevices = QMediaDevices::videoInputs(); + for (const QCameraDevice &device : videoDevices) + { + out << "ID: " << device.id() << Qt::endl; + out << "Description: " << device.description() << Qt::endl; + out << "Is default: " << (device.isDefault() ? "Yes" : "No") << Qt::endl; + } + //! [Media Video Input Device Enumeration] + + return 0; +} diff --git a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp index 634c5dd2b..a4b9a9fb5 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp +++ b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Mobility Components. -** -** $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 BSD-3-Clause /* Media related snippets */ #include <QFile> @@ -112,7 +76,7 @@ void MediaExample::MediaPlayer() player = new QMediaPlayer; audioOutput = new QAudioOutput; player->setAudioOutput(audioOutput); - connect(player, SIGNAL(positionChanged(qint64)), this, SLOT(positionChanged(qint64))); + connect(player, &QMediaPlayer::positionChanged, this, &MediaExample::positionChanged); player->setSource(QUrl::fromLocalFile("/Users/me/Music/coolsong.mp3")); audioOutput->setVolume(50); player->play(); diff --git a/src/multimedia/doc/snippets/multimedia-snippets/multiple-videooutputs.qml b/src/multimedia/doc/snippets/multimedia-snippets/multiple-videooutputs.qml index f50c9f169..0c673cc42 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/multiple-videooutputs.qml +++ b/src/multimedia/doc/snippets/multimedia-snippets/multiple-videooutputs.qml @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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) 2020 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Window diff --git a/src/multimedia/doc/snippets/multimedia-snippets/qsound.cpp b/src/multimedia/doc/snippets/multimedia-snippets/qsound.cpp index 246589767..644dcb228 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/qsound.cpp +++ b/src/multimedia/doc/snippets/multimedia-snippets/qsound.cpp @@ -1,52 +1,5 @@ - /**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #include "qpushbutton.h" #include "qsoundeffect.h" diff --git a/src/multimedia/doc/snippets/multimedia-snippets/qtvideosink.qml b/src/multimedia/doc/snippets/multimedia-snippets/qtvideosink.qml index 842b3138c..eeac9c28e 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/qtvideosink.qml +++ b/src/multimedia/doc/snippets/multimedia-snippets/qtvideosink.qml @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 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) 2019 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtMultimedia diff --git a/src/multimedia/doc/snippets/multimedia-snippets/soundeffect.qml b/src/multimedia/doc/snippets/multimedia-snippets/soundeffect.qml index 501443d25..e91e54e3c 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/soundeffect.qml +++ b/src/multimedia/doc/snippets/multimedia-snippets/soundeffect.qml @@ -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 BSD-3-Clause import QtQuick import QtMultimedia diff --git a/src/multimedia/doc/snippets/multimedia-snippets/video.cpp b/src/multimedia/doc/snippets/multimedia-snippets/video.cpp index ce35d6e74..8cc3b41b3 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/video.cpp +++ b/src/multimedia/doc/snippets/multimedia-snippets/video.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Mobility Components. -** -** $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 BSD-3-Clause /* Video related snippets */ #include "qvideorenderercontrol.h" diff --git a/src/multimedia/doc/src/audiooverview.qdoc b/src/multimedia/doc/src/audiooverview.qdoc index d47df5566..40a6318a6 100644 --- a/src/multimedia/doc/src/audiooverview.qdoc +++ b/src/multimedia/doc/src/audiooverview.qdoc @@ -1,47 +1,12 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt for Multimedia module 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 GFDL-1.3-no-invariants-only /*! \page audiooverview.html \title Audio Overview \inlineimage sound-wave-small.jpg \brief Playback, recording and processing of Audio. +\ingroup explanations-graphicsandmultimedia \section1 Audio Features @@ -156,13 +121,10 @@ Here's an example of decoding a local file: \snippet multimedia-snippets/audio.cpp Local audio decoding -\section1 Examples +\section2 Spatial Audio -There are both C++ and QML examples available. - -\section2 C++ Examples - -\annotatedlist audio_examples +The \l {Qt Spatial Audio} module provides an API for implementation sound +fields in 3D space. \section1 Reference Documentation @@ -174,5 +136,8 @@ There are both C++ and QML examples available. \annotatedlist multimedia_audio_qml +\section2 Examples + +\annotatedlist audio_examples */ diff --git a/src/multimedia/doc/src/cameraoverview.qdoc b/src/multimedia/doc/src/cameraoverview.qdoc index 8753d86e0..b93954d6d 100644 --- a/src/multimedia/doc/src/cameraoverview.qdoc +++ b/src/multimedia/doc/src/cameraoverview.qdoc @@ -1,46 +1,11 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt for Multimedia module 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 GFDL-1.3-no-invariants-only /*! \page cameraoverview.html \title Camera Overview \brief Camera viewfinder, still image capture, and video recording. +\ingroup explanations-graphicsandmultimedia The Qt Multimedia API provides a number of camera related classes, so you can access images and videos from mobile device cameras or web cameras. diff --git a/src/multimedia/doc/src/examples/video-qml-paint-rate.qdocinc b/src/multimedia/doc/src/examples/video-qml-paint-rate.qdocinc index f531e613a..34f7df319 100644 --- a/src/multimedia/doc/src/examples/video-qml-paint-rate.qdocinc +++ b/src/multimedia/doc/src/examples/video-qml-paint-rate.qdocinc @@ -2,7 +2,7 @@ The QML painting rate is calculated by the FrequencyMonitor class, which turns a stream of events (received via the notify() slot), into an instantaneous and an averaged frequency: -\quotefromfile multimedia/video/qmlvideo/frequencymonitor.h +\quotefromfile video/qmlvideo/frequencymonitor.h \skipto class FrequencyMonitor : public QObject \printuntil Q_OBJECT \skipto Q_PROPERTY(qreal instantaneousFrequency @@ -19,13 +19,13 @@ instantaneous and an averaged frequency: The FrequencyMonitor class is exposed to QML like this -\quotefromfile multimedia/video/qmlvideo/frequencymonitordeclarative.cpp +\quotefromfile video/qmlvideo/frequencymonitordeclarative.cpp \skipto FrequencyMonitor::qmlRegisterType \printuntil } and its data is displayed by defining a QML item called FrequencyItem, like this: -\quotefromfile multimedia/video/qmlvideo/qml/frequencymonitor/FrequencyItem.qml +\quotefromfile video/qmlvideo/frequencymonitor/FrequencyItem.qml \skipto import FrequencyMonitor \printuntil id: root \dots diff --git a/src/multimedia/doc/src/images/camera_correctionAngle_90.png b/src/multimedia/doc/src/images/camera_correctionAngle_90.png Binary files differnew file mode 100644 index 000000000..7a3c169a5 --- /dev/null +++ b/src/multimedia/doc/src/images/camera_correctionAngle_90.png diff --git a/src/multimedia/doc/src/multimedia-overview.qdoc b/src/multimedia/doc/src/multimedia-overview.qdoc index 2d6cebaec..6da54a7e2 100644 --- a/src/multimedia/doc/src/multimedia-overview.qdoc +++ b/src/multimedia/doc/src/multimedia-overview.qdoc @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt for Multimedia module 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 GFDL-1.3-no-invariants-only @@ -43,6 +7,7 @@ \page multimediaoverview.html \title Multimedia Overview \brief A set of APIs for working with audio, video and camera devices. +\ingroup explanations-graphicsandmultimedia Multimedia support in Qt is provided by the \l{Qt Multimedia} module. The Qt Multimedia module provides a rich feature set that enables you to easily take @@ -56,6 +21,7 @@ Here are some things you can do with the Qt Multimedia APIs: \list \li Access raw audio devices for input and output. \li Play low latency sound effects. +\li Play 3D spatial audio. \li Play media files in playlists (such as compressed audio or video files). \li Record audio and compress it. \li Use a camera, including viewfinder, image capture, and movie recording @@ -72,7 +38,7 @@ can also take a look at some \l{Multimedia Recipes}{recipes}. \li \l {Audio Overview} \li \l {Video Overview} \li \l {Camera Overview} -\li \l {Spatial Audio Overview} +\li \l {Spatial Audio Overview} (Technology Preview) \endlist \section1 Multimedia Recipes @@ -91,13 +57,18 @@ For some quick recipes, see this table: \li \l{SoundEffect} \li QSoundEffect \row + \li Playing 3D sound + \li \l{Spatial Audio Panning Example}{audiopanning} + \li SpatialSound, AudioEngine + \li QSpatialSound, QAudioEngine + \row \li Playing encoded audio (MP3, AAC etc) \li \l{Media Player Example}{player} \li \l{MediaPlayer} \li QMediaPlayer \row \li Playing raw audio data with low latency - \li \l{Audio Output Example}{audiooutput}, + \li \l{Audio Output Example}{audiooutput} \li \li QAudioSink \row @@ -125,26 +96,21 @@ For some quick recipes, see this table: \row \li Capturing audio and video \li \l {Camera Example}{camera}, - \l {QML Recorder Example}{recorder} + \l {QML Video Recorder}{recorder} \li \l CaptureSession, \l Camera, \l AudioInput \l VideoOutput \li QMediaCaptureSession, QCamera, QAudioInput, QVideoWidget \row \li Capturing photos \li \l {Camera Example}{camera}, - \l {QML Recorder Example}{recorder} + \l {QML Video Recorder}{recorder} \li \l CaptureSession, \l Camera, \l ImageCapture \li QMediaCaptureSession, QCamera, QImageCapture \row \li Capturing movies \li \l {Camera Example}{camera}, - \l {QML Recorder Example}{recorder} + \l {QML Video Recorder}{recorder} \li \l CaptureSession, \l Camera, \l MediaRecorder \li QMediaCaptureSession, QCamera, QMediaRecorder - \row - \li Spatial Audio - \li \l {Spatial Audio example}{spatialaudio}, - \li \l SpatialAudioEngine, \l SpatialAudioListener, \l SpatialAudioSoundSource - \li QSpatialAudioEngine, QSpatialAudioListener, QSpatialAudioSoundSource \endtable \section1 Limitations @@ -154,6 +120,13 @@ platform. This can mean that support for various codecs, or containers will vary between machines. This support depends on what the end user has installed. See \l{Supported Media Formats} for more detail. +\note Qt Multimedia APIs depend on functionality provided by QCoreApplication, +and multimedia objects created using the Qt Multimedia APIs can only be used +during the lifetime of this application object. It is therefore important to +create a QCoreApplication, QGuiApplication, or QApplication before accessing +any of the Qt Multimedia APIs. If the application object is recreated, make +sure that any Qt Multimedia objects are also recreated. + \section1 Changes from Previous Versions If you previously used Qt Multimedia in Qt 5, see @@ -162,14 +135,8 @@ you might need to change when porting code to Qt 6. \section1 Reference Documentation -\section2 QML Types -The QML types are accessed by using: -\code -import QtMultimedia -\endcode - -\section2 Multimedia Classes - -\annotatedlist multimedia - +\list + \li \l{Qt Multimedia C++ Classes}{C++ Classes} + \li \l{Qt Multimedia QML Types}{QML Types} +\endlist */ diff --git a/src/multimedia/doc/src/platform-notes-apple.qdoc b/src/multimedia/doc/src/platform-notes-apple.qdoc index bd8636ee4..a9bca07c2 100644 --- a/src/multimedia/doc/src/platform-notes-apple.qdoc +++ b/src/multimedia/doc/src/platform-notes-apple.qdoc @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the FOO module 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 GFDL-1.3-no-invariants-only /*! \page qtmultimedia-apple.html diff --git a/src/multimedia/doc/src/platform-notes-wasm.qdoc b/src/multimedia/doc/src/platform-notes-wasm.qdoc new file mode 100644 index 000000000..d1a942c9f --- /dev/null +++ b/src/multimedia/doc/src/platform-notes-wasm.qdoc @@ -0,0 +1,35 @@ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only + +/*! +\page qtmultimedia-wasm.html +\title Qt Multimedia on WebAssembly +\brief Platform notes for WebAssembly + +This page covers the availability of Qt Multimedia features on WebAssembly. + +\section1 Limitations + +Due to the asynchronous nature of javascript, some features such as getting the list of +QMediaDevices, will not be readily available and may take some time to request permissions and +gather the list of devices. The audioInputsChanged, audioOutputsChanged and +videoInputChanged signals from QMediaDevices class will be emitted when they are available. + +Playing video currently works by using a html 2d context, so all operations are on the CPU. + +Performance is acceptable, although there is a copy on every frame, so it may be +less performant than desktop platforms when playing hi-def video. + +Using and selecting different Codecs/video formats have not yet been tested, but whatever +video formats the browser supports will most likely work. + +Playing data from a stream (using \c {setSourceDevice(QIODevice*)}), instead +of fetching a URL, isn't supported. + +Some advanced features may or may not work at this time. + +Files can be served from the/any web server, respective +of \l{https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS}{CORS}. Because of +the limited size of local file storage, playing local files is discouraged. + + */ diff --git a/src/multimedia/doc/src/qm-external-pages.qdoc b/src/multimedia/doc/src/qm-external-pages.qdoc index dcd5e9138..8a28780c0 100644 --- a/src/multimedia/doc/src/qm-external-pages.qdoc +++ b/src/multimedia/doc/src/qm-external-pages.qdoc @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the FOO module 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 GFDL-1.3-no-invariants-only /*! \externalpage https://gstreamer.freedesktop.org @@ -228,7 +192,7 @@ /*! \externalpage https://en.wikipedia.org/wiki/Motion_JPEG - \title Motion JPEG + \title MotionJPEG */ /*! diff --git a/src/multimedia/doc/src/qt6-changes.qdoc b/src/multimedia/doc/src/qt6-changes.qdoc index dd37a1355..ad5ebab74 100644 --- a/src/multimedia/doc/src/qt6-changes.qdoc +++ b/src/multimedia/doc/src/qt6-changes.qdoc @@ -1,29 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \page qtmultimedia-changes-qt6.html diff --git a/src/multimedia/doc/src/qtmultimedia-building-from-source.qdoc b/src/multimedia/doc/src/qtmultimedia-building-from-source.qdoc new file mode 100644 index 000000000..df434c699 --- /dev/null +++ b/src/multimedia/doc/src/qtmultimedia-building-from-source.qdoc @@ -0,0 +1,94 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only + +/*! +\page qtmultimedia-building-from-source.html +\title Building Qt Multimedia from sources +\brief This document describes how to build Qt Multimedia with full +feature support from source code. + +This page describes the process of configuring and building \l{Qt +Multimedia}. This description assumes familiarity with \l{Building Qt +Sources} which specifies build requirements for your platform, as well +as an overview of \l{Qt Configure Options}. For platform-specific +considerations related to the Qt Multimedia module, see \l{Platform +Notes} below. + +\section1 Building from source + +Building Qt Multimedia with full feature support depends on \l +{https://ffmpeg.org/}{FFmpeg} headers and libraries on most platforms. +It is possible to build Qt Multimedia without the Qt Multimedia FFmpeg +media backend, but this is only recommended when building for platforms +where the FFmpeg backend is not supported. + +FFmpeg developer libraries required to build Qt Multimedia can be built +from sources or downloaded as binary packages. Qt Multimedia can use +either static linking or dynamic linking to FFmpeg libraries. We +recommend using the same major version of FFmpeg that is listed in +\l{FFmpeg as the default backend}. + +To build Qt Multimedia with FFmpeg support, specify the \c{-DFFMPEG_DIR} +CMake variable on the configure command line when building Qt. Note the +\c{--} separator which separates ordinary configure arguments from CMake +parameters. + +\badcode +qt-source/configure -- -DFFMPEG_DIR=<FFMPEG_DIR> +\endcode + +Here, \c{<FFMPEG_DIR>} is the directory containing the FFmpeg include, +lib, and bin directories. To build Qt Multimedia without FFmpeg, omit +the \c{<FFMPEG_DIR>} variable or specify the \c{-no-feature-ffmpeg} +configure option. + +If you prefer not to build all Qt's submodules, you can reduce configure +and build times using the \c{-submodules} configure option. This will +configure a build that only builds Qt Multimedia and its dependencies. + +\badcode +qt-source/configure -submodules qtmultimedia -- -DFFMPEG_DIR=<FFMPEG_DIR> +\endcode + +If you configure Qt Multimedia against FFmpeg built with shared +libraries (dynamic linking), the FFmpeg shared libraries must be in the +module loader's search path to run tests or use examples. + +\note Qt Multimedia requires the FFmpeg avformat, avcodec, swresample, +swscale, and avutil libraries during runtime to be able to use the +FFmpeg media backend. If one or more of these dynamic libraries are not +found during application startup, the FFmpeg media backend will fail to +load, and the system will attempt to load the native backend. Qt +Multimedia doesn't support as many features on native backends. + +If you don't already have these libraries in the \c{path}, specify the +\c{-DQT_DEPLOY_FFMPEG=ON} configure option. With this option enabled, +the necessary FFmpeg binaries will be copied to Qt's install directory +during the build and install steps: + +\badcode +qt-source/configure -submodules qtmultimedia -- -DFFMPEG_DIR=<FFMPEG_DIR> -DQT_DEPLOY_FFMPEG=ON +\endcode + +After configuring Qt Multimedia, carefully review the configure summary +(found in the config.summary file). You can verify that FFmpeg is found +under the "Plugin" section. Then follow the regular build and install +steps described in \l{Building Qt Sources}. + +\section1 Platform Notes + +\section2 Linux + +\list + \li When configuring Qt Multimedia with FFmpeg enabled, the + pulseaudio development package is required. Without this + package, FFmpeg will not be recognized. + \li When using a version of FFmpeg that is built with VAAPI support, + we recommend building Qt Multimedia with VAAPI support as well + to make hardware texture conversion possible. To configure Qt + Multimedia with VAAPI support, VAAPI developer libraries must be + installed on your system. Review the config.summary file to + verify that VAAPI support is enabled under the "Hardware + acceleration and features" section. +\endlist +*/ diff --git a/src/multimedia/doc/src/qtmultimedia-cpp.qdoc b/src/multimedia/doc/src/qtmultimedia-cpp.qdoc index 01d5579af..b0c4ea732 100644 --- a/src/multimedia/doc/src/qtmultimedia-cpp.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-cpp.qdoc @@ -1,29 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2015 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \module QtMultimedia @@ -35,13 +11,11 @@ \brief The \l {Qt Multimedia} module provides audio, video and camera functionality. - To enable Qt Multimedia in a project, add this directive into your - C++ files: - - \snippet doc_src_qtmultimedia.cpp 0 - \include module-use.qdocinc using qt module - \snippet ../src/multimedia/doc/snippets/CMakeLists.txt 0 + \code + find_package(Qt6 REQUIRED COMPONENTS Multimedia) + target_link_libraries(mytarget PRIVATE Qt6::Multimedia) + \endcode */ /*! @@ -65,4 +39,7 @@ \section2 Qt Multimedia Widgets Module \generatelist {classesbymodule QtMultimediaWidgets} + + \section2 Qt Spatial Audio Module + \generatelist {classesbymodule QtSpatialAudio} */ diff --git a/src/multimedia/doc/src/qtmultimedia-examples.qdoc b/src/multimedia/doc/src/qtmultimedia-examples.qdoc index 40e69efbd..e53eed32f 100644 --- a/src/multimedia/doc/src/qtmultimedia-examples.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-examples.qdoc @@ -1,33 +1,8 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2015 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \group multimedia_examples - \ingroup all-examples \title Qt Multimedia Examples \brief Demonstrates the multimedia functionality provided by Qt. diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc index 74db2036e..74646b84c 100644 --- a/src/multimedia/doc/src/qtmultimedia-index.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt for Multimedia module 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 GFDL-1.3-no-invariants-only /*! \page qtmultimedia-index.html @@ -47,7 +11,7 @@ Qt Multimedia is an add-on module that provides a rich set of QML types and C++ classes to handle multimedia content. It contains an easy to use API for playing back audio and video files and rendering those on screen, as - well as a comprehensive API for recording audio and video from the systems + well as a comprehensive API for recording audio and video from the system's cameras and microphones. The functionality of this module is divided into the following submodules: @@ -55,10 +19,13 @@ \table \row \li \l{Multimedia Overview}{Qt Multimedia} - \li Provides API for multimedia-specific use cases. + \li Provides an API for multimedia-specific use cases. \row \li \l{Qt Multimedia Widgets} - \li Provides the widget-based multimedia API. + \li Provides a widget-based multimedia API. + \row + \li \l{Qt Spatial Audio} + \li Provides an API for implementing sound fields in 3D space. \endtable \section1 Getting started @@ -72,17 +39,6 @@ import QtMultimedia \endqml - If you want to use the C++ classes in your application, include the C++ - definitions using the following directive: - - \code - #include <QtMultimedia> - #include <QtMultimediaWidgets> - \endcode - - \note If you are using a few classes from this module, we recommend - including those specific classes only instead of the module. - To link against the C++ libraries, add the following to your project's \c CMakeLists.txt file. Substitute \c my_project with the name of your project. @@ -92,18 +48,22 @@ target_link_libraries(my_project PRIVATE Qt6::Multimedia) \endcode - \section1 Overviews and Important Topics + See \l {Building Qt Multimedia from sources} for guidance on building + Qt Multimedia from sources. + + \section1 Overviews and important topics \list \li \l{Changes to Qt Multimedia}{Changes in Qt 6} \li \l{Multimedia Overview} \li \l{Audio Overview} + \li \l{Spatial Audio Overview} \li \l{Video Overview} \li \l{Camera Overview} \li \l{Supported Media Formats} \endlist - \section1 QML Types + \section1 QML types The following table outlines some important QML types. @@ -139,11 +99,17 @@ \li \l {QtMultimedia::Video}{Video} \li Add Video playback functionality to a scene. Uses MediaPlayer and VideoOutput types to provide video playback functionality. + \row + \li \l {QtMultimedia::ScreenCapture}{ScreenCapture} + \li Captures a screen. + \row + \li \l {QtMultimedia::WindowCapture}{WindowCapture} + \li Captures a top-level window. \endtable - \section1 C++ Classes + \section1 C++ classes - The following table outlines some important C++ Classes + The following table outlines some important C++ classes \table \header @@ -179,13 +145,19 @@ \row \li QAudioSink \li Sends raw audio data to an audio output device. + \row + \li QScreenCapture + \li Captures a screen. + \row + \li QWindowCapture + \li Captures a top-level window. \endtable For playback QMediaPlayer, QAudioOutput and QVideoOutput contain all the required functionality. The other classes are used for capturing audio and video content, where the QMediaCaptureSession is the central class managing the whole capture/recording process. - \section1 Licenses and Attributions + \section1 Licenses and attributions The Qt Multimedia module is available under commercial licenses from \l{The Qt Company}. @@ -195,31 +167,119 @@ the \l{GNU General Public License, version 2}. See \l{Qt Licensing} for further details. - Furthermore, Qt Multimedia in Qt \QtVersion may contain third party - modules under the following permissive licenses: + Furthermore, Qt Multimedia in Qt \QtVersion may contain third-party modules + under following permissive licenses: \generatelist{groupsbymodule attributions-qtmultimedia} - \section1 Platform Notes + Note that video compression standards, such as the H.264 media compression + standard, may be covered by patents and can incur royalty fees. This can + apply to any implementation, also if the implementation is provided as an + operating system service, through a third party library, or through any of + Qt Multimedia's backends. Such fees are not covered by the Qt licenses. + + \section1 Target platform and backend notes + We aim to align the behavior on all the platforms but there are some issues + to consider. + + \section2 Backends + On most platforms, there are two different backends that can be used for + Qt Multimedia. + + \section3 FFmpeg as the default backend + In this release the \l {http://ffmpeg.org}{FFmpeg framework} is set as the + default backend on Windows, macOS, Android, and Linux except Yocto distribution. - For most features, Qt Multimedia builds upon the multimedia framework of the - underlying operating system. Therefore there are several multimedia back ends - based on different technologies and APIs. + The version shipped with Qt binary packages is \b{FFmpeg 6.1.1} and is tested + by the maintainers. - While we try to support our full API on all platforms, platform specific limitations do - exist in a few places. This is due to the fact that the feature set supported by those - frameworks varies, implying that some functionality - might not be available on all platforms. This is especially true for the set of - supported file formats and codecs, as well as advanced camera functionality. + \note On the Windows and macOS platforms, Qt's FFmpeg media backend + uses dynamic linking to the FFmpeg libraries. Windows and macOS + applications must therefore bundle FFmpeg binaries in their + installer, and make them visible to the application at runtime. On + Windows, we recommend to store the FFmpeg dlls in the same directory + as the application's executable file, because this guarantees that + the correct build of FFmpeg is being used if multiple versions are + available on the system. All necessary FFmpeg libraries are shipped + with the Qt Online Installer and are automatically deployed if the + windeployqt or macdeployqt tools are used to create the deployment. + Applications can also deploy their own build of FFmpeg, as long as + the FFmpeg major version matches the version used by Qt. - Where limitations exist, we aim to document those in the respective classes and - methods. + \note See \l{Licenses and Attributions} regarding what components are removed + in the package shipped by Qt. + + \section3 Native backends + These are: + \list + \li gstreamer on Linux + \li AVFoundation on macOS and iOS + \li WMF Windows + \li MediaCodec framework on Android + \endlist + + \note These are still available but with \b limited support. The gstreamer + backend is only available on Linux. + \note MediaCodec on Android is deprecated as of Qt 6.8 and will be removed + in Qt 7.0. + + \section2 Backend support + Maintainers will strive to fix critical issues with the native backends but + don't guarantee fixing minor issues and won't implement new features for the + native backends. Furthermore, even some major issues with the gstreamer + backend (on Linux) won't be fixed since gstreamer is difficult to debug and + is further complicated as it is dependent on Linux distributions. + + We aim to align the behavior on all the platforms, especially, with the + FFmpeg backend. Despite this fact we still have platform-dependent issues + with formats, codecs, advanced camera features, and screen capturing due to + the Qt Multimedia API relying on target platform APIs. For example, with FFmpeg, + there are specific problems with hardware acceleration on Linux targets with + ARM architectures. + + Backend-dependent limitations will be documented and their status maintained + in the respective classes. + + \section2 Changing backends + + In the case of issues with the default FFmpeg backend, we suggest testing with a native backend. + You can switch to native backends by setting the \c{QT_MEDIA_BACKEND} environment variable + to \c windows, \c gstreamer (on Linux), \c darwin (on macOS and iOS), or \c android: + + \code + export QT_MEDIA_BACKEND=darwin + \endcode + + In order to force assign FFmpeg as the used backend, set the variable to \c ffmpeg: + + \code + export QT_MEDIA_BACKEND=ffmpeg + \endcode + + On the Qt Multimedia compilation stage the default media backend can be configured + via cmake variable \c{QT_DEFAULT_MEDIA_BACKEND}. + + \section2 Target platform notes + The following pages list issues for specific target platforms that are not + related to the multimedia backed. \list \li \l{Qt Multimedia on macOS and iOS}{macOS and iOS} + \li \l{Qt Multimedia on WebAssembly}{WebAssembly} \endlist - \section1 Reference and Examples + \section1 Permissions + + Starting from Qt 6.6, the Qt Multimedia module uses new \l QPermission API + to handle \l {QCameraPermission}{camera} and + \l {QMicrophonePermission}{microphone} permissions. This means that Qt + itself no longer queries for these permissions, so this needs to be done + directly from the client application. + + Please refer to the \l {Application Permissions} page for an example of how + to integrate the new \l QPermission API into the application. + + \section1 Reference and examples \list \li \l{Qt Multimedia QML Types}{QML Types} \li \l{Qt Multimedia C++ Classes}{C++ Classes} diff --git a/src/multimedia/doc/src/qtmultimedia-qml-types.qdoc b/src/multimedia/doc/src/qtmultimedia-qml-types.qdoc index 16e0e581b..0d61a8917 100644 --- a/src/multimedia/doc/src/qtmultimedia-qml-types.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-qml-types.qdoc @@ -1,32 +1,9 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2015 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \qmlmodule QtMultimedia +\noautolist \title Qt Multimedia QML Types \ingroup qmlmodules \brief Provides QML types for multimedia support. @@ -44,11 +21,25 @@ The QML types for \l{Qt Multimedia} support the basic use cases such as: Qt Multimedia QML types can be imported into your application using the following import statement in your .qml file: -\qml \QtMinorVersion +\qml import QtMultimedia \endqml \generatelist qmltypesbymodule QtMultimedia -\noautolist +The \QtMultimedia import provides also the following +\l [QtQml]{QML Value Types}{value types}: + +\generatelist qmlvaluetypesbymodule QtMultimedia + +\section2 Qt Spatial Audio Module + +Qt Spatial Audio QML types can be imported into your application using the +following import statement in your .qml file: + +\qml +import QtQuick3D.SpatialAudio +\endqml + +\generatelist qmltypesbymodule QtQuick3D.SpatialAudio */ diff --git a/src/multimedia/doc/src/spatialaudiooverview.qdoc b/src/multimedia/doc/src/spatialaudiooverview.qdoc deleted file mode 100644 index 1502829f2..000000000 --- a/src/multimedia/doc/src/spatialaudiooverview.qdoc +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2022 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt for Multimedia module 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$ -** -****************************************************************************/ - -/*! -\page spatialaudiooverview.html -\title Spatial Audio Overview -\brief Support for spatial audio. - -The Qt Multimedia API provides a number of classes that allow the creation of -three dimensional sound scene. It is defined by objects located in 3D space -that emit sound and surrounding geometry that can be modelled using -one or several rooms. Finally a listener can be placed into this -sound scene at a specified position and orientation. - -There are both C++ and QML APIs that can be used. - -\section1 Creating a sound scene - -To create the sound scene, one first instantiates a \l QSpatialAudioEngine. This engine -processes input sound data and geometries to create a realistic -representation of the sound scene as it would be experienced by a person placed -at a specific location inside the scene. - -The \l QSpatialAudioEngine::OutputMode property can be used to optimize the output either -for headphones using binaural (virtual 3D) rendering or for a stereo or surround speaker -configuration. - -The output device can be selected using \l QSpatialAudioEngine::outputDevice property. - -Once the engine is set up, we can place various sound objects into the scene by creating -\l QSpatialAudioSoundSource objects and specifying a url to a sound file using the \l -QSpatialAudioSoundSource::source property. - -\l QSpatialAudioListener can be used to define the position and orientation of a person -listening to the sound scene. At max one listener per engine can be used. If no listener -is specified, the engine assumes that the listener is at the origin of the coordinate system -facing into a positive z direction, with positive y pointing upwards. - -In addition to sound sources and a listener, you can define a geometry that influences how the -sound is being experienced by the listener through a set of \l QSpatialAudioRoom objects. Rooms -are rectangular and support a wide variety of materials for each wall giving a different experience -with different sound reflections and reverb. Room effects will get applied if the listener is -located inside one of the rooms. If he is inside multiple rooms, the room with the smallest -geometrical volume will take precedence. - -If you need some stereo overlay that is independent of the position and orientation of -the listener (such as background music or a voice-over), you can use -\l QSpatialAudioStereoSource to create the sound overlay. - -\section1 Reference Documentation - -\section2 C++ Classes - -\annotatedlist multimedia_spatialaudio - -\section2 QML Types - -\annotatedlist quick3d_spatialaudio - -*/ diff --git a/src/multimedia/doc/src/videooverview.qdoc b/src/multimedia/doc/src/videooverview.qdoc index 2988c6e7f..3185c9a02 100644 --- a/src/multimedia/doc/src/videooverview.qdoc +++ b/src/multimedia/doc/src/videooverview.qdoc @@ -1,35 +1,12 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \page videooverview.html \title Video Overview \brief Video playback +\ingroup explanations-graphicsandmultimedia \section1 Video Features diff --git a/src/multimedia/platform/qgstreamer_platformspecificinterface.cpp b/src/multimedia/platform/qgstreamer_platformspecificinterface.cpp new file mode 100644 index 000000000..06ce46e3c --- /dev/null +++ b/src/multimedia/platform/qgstreamer_platformspecificinterface.cpp @@ -0,0 +1,27 @@ +// Copyright (C) 2024 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 + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtMultimedia/private/qgstreamer_platformspecificinterface_p.h> + +QT_BEGIN_NAMESPACE + +QGStreamerPlatformSpecificInterface::~QGStreamerPlatformSpecificInterface() = default; + +QGStreamerPlatformSpecificInterface *QGStreamerPlatformSpecificInterface::instance() +{ + return dynamic_cast<QGStreamerPlatformSpecificInterface *>( + QPlatformMediaIntegration::instance()->platformSpecificInterface()); +} + +QT_END_NAMESPACE diff --git a/src/multimedia/platform/qgstreamer_platformspecificinterface_p.h b/src/multimedia/platform/qgstreamer_platformspecificinterface_p.h new file mode 100644 index 000000000..1a086f5a4 --- /dev/null +++ b/src/multimedia/platform/qgstreamer_platformspecificinterface_p.h @@ -0,0 +1,46 @@ +// Copyright (C) 2024 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 GSTREAMER_PLATFORMSPECIFICINTERFACE_P_H +#define GSTREAMER_PLATFORMSPECIFICINTERFACE_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtMultimedia/private/qplatformmediaintegration_p.h> + +typedef struct _GstPipeline GstPipeline; // NOLINT (bugprone-reserved-identifier) +typedef struct _GstElement GstElement; // NOLINT (bugprone-reserved-identifier) + +QT_BEGIN_NAMESPACE + +class Q_MULTIMEDIA_EXPORT QGStreamerPlatformSpecificInterface + : public QAbstractPlatformSpecificInterface +{ +public: + ~QGStreamerPlatformSpecificInterface() override; + + static QGStreamerPlatformSpecificInterface *instance(); + + virtual QAudioDevice makeCustomGStreamerAudioInput(const QByteArray &gstreamerPipeline) = 0; + virtual QAudioDevice makeCustomGStreamerAudioOutput(const QByteArray &gstreamerPipeline) = 0; + virtual QCamera *makeCustomGStreamerCamera(const QByteArray &gstreamerPipeline, + QObject *parent) = 0; + + // Note: ownership of GstElement is not transferred + virtual QCamera *makeCustomGStreamerCamera(GstElement *, QObject *parent) = 0; + + virtual GstPipeline *gstPipeline(QMediaPlayer *) = 0; + virtual GstPipeline *gstPipeline(QMediaCaptureSession *) = 0; +}; + +QT_END_NAMESPACE + +#endif // GSTREAMER_PLATFORMSPECIFICINTERFACE_P_H diff --git a/src/multimedia/platform/qplatformaudiobufferinput.cpp b/src/multimedia/platform/qplatformaudiobufferinput.cpp new file mode 100644 index 000000000..883b11fc0 --- /dev/null +++ b/src/multimedia/platform/qplatformaudiobufferinput.cpp @@ -0,0 +1,10 @@ +// Copyright (C) 2024 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 "qplatformaudiobufferinput_p.h" + +QT_BEGIN_NAMESPACE + +QT_END_NAMESPACE + +#include "moc_qplatformaudiobufferinput_p.cpp" diff --git a/src/multimedia/platform/qplatformaudiobufferinput_p.h b/src/multimedia/platform/qplatformaudiobufferinput_p.h new file mode 100644 index 000000000..55636ce06 --- /dev/null +++ b/src/multimedia/platform/qplatformaudiobufferinput_p.h @@ -0,0 +1,56 @@ +// Copyright (C) 2024 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 QPLATFORMAUDIOBUFFERINPUT_P_H +#define QPLATFORMAUDIOBUFFERINPUT_P_H + +#include "qaudioformat.h" +#include "qaudiobuffer.h" + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +QT_BEGIN_NAMESPACE + +class QMediaInputEncoderInterface; + +class Q_MULTIMEDIA_EXPORT QPlatformAudioBufferInputBase : public QObject +{ + Q_OBJECT +Q_SIGNALS: + void newAudioBuffer(const QAudioBuffer &buffer); +}; + +class Q_MULTIMEDIA_EXPORT QPlatformAudioBufferInput : public QPlatformAudioBufferInputBase +{ + Q_OBJECT +public: + QPlatformAudioBufferInput(const QAudioFormat &format = {}) : m_format(format) { } + + const QAudioFormat &audioFormat() const { return m_format; } + + QMediaInputEncoderInterface *encoderInterface() const { return m_encoderInterface; } + void setEncoderInterface(QMediaInputEncoderInterface *interface) + { + m_encoderInterface = interface; + } + +Q_SIGNALS: + void encoderUpdated(); + +private: + QMediaInputEncoderInterface *m_encoderInterface = nullptr; + QAudioFormat m_format; +}; + +QT_END_NAMESPACE + +#endif // QPLATFORMAUDIOBUFFERINPUT_P_H diff --git a/src/multimedia/platform/qplatformaudiodecoder.cpp b/src/multimedia/platform/qplatformaudiodecoder.cpp index d12d084dd..0bf472410 100644 --- a/src/multimedia/platform/qplatformaudiodecoder.cpp +++ b/src/multimedia/platform/qplatformaudiodecoder.cpp @@ -1,122 +1,14 @@ -/**************************************************************************** -** -** 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 #include "qplatformaudiodecoder_p.h" #include "qthread.h" QT_BEGIN_NAMESPACE +QPlatformAudioDecoder::QPlatformAudioDecoder(QAudioDecoder *parent) : q(parent) { } -/*! - \class QPlatformAudioDecoder - \obsolete - \inmodule QtMultimedia - - - \ingroup multimedia_control - - \brief The QPlatformAudioDecoder class provides access to audio decoding - functionality. - - \preliminary -*/ - -/*! - Constructs a new audio decoder control with the given \a parent. -*/ -QPlatformAudioDecoder::QPlatformAudioDecoder(QAudioDecoder *parent) - : QObject(parent), - q(parent) -{ -} - -/*! - \fn QPlatformAudioDecoder::source() const - - Returns the current media source filename, or a null QString if none (or a device) -*/ - -/*! - \fn QPlatformAudioDecoder::setSource(const QUrl &fileName) - - Sets the current source to \a fileName. Changing the source will - stop any current decoding and discard any buffers. - - Sources are exclusive, so only one can be set. -*/ - -/*! - \fn QPlatformAudioDecoder::sourceDevice() const - - Returns the current media source QIODevice, or 0 if none (or a file). -*/ - -/*! - \fn QPlatformAudioDecoder::setSourceDevice(QIODevice *device) - - Sets the current source to \a device. Changing the source will - stop any current decoding and discard any buffers. - - Sources are exclusive, so only one can be set. -*/ - -/*! - \fn QPlatformAudioDecoder::start() - - Starts decoding the current media. - - \sa read() -*/ - -/*! - \fn QPlatformAudioDecoder::stop() - - Stops playback of the current media and discards any buffers. - - If successful, the player control will immediately stop decoding. -*/ - -/*! - \fn QPlatformAudioDecoder::error(int error, const QString &errorString) - - Signals that an \a error has occurred. The \a errorString provides a more detailed explanation. -*/ +QPlatformAudioDecoder::~QPlatformAudioDecoder() = default; void QPlatformAudioDecoder::error(int error, const QString &errorString) { @@ -131,11 +23,6 @@ void QPlatformAudioDecoder::error(int error, const QString &errorString) } } -/*! - \fn QPlatformAudioDecoder::bufferAvailableChanged(bool available) - - Signals that the bufferAvailable property has changed to \a available. -*/ void QPlatformAudioDecoder::bufferAvailableChanged(bool available) { if (m_bufferAvailable == available) @@ -148,11 +35,6 @@ void QPlatformAudioDecoder::bufferAvailableChanged(bool available) emit q->bufferAvailableChanged(available); } -/*! - \fn QPlatformAudioDecoder::bufferReady() - - Signals that a new buffer is ready for reading. -*/ void QPlatformAudioDecoder::bufferReady() { if (QThread::currentThread() != q->thread()) @@ -161,36 +43,16 @@ void QPlatformAudioDecoder::bufferReady() emit q->bufferReady(); } -/*! - \fn QPlatformAudioDecoder::sourceChanged() - - Signals that the current source of the decoder has changed. - - \sa source(), sourceDevice() -*/ void QPlatformAudioDecoder::sourceChanged() { emit q->sourceChanged(); } -/*! - \fn QPlatformAudioDecoder::formatChanged(const QAudioFormat &format) - - Signals that the current audio format of the decoder has changed to \a format. -*/ void QPlatformAudioDecoder::formatChanged(const QAudioFormat &format) { emit q->formatChanged(format); } -/*! - \fn void QPlatformAudioDecoder::finished() - - Signals that the decoding has finished successfully. - If decoding fails, error signal is emitted instead. - - \sa start(), stop(), error() -*/ void QPlatformAudioDecoder::finished() { durationChanged(-1); @@ -198,52 +60,22 @@ void QPlatformAudioDecoder::finished() emit q->finished(); } -/*! - \fn void QPlatformAudioDecoder::positionChanged(qint64 position) - - Signals that the current \a position of the decoder has changed. - - \sa durationChanged() -*/ void QPlatformAudioDecoder::positionChanged(qint64 position) { if (m_position == position) return; m_position = position; - q->positionChanged(position); + emit q->positionChanged(position); } -/*! - \fn void QPlatformAudioDecoder::durationChanged(qint64 duration) - - Signals that the estimated \a duration of the decoded data has changed. - - \sa positionChanged() -*/ void QPlatformAudioDecoder::durationChanged(qint64 duration) { if (m_duration == duration) return; m_duration = duration; - q->durationChanged(duration); + emit q->durationChanged(duration); } -/*! - \fn QPlatformAudioDecoder::read() - Attempts to read a buffer from the decoder, without blocking. Returns invalid buffer if there are - no decoded buffers available, or on error. -*/ - -/*! - \fn QPlatformAudioDecoder::position() const - Returns position (in milliseconds) of the last buffer read from - the decoder or -1 if no buffers have been read. -*/ - -/*! - \fn QPlatformAudioDecoder::duration() const - Returns total duration (in milliseconds) of the audio stream - or -1 if not available. -*/ - QT_END_NAMESPACE + +#include "moc_qplatformaudiodecoder_p.cpp" diff --git a/src/multimedia/platform/qplatformaudiodecoder_p.h b/src/multimedia/platform/qplatformaudiodecoder_p.h index 771c4e512..1159a37ca 100644 --- a/src/multimedia/platform/qplatformaudiodecoder_p.h +++ b/src/multimedia/platform/qplatformaudiodecoder_p.h @@ -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 #ifndef QAUDIODECODERCONTROL_H #define QAUDIODECODERCONTROL_H @@ -51,12 +15,10 @@ // We mean it. // -#include <QtMultimedia/qaudiodecoder.h> - -#include <QtCore/qpair.h> - #include <QtMultimedia/qaudiobuffer.h> #include <QtMultimedia/qaudiodecoder.h> +#include <QtCore/qpair.h> +#include <QtCore/qurl.h> #include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE @@ -109,8 +71,11 @@ public: QAudioDecoder::Error error() const { return m_error; } QString errorString() const { return m_errorString; } + virtual ~QPlatformAudioDecoder(); + protected: explicit QPlatformAudioDecoder(QAudioDecoder *parent); + private: QAudioDecoder *q = nullptr; diff --git a/src/multimedia/platform/qplatformaudioinput_p.h b/src/multimedia/platform/qplatformaudioinput_p.h index fd1df8d1b..d6497c06e 100644 --- a/src/multimedia/platform/qplatformaudioinput_p.h +++ b/src/multimedia/platform/qplatformaudioinput_p.h @@ -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 #ifndef QPLATFORMAUDIOINPUT_H #define QPLATFORMAUDIOINPUT_H @@ -62,10 +26,10 @@ class QAudioInput; class Q_MULTIMEDIA_EXPORT QPlatformAudioInput { public: - QPlatformAudioInput(QAudioInput *qq) : q(qq) {} - virtual ~QPlatformAudioInput() {} + explicit QPlatformAudioInput(QAudioInput *qq) : q(qq) { } + virtual ~QPlatformAudioInput() = default; - virtual void setAudioDevice(const QAudioDevice &/*device*/) {} + virtual void setAudioDevice(const QAudioDevice & /*device*/) { } virtual void setMuted(bool /*muted*/) {} virtual void setVolume(float /*volume*/) {} diff --git a/src/multimedia/platform/qplatformaudiooutput_p.h b/src/multimedia/platform/qplatformaudiooutput_p.h index 300d20e46..b8f5af6f3 100644 --- a/src/multimedia/platform/qplatformaudiooutput_p.h +++ b/src/multimedia/platform/qplatformaudiooutput_p.h @@ -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 #ifndef QPLATFORMAUDIOOUTPUT_H #define QPLATFORMAUDIOOUTPUT_H @@ -60,8 +24,8 @@ class QAudioOutput; class Q_MULTIMEDIA_EXPORT QPlatformAudioOutput { public: - QPlatformAudioOutput(QAudioOutput *qq) : q(qq) {} - virtual ~QPlatformAudioOutput() {} + explicit QPlatformAudioOutput(QAudioOutput *qq) : q(qq) { } + virtual ~QPlatformAudioOutput() = default; virtual void setAudioDevice(const QAudioDevice &/*device*/) {} virtual void setMuted(bool /*muted*/) {} diff --git a/src/multimedia/platform/qplatformaudioresampler_p.h b/src/multimedia/platform/qplatformaudioresampler_p.h new file mode 100644 index 000000000..fd8edc2be --- /dev/null +++ b/src/multimedia/platform/qplatformaudioresampler_p.h @@ -0,0 +1,33 @@ +// Copyright (C) 2024 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 QPLATFORMAUDIORESAMPLER_P_H +#define QPLATFORMAUDIORESAMPLER_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <private/qtmultimediaglobal_p.h> +#include <qaudiobuffer.h> + +QT_BEGIN_NAMESPACE + +class QPlatformAudioResampler +{ +public: + virtual ~QPlatformAudioResampler() = default; + + virtual QAudioBuffer resample(const char *data, size_t size) = 0; +}; + +QT_END_NAMESPACE + +#endif // QPLATFORMAUDIORESAMPLER_P_H diff --git a/src/multimedia/platform/qplatformcamera.cpp b/src/multimedia/platform/qplatformcamera.cpp index 9b477a158..d03c19d67 100644 --- a/src/multimedia/platform/qplatformcamera.cpp +++ b/src/multimedia/platform/qplatformcamera.cpp @@ -1,96 +1,59 @@ -/**************************************************************************** -** -** 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 #include "qplatformcamera_p.h" +#include "private/qcameradevice_p.h" QT_BEGIN_NAMESPACE -/*! - \class QPlatformCamera - \obsolete - +QPlatformCamera::QPlatformCamera(QCamera *parent) : QPlatformVideoSource(parent), m_camera(parent) +{ + qRegisterMetaType<QVideoFrame>(); +} +QCameraFormat QPlatformCamera::findBestCameraFormat(const QCameraDevice &camera) const +{ + // check if fmt is better. We try to find the highest resolution that offers + // at least 30 FPS + // we use 29 FPS to compare against as some cameras report 29.97 FPS... - \brief The QPlatformCamera class is an abstract base class for - classes that control still cameras or video cameras. + auto makeCriteria = [this](const QCameraFormat &fmt) { + constexpr float MinSufficientFrameRate = 29.f; - \inmodule QtMultimedia + const auto isValid = fmt.pixelFormat() != QVideoFrameFormat::Format_Invalid; + const auto resolution = fmt.resolution(); + const auto sufficientFrameRate = std::min(fmt.maxFrameRate(), MinSufficientFrameRate); + const auto pixelFormatScore = + cameraPixelFormatScore(fmt.pixelFormat(), QCameraFormatPrivate::getColorRange(fmt)); - \ingroup multimedia_control -*/ + return std::make_tuple( + isValid, // 1st: ensure valid formats + sufficientFrameRate, // 2nd: ensure the highest frame rate in the range [0; 29]*/ + resolution.width() * resolution.height(), // 3rd: ensure the highest resolution + pixelFormatScore, // 4th: eshure the best pixel format + fmt.maxFrameRate()); // 5th: ensure the highest framerate in the whole range + }; -/*! - Constructs a camera control object with \a parent. -*/ + const auto formats = camera.videoFormats(); + const auto found = + std::max_element(formats.begin(), formats.end(), + [makeCriteria](const QCameraFormat &fmtA, const QCameraFormat &fmtB) { + return makeCriteria(fmtA) < makeCriteria(fmtB); + }); -QPlatformCamera::QPlatformCamera(QCamera *parent) - : QObject(parent), - m_camera(parent) -{ + return found == formats.end() ? QCameraFormat{} : *found; } -QCameraFormat QPlatformCamera::findBestCameraFormat(const QCameraDevice &camera) +QVideoFrameFormat QPlatformCamera::frameFormat() const { - QCameraFormat f; - const auto formats = camera.videoFormats(); - for (const auto &fmt : formats) { - if (fmt.pixelFormat() == QVideoFrameFormat::Format_Invalid) - continue; - // check if fmt is better. We try to find the highest resolution that offers - // at least 30 FPS - // we use 29 FPS to compare against as some cameras report 29.97 FPS... - if (f.maxFrameRate() < 29 && fmt.maxFrameRate() > f.maxFrameRate()) - f = fmt; - else if (f.maxFrameRate() == fmt.maxFrameRate() && - f.resolution().width()*f.resolution().height() < fmt.resolution().width()*fmt.resolution().height()) - f = fmt; - } - return f; + QVideoFrameFormat result(m_cameraFormat.resolution(), + m_framePixelFormat == QVideoFrameFormat::Format_Invalid + ? m_cameraFormat.pixelFormat() + : m_framePixelFormat); + result.setStreamFrameRate(m_cameraFormat.maxFrameRate()); + return result; } -/*! - \fn void QPlatformCamera::error(int error, const QString &errorString) - - Signal emitted when an error occurs with error code \a error and - a description of the error \a errorString. -*/ - void QPlatformCamera::supportedFeaturesChanged(QCamera::Features f) { if (m_supportedFeatures == f) @@ -258,7 +221,12 @@ int QPlatformCamera::colorTemperatureForWhiteBalance(QCamera::WhiteBalanceMode m return 0; } - +void QPlatformCamera::updateError(QCamera::Error error, const QString &errorString) +{ + QMetaObject::invokeMethod(this, [this, error, errorString]() { + m_error.setAndNotify(error, errorString, *this); + }); +} QT_END_NAMESPACE diff --git a/src/multimedia/platform/qplatformcamera_p.h b/src/multimedia/platform/qplatformcamera_p.h index da910ce9e..341bf9121 100644 --- a/src/multimedia/platform/qplatformcamera_p.h +++ b/src/multimedia/platform/qplatformcamera_p.h @@ -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 #ifndef QPLATFORMCAMERA_H #define QPLATFORMCAMERA_H @@ -51,28 +15,21 @@ // We mean it. // -#include <QtCore/qobject.h> -#include <QtMultimedia/qtmultimediaglobal.h> - +#include "qplatformvideosource_p.h" +#include "private/qerrorinfo_p.h" #include <QtMultimedia/qcamera.h> -#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE -class Q_MULTIMEDIA_EXPORT QPlatformCamera : public QObject +class Q_MULTIMEDIA_EXPORT QPlatformCamera : public QPlatformVideoSource { Q_OBJECT public: - virtual bool isActive() const = 0; - virtual void setActive(bool active) = 0; - virtual void setCamera(const QCameraDevice &camera) = 0; virtual bool setCameraFormat(const QCameraFormat &/*format*/) { return false; } QCameraFormat cameraFormat() const { return m_cameraFormat; } - virtual void setCaptureSession(QPlatformMediaCaptureSession *) {} - virtual bool isFocusModeSupported(QCamera::FocusMode mode) const { return mode == QCamera::FocusModeAuto; } virtual void setFocusMode(QCamera::FocusMode /*mode*/) {} @@ -102,6 +59,8 @@ public: virtual void setWhiteBalanceMode(QCamera::WhiteBalanceMode /*mode*/) {} virtual void setColorTemperature(int /*temperature*/) {} + QVideoFrameFormat frameFormat() const override; + QCamera::Features supportedFeatures() const { return m_supportedFeatures; } QCamera::FocusMode focusMode() const { return m_focusMode; } @@ -151,19 +110,27 @@ public: static int colorTemperatureForWhiteBalance(QCamera::WhiteBalanceMode mode); - // Can't use FFmpeg specific struct here, use void * for now. - virtual const void *ffmpegHWAccel() const { return nullptr; } + QCamera::Error error() const { return m_error.code(); } + QString errorString() const final { return m_error.description(); } + + void updateError(QCamera::Error error, const QString &errorString); Q_SIGNALS: - void activeChanged(bool); - void error(int error, const QString &errorString); - void newVideoFrame(const QVideoFrame &); // only used by FFmpeg + void errorOccurred(QCamera::Error error, const QString &errorString); protected: explicit QPlatformCamera(QCamera *parent); - static QCameraFormat findBestCameraFormat(const QCameraDevice &camera); + virtual int cameraPixelFormatScore(QVideoFrameFormat::PixelFormat /*format*/, + QVideoFrameFormat::ColorRange /*colorRange*/) const + { + return 0; + } + + QCameraFormat findBestCameraFormat(const QCameraDevice &camera) const; QCameraFormat m_cameraFormat; + QVideoFrameFormat::PixelFormat m_framePixelFormat = QVideoFrameFormat::Format_Invalid; + private: QCamera *m_camera = nullptr; QCamera::Features m_supportedFeatures = {}; @@ -188,6 +155,7 @@ private: float m_maxExposureTime = -1.; QCamera::WhiteBalanceMode m_whiteBalance = QCamera::WhiteBalanceAuto; int m_colorTemperature = 0; + QErrorInfo<QCamera::Error> m_error; }; QT_END_NAMESPACE diff --git a/src/multimedia/platform/qplatformcapturablewindows_p.h b/src/multimedia/platform/qplatformcapturablewindows_p.h new file mode 100644 index 000000000..41949aaac --- /dev/null +++ b/src/multimedia/platform/qplatformcapturablewindows_p.h @@ -0,0 +1,44 @@ +// Copyright (C) 2023 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 QPLATFORMCAPTURABLEWINDOWS_P_H +#define QPLATFORMCAPTURABLEWINDOWS_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "private/qtmultimediaglobal_p.h" +#include "qcapturablewindow.h" + +#include <qlist.h> + +QT_BEGIN_NAMESPACE + +class QCapturableWindow; +class QCapturableWindowPrivate; + +class QPlatformCapturableWindows +{ +public: + QPlatformCapturableWindows() = default; + + virtual ~QPlatformCapturableWindows() = default; + + virtual QList<QCapturableWindow> windows() const { return {}; } + + virtual bool isWindowValid(const QCapturableWindowPrivate &) const { return false; } + + Q_DISABLE_COPY(QPlatformCapturableWindows); +}; + +QT_END_NAMESPACE + +#endif // QPLATFORMCAPTURABLEWINDOWS_P_H diff --git a/src/multimedia/platform/qplatformimagecapture.cpp b/src/multimedia/platform/qplatformimagecapture.cpp index 5cfc7e31e..5d8349256 100644 --- a/src/multimedia/platform/qplatformimagecapture.cpp +++ b/src/multimedia/platform/qplatformimagecapture.cpp @@ -1,58 +1,16 @@ -/**************************************************************************** -** -** 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 #include "qplatformimagecapture_p.h" #include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE -/*! - \class QPlatformImageCapture - \obsolete - - \brief The QPlatformImageCapture class provides a control interface - for image capture services. - - \inmodule QtMultimedia - \ingroup multimedia_control - -*/ +QPlatformImageCapture::QPlatformImageCapture(QImageCapture *parent) + : QObject(parent), + m_imageCapture(parent) +{ +} QString QPlatformImageCapture::msgCameraNotReady() { @@ -64,114 +22,6 @@ QString QPlatformImageCapture::msgImageCaptureNotSet() return QImageCapture::tr("No instance of QImageCapture set on QMediaCaptureSession."); } -/*! - Constructs a new image capture control object with the given \a parent -*/ -QPlatformImageCapture::QPlatformImageCapture(QImageCapture *parent) - : QObject(parent), - m_imageCapture(parent) -{ -} - -/*! - \fn QPlatformImageCapture::isReadyForCapture() const - - Identifies if a capture control is ready to perform a capture - immediately (all the resources necessary for image capture are allocated, - hardware initialized, flash is charged, etc). - - Returns true if the camera is ready for capture; and false if it is not. - - It's permissible to call capture() while the camera status is QCamera::ActiveStatus - regardless of isReadyForCapture property value. - If camera is not ready to capture image immediately, - the capture request is queued with all the related camera settings - to be executed as soon as possible. -*/ - -/*! - \fn QPlatformImageCapture::readyForCaptureChanged(bool ready) - - Signals that a capture control's \a ready state has changed. -*/ - -/*! - \fn QPlatformImageCapture::capture(const QString &fileName) - - Initiates the capture of an image to \a fileName. - The \a fileName can be relative or empty, - in this case the service should use the system specific place - and file naming scheme. - - The Camera service should save all the capture parameters - like exposure settings or image processing parameters, - so changes to camera parameters after capture() is called - do not affect previous capture requests. - - Returns the capture request id number, which is used later - with imageExposed(), imageCaptured() and imageSaved() signals. -*/ - -/*! - \fn QPlatformImageCapture::imageExposed(int requestId) - - Signals that an image with it \a requestId - has just been exposed. - This signal can be used for the shutter sound or other indicaton. -*/ - -/*! - \fn QPlatformImageCapture::imageCaptured(int requestId, const QImage &preview) - - Signals that an image with it \a requestId - has been captured and a \a preview is available. -*/ - -/*! - \fn QPlatformImageCapture::imageMetadataAvailable(int id, const QMediaMetaData &metaData) - - Signals that a metadata for an image with request \a id is available. - - This signal should be emitted between imageExposed and imageSaved signals. -*/ - -/*! - \fn QPlatformImageCapture::imageAvailable(int requestId, const QVideoFrame &buffer) - - Signals that a captured \a buffer with a \a requestId is available. -*/ - -/*! - \fn QPlatformImageCapture::imageSaved(int requestId, const QString &fileName) - - Signals that a captured image with a \a requestId has been saved - to \a fileName. -*/ - -/*! - \fn QPlatformImageCapture::imageSettings() const - - Returns the currently used image encoder settings. - - The returned value may be different than passed to setImageSettings() - if the settings contains defaulted or undefined parameters. -*/ - -/*! - \fn QPlatformImageCapture::setImageSettings(const QImageEncoderSettings &settings) - - Sets the selected image encoder \a settings. -*/ - -/*! - \fn QPlatformImageCapture::error(int id, int error, const QString &errorString) - - Signals the capture request \a id failed with \a error code and message \a errorString. - - \sa QImageCapture::Error -*/ - - QT_END_NAMESPACE #include "moc_qplatformimagecapture_p.cpp" diff --git a/src/multimedia/platform/qplatformimagecapture_p.h b/src/multimedia/platform/qplatformimagecapture_p.h index 3d862fa7d..5bfb15ced 100644 --- a/src/multimedia/platform/qplatformimagecapture_p.h +++ b/src/multimedia/platform/qplatformimagecapture_p.h @@ -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 #ifndef QCAMERAIMAGECAPTURECONTROL_H #define QCAMERAIMAGECAPTURECONTROL_H diff --git a/src/multimedia/platform/qplatformmediacapture.cpp b/src/multimedia/platform/qplatformmediacapture.cpp index b041f69db..13bcbd63b 100644 --- a/src/multimedia/platform/qplatformmediacapture.cpp +++ b/src/multimedia/platform/qplatformmediacapture.cpp @@ -1,52 +1,37 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ - -#include <qtmultimediaglobal_p.h> -#include "qplatformmediacapture_p.h" -#include "qaudiodevice.h" -#include "qaudioinput.h" +// 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 <QtMultimedia/qaudiodevice.h> +#include <QtMultimedia/qaudioinput.h> +#include <QtMultimedia/qmediacapturesession.h> +#include <QtMultimedia/private/qplatformcamera_p.h> +#include <QtMultimedia/private/qplatformmediacapture_p.h> +#include <QtMultimedia/private/qmediacapturesession_p.h> +#include <QtMultimedia/private/qplatformsurfacecapture_p.h> +#include <QtMultimedia/private/qplatformvideoframeinput_p.h> +#include <QtMultimedia/private/qtmultimediaglobal_p.h> QT_BEGIN_NAMESPACE -QPlatformMediaCaptureSession::~QPlatformMediaCaptureSession() +QPlatformMediaCaptureSession::~QPlatformMediaCaptureSession() = default; + +std::vector<QPlatformVideoSource *> QPlatformMediaCaptureSession::activeVideoSources() { + std::vector<QPlatformVideoSource *> result; + + auto checkSource = [&result](QPlatformVideoSource *source) { + if (source && source->isActive()) + result.push_back(source); + }; + + checkSource(videoFrameInput()); + checkSource(camera()); + checkSource(screenCapture()); + checkSource(windowCapture()); + + return result; } QT_END_NAMESPACE +#include "moc_qplatformmediacapture_p.cpp" diff --git a/src/multimedia/platform/qplatformmediacapture_p.h b/src/multimedia/platform/qplatformmediacapture_p.h index dc6bdd230..8d6afc90e 100644 --- a/src/multimedia/platform/qplatformmediacapture_p.h +++ b/src/multimedia/platform/qplatformmediacapture_p.h @@ -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 #ifndef QPLATFORMMEDIACAPTURE_H #define QPLATFORMMEDIACAPTURE_H @@ -63,13 +27,17 @@ class QVideoSink; class QPlatformAudioInput; class QPlatformAudioOutput; class QMediaCaptureSession; +class QPlatformSurfaceCapture; +class QPlatformVideoSource; +class QPlatformAudioBufferInput; +class QPlatformVideoFrameInput; class Q_MULTIMEDIA_EXPORT QPlatformMediaCaptureSession : public QObject { Q_OBJECT public: QPlatformMediaCaptureSession() = default; - virtual ~QPlatformMediaCaptureSession(); + ~QPlatformMediaCaptureSession() override; void setCaptureSession(QMediaCaptureSession *session) { m_session = session; } QMediaCaptureSession *captureSession() const { return m_session; } @@ -77,6 +45,15 @@ public: virtual QPlatformCamera *camera() = 0; virtual void setCamera(QPlatformCamera *) {} + virtual QPlatformSurfaceCapture *screenCapture() { return nullptr; } + virtual void setScreenCapture(QPlatformSurfaceCapture *) {} + + virtual QPlatformSurfaceCapture *windowCapture() { return nullptr; } + virtual void setWindowCapture(QPlatformSurfaceCapture *) { } + + virtual QPlatformVideoFrameInput *videoFrameInput() { return nullptr; } + virtual void setVideoFrameInput(QPlatformVideoFrameInput *) { } + virtual QPlatformImageCapture *imageCapture() = 0; virtual void setImageCapture(QPlatformImageCapture *) {} @@ -85,12 +62,20 @@ public: virtual void setAudioInput(QPlatformAudioInput *input) = 0; + virtual void setAudioBufferInput(QPlatformAudioBufferInput *) { } + virtual void setVideoPreview(QVideoSink * /*sink*/) {} virtual void setAudioOutput(QPlatformAudioOutput *) {} + // TBD: implement ordering of the sources basing on the order of adding + std::vector<QPlatformVideoSource *> activeVideoSources(); + Q_SIGNALS: void cameraChanged(); + void screenCaptureChanged(); + void windowCaptureChanged(); + void videoFrameInputChanged(); void imageCaptureChanged(); void encoderChanged(); diff --git a/src/multimedia/platform/qplatformmediadevices.cpp b/src/multimedia/platform/qplatformmediadevices.cpp index 69f5e3054..a6029228d 100644 --- a/src/multimedia/platform/qplatformmediadevices.cpp +++ b/src/multimedia/platform/qplatformmediadevices.cpp @@ -1,56 +1,18 @@ -/**************************************************************************** -** -** 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 "qplatformmediadevices_p.h" -#include "qmediadevices.h" -#include "qaudiodevice.h" +#include "qplatformmediaintegration_p.h" #include "qcameradevice.h" #include "qaudiosystem_p.h" - -#include <qmutex.h> -#include <qloggingcategory.h> +#include "qaudiodevice.h" +#include "qplatformvideodevices_p.h" #if defined(Q_OS_ANDROID) #include <qandroidmediadevices_p.h> #elif defined(Q_OS_DARWIN) #include <qdarwinmediadevices_p.h> -#elif defined(Q_OS_WINDOWS) +#elif defined(Q_OS_WINDOWS) && QT_CONFIG(wmf) #include <qwindowsmediadevices_p.h> #elif QT_CONFIG(alsa) #include <qalsamediadevices_p.h> @@ -65,108 +27,88 @@ QT_BEGIN_NAMESPACE -namespace { -struct Holder { - ~Holder() - { - QMutexLocker locker(&mutex); - delete nativeInstance; - nativeInstance = nullptr; - instance = nullptr; - } - QBasicMutex mutex; - QPlatformMediaDevices *instance = nullptr; - QPlatformMediaDevices *nativeInstance = nullptr; -} holder; - -} - -QPlatformMediaDevices *QPlatformMediaDevices::instance() +std::unique_ptr<QPlatformMediaDevices> QPlatformMediaDevices::create() { - QMutexLocker locker(&holder.mutex); - if (holder.instance) - return holder.instance; - #ifdef Q_OS_DARWIN - holder.nativeInstance = new QDarwinMediaDevices; -#elif defined(Q_OS_WINDOWS) - holder.nativeInstance = new QWindowsMediaDevices; + return std::make_unique<QDarwinMediaDevices>(); +#elif defined(Q_OS_WINDOWS) && QT_CONFIG(wmf) + return std::make_unique<QWindowsMediaDevices>(); #elif defined(Q_OS_ANDROID) - holder.nativeInstance = new QAndroidMediaDevices; + return std::make_unique<QAndroidMediaDevices>(); #elif QT_CONFIG(alsa) - holder.nativeInstance = new QAlsaMediaDevices; + return std::make_unique<QAlsaMediaDevices>(); #elif QT_CONFIG(pulseaudio) - holder.nativeInstance = new QPulseAudioMediaDevices; + return std::make_unique<QPulseAudioMediaDevices>(); #elif defined(Q_OS_QNX) - holder.nativeInstance = new QQnxMediaDevices; + return std::make_unique<QQnxMediaDevices>(); #elif defined(Q_OS_WASM) - holder.nativeInstance = new QWasmMediaDevices; + return std::make_unique<QWasmMediaDevices>(); +#else + return std::make_unique<QPlatformMediaDevices>(); #endif - - holder.instance = holder.nativeInstance; - return holder.instance; } +QPlatformMediaDevices::QPlatformMediaDevices() = default; -QPlatformMediaDevices::QPlatformMediaDevices() -{} - -void QPlatformMediaDevices::setDevices(QPlatformMediaDevices *devices) +void QPlatformMediaDevices::initVideoDevicesConnection() { - holder.instance = devices; + // Make sure we are notified if video inputs changed + if (const auto videoDevices = QPlatformMediaIntegration::instance()->videoDevices()) + connect(videoDevices, &QPlatformVideoDevices::videoInputsChanged, this, + &QPlatformMediaDevices::videoInputsChanged, Qt::UniqueConnection); } QPlatformMediaDevices::~QPlatformMediaDevices() = default; -QList<QCameraDevice> QPlatformMediaDevices::videoInputs() const +QList<QAudioDevice> QPlatformMediaDevices::audioInputs() const { return {}; } -QPlatformAudioSource* QPlatformMediaDevices::audioInputDevice(const QAudioFormat &format, const QAudioDevice &deviceInfo) +QList<QAudioDevice> QPlatformMediaDevices::audioOutputs() const +{ + return {}; +} + +QPlatformAudioSource *QPlatformMediaDevices::createAudioSource(const QAudioDevice &, QObject *) +{ + return nullptr; +} +QPlatformAudioSink *QPlatformMediaDevices::createAudioSink(const QAudioDevice &, QObject *) +{ + return nullptr; +} + +QPlatformAudioSource *QPlatformMediaDevices::audioInputDevice(const QAudioFormat &format, + const QAudioDevice &deviceInfo, + QObject *parent) { QAudioDevice info = deviceInfo; if (info.isNull()) info = audioInputs().value(0); - QPlatformAudioSource* p = !info.isNull() ? createAudioSource(info) : nullptr; + QPlatformAudioSource* p = !info.isNull() ? createAudioSource(info, parent) : nullptr; if (p) p->setFormat(format); return p; } -QPlatformAudioSink* QPlatformMediaDevices::audioOutputDevice(const QAudioFormat &format, const QAudioDevice &deviceInfo) +QPlatformAudioSink *QPlatformMediaDevices::audioOutputDevice(const QAudioFormat &format, + const QAudioDevice &deviceInfo, + QObject *parent) { QAudioDevice info = deviceInfo; if (info.isNull()) info = audioOutputs().value(0); - QPlatformAudioSink* p = !info.isNull() ? createAudioSink(info) : nullptr; + QPlatformAudioSink* p = !info.isNull() ? createAudioSink(info, parent) : nullptr; if (p) p->setFormat(format); return p; } -void QPlatformMediaDevices::audioInputsChanged() const -{ - const auto devices = allMediaDevices(); - for (auto m : devices) - emit m->audioInputsChanged(); -} - -void QPlatformMediaDevices::audioOutputsChanged() const -{ - const auto devices = allMediaDevices(); - for (auto m : devices) - emit m->audioOutputsChanged(); -} - -void QPlatformMediaDevices::videoInputsChanged() const -{ - const auto devices = allMediaDevices(); - for (auto m : devices) - emit m->videoInputsChanged(); -} - +void QPlatformMediaDevices::prepareAudio() { } QT_END_NAMESPACE + +#include "moc_qplatformmediadevices_p.cpp" diff --git a/src/multimedia/platform/qplatformmediadevices_p.h b/src/multimedia/platform/qplatformmediadevices_p.h index d7048a6ce..0de41a973 100644 --- a/src/multimedia/platform/qplatformmediadevices_p.h +++ b/src/multimedia/platform/qplatformmediadevices_p.h @@ -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 #ifndef QPLATFORMMEDIADEVICES_H #define QPLATFORMMEDIADEVICES_H @@ -53,53 +17,44 @@ #include <private/qtmultimediaglobal_p.h> #include <qlist.h> +#include <qobject.h> +#include <memory> QT_BEGIN_NAMESPACE -class QMediaDevices; class QAudioDevice; -class QCameraDevice; class QPlatformAudioSource; class QPlatformAudioSink; class QAudioFormat; -class QPlatformMediaIntegration; -class Q_MULTIMEDIA_EXPORT QPlatformMediaDevices +class Q_MULTIMEDIA_EXPORT QPlatformMediaDevices : public QObject { + Q_OBJECT public: QPlatformMediaDevices(); - virtual ~QPlatformMediaDevices(); + ~QPlatformMediaDevices() override; - static void setDevices(QPlatformMediaDevices *); - static QPlatformMediaDevices *instance(); + static std::unique_ptr<QPlatformMediaDevices> create(); - virtual QList<QAudioDevice> audioInputs() const = 0; - virtual QList<QAudioDevice> audioOutputs() const = 0; - virtual QList<QCameraDevice> videoInputs() const; - virtual QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo) = 0; - virtual QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo) = 0; + virtual QList<QAudioDevice> audioInputs() const; + virtual QList<QAudioDevice> audioOutputs() const; - QPlatformAudioSource *audioInputDevice(const QAudioFormat &format, const QAudioDevice &deviceInfo); - QPlatformAudioSink *audioOutputDevice(const QAudioFormat &format, const QAudioDevice &deviceInfo); + virtual QPlatformAudioSource *createAudioSource(const QAudioDevice &, QObject *parent); + virtual QPlatformAudioSink *createAudioSink(const QAudioDevice &, QObject *parent); - void addMediaDevices(QMediaDevices *m) - { - m_devices.append(m); - } - void removeMediaDevices(QMediaDevices *m) - { - m_devices.removeAll(m); - } + QPlatformAudioSource *audioInputDevice(const QAudioFormat &format, + const QAudioDevice &deviceInfo, QObject *parent); + QPlatformAudioSink *audioOutputDevice(const QAudioFormat &format, + const QAudioDevice &deviceInfo, QObject *parent); - QList<QMediaDevices *> allMediaDevices() const { return m_devices; } + virtual void prepareAudio(); - void videoInputsChanged() const; + void initVideoDevicesConnection(); -protected: - void audioInputsChanged() const; - void audioOutputsChanged() const; - - QList<QMediaDevices *> m_devices; +Q_SIGNALS: + void audioInputsChanged(); + void audioOutputsChanged(); + void videoInputsChanged(); }; QT_END_NAMESPACE diff --git a/src/multimedia/platform/qplatformmediaformatinfo.cpp b/src/multimedia/platform/qplatformmediaformatinfo.cpp index d4bfecafc..e69b32ed3 100644 --- a/src/multimedia/platform/qplatformmediaformatinfo.cpp +++ b/src/multimedia/platform/qplatformmediaformatinfo.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 "qplatformmediaformatinfo_p.h" #include <qset.h> diff --git a/src/multimedia/platform/qplatformmediaformatinfo_p.h b/src/multimedia/platform/qplatformmediaformatinfo_p.h index 8842304ca..4229a3c4c 100644 --- a/src/multimedia/platform/qplatformmediaformatinfo_p.h +++ b/src/multimedia/platform/qplatformmediaformatinfo_p.h @@ -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 #ifndef QPLATFORMMEDIAFORMATINFO_H #define QPLATFORMMEDIAFORMATINFO_H diff --git a/src/multimedia/platform/qplatformmediaintegration.cpp b/src/multimedia/platform/qplatformmediaintegration.cpp index fbf094290..b9aa1e258 100644 --- a/src/multimedia/platform/qplatformmediaintegration.cpp +++ b/src/multimedia/platform/qplatformmediaintegration.cpp @@ -1,158 +1,222 @@ -/**************************************************************************** -** -** 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 <qtmultimediaglobal_p.h> #include "qplatformmediaintegration_p.h" -#include "qplatformmediadevices_p.h" #include <qatomic.h> #include <qmutex.h> #include <qplatformaudioinput_p.h> #include <qplatformaudiooutput_p.h> +#include <qplatformaudioresampler_p.h> #include <qplatformvideodevices_p.h> #include <qmediadevices.h> #include <qcameradevice.h> #include <qloggingcategory.h> +#include <QtCore/qcoreapplication.h> +#include <QtCore/qapplicationstatic.h> -#include "QtCore/private/qfactoryloader_p.h" +#include "qplatformcapturablewindows_p.h" +#include "qplatformmediadevices_p.h" +#include <QtCore/private/qfactoryloader_p.h> +#include <QtCore/private/qcoreapplication_p.h> +#include <private/qplatformmediaformatinfo_p.h> #include "qplatformmediaplugin_p.h" -class QDummyIntegration : public QPlatformMediaIntegration +namespace { + +class QFallbackIntegration : public QPlatformMediaIntegration { public: - QDummyIntegration() { qFatal("QtMultimedia is not currently supported on this platform or compiler."); } - QPlatformMediaFormatInfo *formatInfo() override { return nullptr; } + QFallbackIntegration() : QPlatformMediaIntegration(QLatin1String("fallback")) + { + qWarning("No QtMultimedia backends found. Only QMediaDevices, QAudioDevice, QSoundEffect, QAudioSink, and QAudioSource are available."); + } }; -Q_LOGGING_CATEGORY(qLcMediaPlugin, "qt.multimedia.plugin") +Q_STATIC_LOGGING_CATEGORY(qLcMediaPlugin, "qt.multimedia.plugin") Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QPlatformMediaPlugin_iid, QLatin1String("/multimedia"))) -static QStringList backends() +static const auto FFmpegBackend = QStringLiteral("ffmpeg"); + +static QString defaultBackend(const QStringList &backends) { - QStringList list; +#ifdef QT_DEFAULT_MEDIA_BACKEND + auto backend = QString::fromUtf8(QT_DEFAULT_MEDIA_BACKEND); + if (backends.contains(backend)) + return backend; +#endif + +#if defined(Q_OS_DARWIN) || defined(Q_OS_LINUX) || defined(Q_OS_WINDOWS) || defined(Q_OS_ANDROID) + // Return ffmpeg backend by default. + // Platform backends for the OS list are optionally available but have limited support. + if (backends.contains(FFmpegBackend)) + return FFmpegBackend; +#else + // Return platform backend (non-ffmpeg) by default. + if (backends.size() > 1 && backends[0] == FFmpegBackend) + return backends[1]; +#endif + + return backends[0]; +} - if (QFactoryLoader *fl = loader()) { - const auto keyMap = fl->keyMap(); - for (auto it = keyMap.constBegin(); it != keyMap.constEnd(); ++it) - if (!list.contains(it.value())) - list << it.value(); +struct InstanceHolder +{ + InstanceHolder() + { + if (!QCoreApplication::instance()) + qCCritical(qLcMediaPlugin()) << "Qt Multimedia requires a QCoreApplication instance"; + + const QStringList backends = QPlatformMediaIntegration::availableBackends(); + QString backend = QString::fromUtf8(qgetenv("QT_MEDIA_BACKEND")); + if (backend.isEmpty() && !backends.isEmpty()) + backend = defaultBackend(backends); + + qCDebug(qLcMediaPlugin) << "Loading media backend" << backend; + instance.reset( + qLoadPlugin<QPlatformMediaIntegration, QPlatformMediaPlugin>(loader(), backend)); + + if (!instance) { + // No backends found. Use fallback to support basic functionality + instance = std::make_unique<QFallbackIntegration>(); + } } - qCDebug(qLcMediaPlugin) << "Available backends" << list; - return list; -} + ~InstanceHolder() + { + instance.reset(); + qCDebug(qLcMediaPlugin) << "Released media backend"; + } + + std::unique_ptr<QPlatformMediaIntegration> instance; +}; + +Q_APPLICATION_STATIC(InstanceHolder, s_instanceHolder); + +} // namespace QT_BEGIN_NAMESPACE -namespace { -struct Holder { - ~Holder() - { - QMutexLocker locker(&mutex); - instance = nullptr; - } - QBasicMutex mutex; - QPlatformMediaIntegration *instance = nullptr; - QPlatformMediaIntegration *nativeInstance = nullptr; -} holder; +QPlatformMediaIntegration *QPlatformMediaIntegration::instance() +{ + return s_instanceHolder->instance.get(); +} +QList<QCameraDevice> QPlatformMediaIntegration::videoInputs() +{ + auto devices = videoDevices(); + return devices ? devices->videoDevices() : QList<QCameraDevice>{}; } -QPlatformMediaIntegration *QPlatformMediaIntegration::instance() +QMaybe<std::unique_ptr<QPlatformAudioResampler>> +QPlatformMediaIntegration::createAudioResampler(const QAudioFormat &, const QAudioFormat &) { - QMutexLocker locker(&holder.mutex); - if (holder.instance) - return holder.instance; + return notAvailable; +} - auto plugins = backends(); +QMaybe<QPlatformAudioInput *> QPlatformMediaIntegration::createAudioInput(QAudioInput *q) +{ + return new QPlatformAudioInput(q); +} - QString type = QString::fromUtf8(qgetenv("QT_MEDIA_BACKEND")); - if (type.isEmpty() && !plugins.isEmpty()) { - type = plugins.first(); - // FIXME: prefer platform specific backend if available over ffmpeg until it becomes mature - if (type == QStringLiteral("ffmpeg") && plugins.size() > 1) - type = plugins[1]; - } +QMaybe<QPlatformAudioOutput *> QPlatformMediaIntegration::createAudioOutput(QAudioOutput *q) +{ + return new QPlatformAudioOutput(q); +} - qCDebug(qLcMediaPlugin) << "loading backend" << type; - holder.nativeInstance = qLoadPlugin<QPlatformMediaIntegration, QPlatformMediaPlugin>(loader(), type); +QList<QCapturableWindow> QPlatformMediaIntegration::capturableWindowsList() +{ + const auto capturableWindows = this->capturableWindows(); + return capturableWindows ? capturableWindows->windows() : QList<QCapturableWindow>{}; +} - if (!holder.nativeInstance) { - qWarning() << "could not load multimedia backend" << type; - holder.nativeInstance = new QDummyIntegration; - } +bool QPlatformMediaIntegration::isCapturableWindowValid(const QCapturableWindowPrivate &window) +{ + const auto capturableWindows = this->capturableWindows(); + return capturableWindows && capturableWindows->isWindowValid(window); +} - holder.instance = holder.nativeInstance; - return holder.instance; +const QPlatformMediaFormatInfo *QPlatformMediaIntegration::formatInfo() +{ + std::call_once(m_formatInfoOnceFlg, [this]() { + m_formatInfo.reset(createFormatInfo()); + Q_ASSERT(m_formatInfo); + }); + return m_formatInfo.get(); } -/* - This API is there to be able to test with a mock backend. -*/ -void QPlatformMediaIntegration::setIntegration(QPlatformMediaIntegration *integration) +QPlatformMediaFormatInfo *QPlatformMediaIntegration::createFormatInfo() { - if (integration) - holder.instance = integration; - else - holder.instance = holder.nativeInstance; + return new QPlatformMediaFormatInfo; } -QList<QCameraDevice> QPlatformMediaIntegration::videoInputs() +std::unique_ptr<QPlatformMediaDevices> QPlatformMediaIntegration::createMediaDevices() { - return m_videoDevices ? m_videoDevices->videoDevices() : QList<QCameraDevice>{}; + return QPlatformMediaDevices::create(); } -QPlatformAudioInput *QPlatformMediaIntegration::createAudioInput(QAudioInput *q) +// clang-format off +QPlatformVideoDevices *QPlatformMediaIntegration::videoDevices() { - return new QPlatformAudioInput(q); + std::call_once(m_videoDevicesOnceFlag, + [this]() { + m_videoDevices.reset(createVideoDevices()); + }); + return m_videoDevices.get(); } -QPlatformAudioOutput *QPlatformMediaIntegration::createAudioOutput(QAudioOutput *q) +QPlatformCapturableWindows *QPlatformMediaIntegration::capturableWindows() { - return new QPlatformAudioOutput(q); + std::call_once(m_capturableWindowsOnceFlag, + [this]() { + m_capturableWindows.reset(createCapturableWindows()); + }); + return m_capturableWindows.get(); } -QPlatformMediaIntegration::~QPlatformMediaIntegration() +QPlatformMediaDevices *QPlatformMediaIntegration::mediaDevices() { - delete m_videoDevices; + std::call_once(m_mediaDevicesOnceFlag, [this] { + m_mediaDevices = createMediaDevices(); + }); + return m_mediaDevices.get(); } +// clang-format on + +QStringList QPlatformMediaIntegration::availableBackends() +{ + QStringList list; + + if (QFactoryLoader *fl = loader()) { + const auto keyMap = fl->keyMap(); + for (auto it = keyMap.constBegin(); it != keyMap.constEnd(); ++it) + if (!list.contains(it.value())) + list << it.value(); + } + + qCDebug(qLcMediaPlugin) << "Available backends" << list; + return list; +} + +QLatin1String QPlatformMediaIntegration::name() +{ + return m_backendName; +} + +QVideoFrame QPlatformMediaIntegration::convertVideoFrame(QVideoFrame &, + const QVideoFrameFormat &) +{ + return {}; +} + +QPlatformMediaIntegration::QPlatformMediaIntegration(QLatin1String name) : m_backendName(name) { } + +QPlatformMediaIntegration::~QPlatformMediaIntegration() = default; + QT_END_NAMESPACE + +#include "moc_qplatformmediaintegration_p.cpp" diff --git a/src/multimedia/platform/qplatformmediaintegration_p.h b/src/multimedia/platform/qplatformmediaintegration_p.h index 5a6d07344..d03d0c794 100644 --- a/src/multimedia/platform/qplatformmediaintegration_p.h +++ b/src/multimedia/platform/qplatformmediaintegration_p.h @@ -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 #ifndef QPLATFORMMEDIAINTEGRATION_H #define QPLATFORMMEDIAINTEGRATION_H @@ -51,13 +15,21 @@ // #include <private/qtmultimediaglobal_p.h> +#include <private/qmultimediautils_p.h> +#include <qcapturablewindow.h> #include <qmediarecorder.h> +#include <qstring.h> + +#include <memory> +#include <mutex> QT_BEGIN_NAMESPACE class QMediaPlayer; class QAudioDecoder; class QCamera; +class QScreenCapture; +class QWindowCapture; class QMediaRecorder; class QImageCapture; class QMediaDevices; @@ -65,7 +37,9 @@ class QPlatformMediaDevices; class QPlatformMediaCaptureSession; class QPlatformMediaPlayer; class QPlatformAudioDecoder; +class QPlatformAudioResampler; class QPlatformCamera; +class QPlatformSurfaceCapture; class QPlatformMediaRecorder; class QPlatformImageCapture; class QPlatformMediaFormatInfo; @@ -77,34 +51,86 @@ class QAudioOutput; class QPlatformAudioInput; class QPlatformAudioOutput; class QPlatformVideoDevices; +class QCapturableWindow; +class QPlatformCapturableWindows; +class QVideoFrame; -class Q_MULTIMEDIA_EXPORT QPlatformMediaIntegration +class Q_MULTIMEDIA_EXPORT QAbstractPlatformSpecificInterface { public: - static QPlatformMediaIntegration *instance(); + virtual ~QAbstractPlatformSpecificInterface() = default; +}; - // API to be able to test with a mock backend - static void setIntegration(QPlatformMediaIntegration *); +class Q_MULTIMEDIA_EXPORT QPlatformMediaIntegration : public QObject +{ + Q_OBJECT + inline static const QString notAvailable = QStringLiteral("Not available"); +public: + static QPlatformMediaIntegration *instance(); + explicit QPlatformMediaIntegration(QLatin1String); virtual ~QPlatformMediaIntegration(); - virtual QPlatformMediaFormatInfo *formatInfo() = 0; + const QPlatformMediaFormatInfo *formatInfo(); virtual QList<QCameraDevice> videoInputs(); - virtual QPlatformCamera *createCamera(QCamera *) { return nullptr; } + virtual QMaybe<QPlatformCamera *> createCamera(QCamera *) { return notAvailable; } + virtual QPlatformSurfaceCapture *createScreenCapture(QScreenCapture *) { return nullptr; } + virtual QPlatformSurfaceCapture *createWindowCapture(QWindowCapture *) { return nullptr; } + + virtual QMaybe<QPlatformAudioDecoder *> createAudioDecoder(QAudioDecoder *) { return notAvailable; } + virtual QMaybe<std::unique_ptr<QPlatformAudioResampler>> + createAudioResampler(const QAudioFormat & /*inputFormat*/, + const QAudioFormat & /*outputFormat*/); + virtual QMaybe<QPlatformMediaCaptureSession *> createCaptureSession() { return notAvailable; } + virtual QMaybe<QPlatformMediaPlayer *> createPlayer(QMediaPlayer *) { return notAvailable; } + virtual QMaybe<QPlatformMediaRecorder *> createRecorder(QMediaRecorder *) { return notAvailable; } + virtual QMaybe<QPlatformImageCapture *> createImageCapture(QImageCapture *) { return notAvailable; } + + virtual QMaybe<QPlatformAudioInput *> createAudioInput(QAudioInput *); + virtual QMaybe<QPlatformAudioOutput *> createAudioOutput(QAudioOutput *); + + virtual QMaybe<QPlatformVideoSink *> createVideoSink(QVideoSink *) { return notAvailable; } + + QList<QCapturableWindow> capturableWindowsList(); + bool isCapturableWindowValid(const QCapturableWindowPrivate &); + + QPlatformVideoDevices *videoDevices(); - virtual QPlatformAudioDecoder *createAudioDecoder(QAudioDecoder *) { return nullptr; } - virtual QPlatformMediaCaptureSession *createCaptureSession() { return nullptr; } - virtual QPlatformMediaPlayer *createPlayer(QMediaPlayer *) { return nullptr; } - virtual QPlatformMediaRecorder *createRecorder(QMediaRecorder *) { return nullptr; } - virtual QPlatformImageCapture *createImageCapture(QImageCapture *) { return nullptr; } + QPlatformCapturableWindows *capturableWindows(); - virtual QPlatformAudioInput *createAudioInput(QAudioInput *); - virtual QPlatformAudioOutput *createAudioOutput(QAudioOutput *); + QPlatformMediaDevices *mediaDevices(); - virtual QPlatformVideoSink *createVideoSink(QVideoSink *) { return nullptr; } + static QStringList availableBackends(); + QLatin1String name(); // for unit tests + + // Convert a QVideoFrame to the destination format + virtual QVideoFrame convertVideoFrame(QVideoFrame &, const QVideoFrameFormat &); + + virtual QAbstractPlatformSpecificInterface *platformSpecificInterface() { return nullptr; } protected: - QPlatformVideoDevices *m_videoDevices = nullptr; + virtual QPlatformMediaFormatInfo *createFormatInfo(); + + virtual QPlatformVideoDevices *createVideoDevices() { return nullptr; } + + virtual QPlatformCapturableWindows *createCapturableWindows() { return nullptr; } + + virtual std::unique_ptr<QPlatformMediaDevices> createMediaDevices(); + +private: + std::unique_ptr<QPlatformVideoDevices> m_videoDevices; + std::once_flag m_videoDevicesOnceFlag; + + std::unique_ptr<QPlatformCapturableWindows> m_capturableWindows; + std::once_flag m_capturableWindowsOnceFlag; + + mutable std::unique_ptr<QPlatformMediaFormatInfo> m_formatInfo; + mutable std::once_flag m_formatInfoOnceFlg; + + std::unique_ptr<QPlatformMediaDevices> m_mediaDevices; + std::once_flag m_mediaDevicesOnceFlag; + + const QLatin1String m_backendName; }; QT_END_NAMESPACE diff --git a/src/multimedia/platform/qplatformmediaplayer.cpp b/src/multimedia/platform/qplatformmediaplayer.cpp index 21e25ec9b..00840f074 100644 --- a/src/multimedia/platform/qplatformmediaplayer.cpp +++ b/src/multimedia/platform/qplatformmediaplayer.cpp @@ -1,91 +1,20 @@ -/**************************************************************************** -** -** 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 #include "qplatformmediaplayer_p.h" #include <private/qmediaplayer_p.h> #include "qmediaplayer.h" +#include "qplatformmediadevices_p.h" +#include "qplatformmediaintegration_p.h" QT_BEGIN_NAMESPACE - -/*! - \class QPlatformMediaPlayer - \internal - - \brief The QPlatformMediaPlayer class provides access to the media playing - functionality. - - This control provides a means to set the \l {setMedia()}{media} to play, - \l {play()}{start}, \l {pause()} {pause} and \l {stop()}{stop} playback, - \l {setPosition()}{seek}, and control the \l {setVolume()}{volume}. - It also provides feedback on the \l {duration()}{duration} of the media, - the current \l {position()}{position}, and \l {bufferProgress()}{buffering} - progress. - - The functionality provided by this control is exposed to application - code through the QMediaPlayer class. - - \sa QMediaPlayer -*/ - -QPlatformMediaPlayer::~QPlatformMediaPlayer() +QPlatformMediaPlayer::QPlatformMediaPlayer(QMediaPlayer *parent) : player(parent) { + QPlatformMediaIntegration::instance()->mediaDevices()->prepareAudio(); } -/*! \fn QPlatformMediaPlayer::QPlatformMediaPlayer(QMediaPlayer *parent) - - Constructs a new media player control with the given \a parent. -*/ - -/*! - \fn QPlatformMediaPlayer::state() const - - Returns the state of a player control. -*/ - -/*! - \fn QPlatformMediaPlayer::stateChanged(QMediaPlayer::State newState) - - Signals that the state of a player control has changed to \a newState. - - \sa state() -*/ +QPlatformMediaPlayer::~QPlatformMediaPlayer() = default; void QPlatformMediaPlayer::stateChanged(QMediaPlayer::PlaybackState newState) { @@ -95,20 +24,6 @@ void QPlatformMediaPlayer::stateChanged(QMediaPlayer::PlaybackState newState) player->d_func()->setState(newState); } -/*! - \fn QPlatformMediaPlayer::mediaStatus() const - - Returns the status of the current media. -*/ - - -/*! - \fn QPlatformMediaPlayer::mediaStatusChanged(QMediaPlayer::MediaStatus status) - - Signals that the \a status of the current media has changed. - - \sa mediaStatus() -*/ void QPlatformMediaPlayer::mediaStatusChanged(QMediaPlayer::MediaStatus status) { if (m_status == status) @@ -119,254 +34,7 @@ void QPlatformMediaPlayer::mediaStatusChanged(QMediaPlayer::MediaStatus status) void QPlatformMediaPlayer::error(int error, const QString &errorString) { - player->d_func()->setError(error, errorString); + player->d_func()->setError(QMediaPlayer::Error(error), errorString); } -/*! - \fn QPlatformMediaPlayer::duration() const - - Returns the duration of the current media in milliseconds. -*/ - -/*! - \fn QPlatformMediaPlayer::durationChanged(qint64 duration) - - Signals that the \a duration of the current media has changed. - - \sa duration() -*/ - -/*! - \fn QPlatformMediaPlayer::position() const - - Returns the current playback position in milliseconds. -*/ - -/*! - \fn QPlatformMediaPlayer::setPosition(qint64 position) - - Sets the playback \a position of the current media. This will initiate a seek and it may take - some time for playback to reach the position set. -*/ - -/*! - \fn QPlatformMediaPlayer::positionChanged(qint64 position) - - Signals the playback \a position has changed. - - This is only emitted in when there has been a discontinous change in the playback postion, such - as a seek or the position being reset. - - \sa position() -*/ - -/*! - \fn QPlatformMediaPlayer::volume() const - - Returns the audio volume of a player control. -*/ - -/*! - \fn QPlatformMediaPlayer::setVolume(int volume) - - Sets the audio \a volume of a player control. - - The volume is scaled linearly, ranging from \c 0 (silence) to \c 100 (full volume). -*/ - -/*! - \fn QPlatformMediaPlayer::volumeChanged(int volume) - - Signals the audio \a volume of a player control has changed. - - \sa volume() -*/ - -/*! - \fn QPlatformMediaPlayer::isMuted() const - - Returns the mute state of a player control. -*/ - -/*! - \fn QPlatformMediaPlayer::setMuted(bool mute) - - Sets the \a mute state of a player control. -*/ - -/*! - \fn QPlatformMediaPlayer::mutedChanged(bool mute) - - Signals a change in the \a mute status of a player control. - - \sa isMuted() -*/ - -/*! - \fn QPlatformMediaPlayer::bufferProgress() const - - Returns the buffering progress of the current media. Progress is measured as a number between - 0 and 1. -*/ - -/*! - \fn QPlatformMediaPlayer::bufferProgressChanged(float filled) - - Signal the amount of the local buffer filled as a relative number between 0 and 1. - - \sa bufferProgress() -*/ - -/*! - \fn QPlatformMediaPlayer::isAudioAvailable() const - - Identifies if there is audio output available for the current media. - - Returns true if audio output is available and false otherwise. -*/ - -/*! - \fn QPlatformMediaPlayer::audioAvailableChanged(bool audioAvailable) - - Signals that there has been a change in the availability of audio output \a audioAvailable. - - \sa isAudioAvailable() -*/ - -/*! - \fn QPlatformMediaPlayer::isVideoAvailable() const - - Identifies if there is video output available for the current media. - - Returns true if video output is available and false otherwise. -*/ - -/*! - \fn QPlatformMediaPlayer::videoAvailableChanged(bool videoAvailable) - - Signal that the availability of visual content has changed to \a videoAvailable. - - \sa isVideoAvailable() -*/ - -/*! - \fn QPlatformMediaPlayer::isSeekable() const - - Identifies if the current media is seekable. - - Returns true if it possible to seek within the current media, and false otherwise. -*/ - -/*! - \fn QPlatformMediaPlayer::seekableChanged(bool seekable) - - Signals that the \a seekable state of a player control has changed. - - \sa isSeekable() -*/ - -/*! - \fn QPlatformMediaPlayer::availablePlaybackRanges() const - - Returns a range of times in milliseconds that can be played back. - - Usually for local files this is a continuous interval equal to [0..duration()] - or an empty time range if seeking is not supported, but for network sources - it refers to the buffered parts of the media. -*/ - -/*! - \fn qreal QPlatformMediaPlayer::playbackRate() const - - Returns the rate of playback. -*/ - -/*! - \fn QPlatformMediaPlayer::setPlaybackRate(qreal rate) - - Sets the \a rate of playback. -*/ - -/*! - \fn QPlatformMediaPlayer::media() const - - Returns the current media source. -*/ - -/*! - \fn QPlatformMediaPlayer::mediaStream() const - - Returns the current media stream. This is only a valid if a stream was passed to setMedia(). - - \sa setMedia() -*/ - -/*! - \fn QPlatformMediaPlayer::setMedia(const QUrl &media, QIODevice *stream) - - Sets the current \a media source. If a \a stream is supplied; data will be read from that - instead of attempting to resolve the media source. The media source may still be used to - supply media information such as mime type. - - Setting the media to a null QUrl will cause the control to discard all - information relating to the current media source and to cease all I/O operations related - to that media. - - Qt resource files are never passed as is. If the control supports - stream playback, a \a stream is supplied, pointing to an opened - QFile. Otherwise, the resource is copied into a temporary file and \a media contains the - url to that file. - - \sa streamPlaybackSupported() -*/ - -/*! - \fn QPlatformMediaPlayer::mediaChanged(const QUrl& content) - - Signals that the current media \a content has changed. -*/ - -/*! - \fn QPlatformMediaPlayer::play() - - Starts playback of the current media. - - If successful the player control will immediately enter the \l {QMediaPlayer::PlayingState} - {playing} state. - - \sa state() -*/ - -/*! - \fn QPlatformMediaPlayer::pause() - - Pauses playback of the current media. - - If successful the player control will immediately enter the \l {QMediaPlayer::PausedState} - {paused} state. - - \sa state(), play(), stop() -*/ - -/*! - \fn QPlatformMediaPlayer::stop() - - Stops playback of the current media. - - If successful the player control will immediately enter the \l {QMediaPlayer::StoppedState} - {stopped} state. -*/ - -/*! - \fn QPlatformMediaPlayer::error(int error, const QString &errorString) - - Signals that an \a error has occurred. The \a errorString provides a more detailed explanation. -*/ - -/*! - \fn QPlatformMediaPlayer::playbackRateChanged(qreal rate) - - Signal emitted when playback rate changes to \a rate. -*/ - QT_END_NAMESPACE diff --git a/src/multimedia/platform/qplatformmediaplayer_p.h b/src/multimedia/platform/qplatformmediaplayer_p.h index 0c61685ff..f8815958b 100644 --- a/src/multimedia/platform/qplatformmediaplayer_p.h +++ b/src/multimedia/platform/qplatformmediaplayer_p.h @@ -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 // // W A R N I N G @@ -58,6 +22,7 @@ #include <QtCore/qpair.h> #include <QtCore/private/qglobal_p.h> +#include <QtCore/qobject.h> QT_BEGIN_NAMESPACE @@ -100,48 +65,52 @@ public: virtual void setAudioOutput(QPlatformAudioOutput *) {} + virtual void setAudioBufferOutput(QAudioBufferOutput *) { } + virtual QMediaMetaData metaData() const { return {}; } virtual void setVideoSink(QVideoSink * /*sink*/) = 0; // media streams - enum TrackType { VideoStream, AudioStream, SubtitleStream, NTrackTypes }; + enum TrackType : uint8_t { VideoStream, AudioStream, SubtitleStream, NTrackTypes }; virtual int trackCount(TrackType) { return 0; }; virtual QMediaMetaData trackMetaData(TrackType /*type*/, int /*streamNumber*/) { return QMediaMetaData(); } virtual int activeTrack(TrackType) { return -1; } virtual void setActiveTrack(TrackType, int /*streamNumber*/) {} - void durationChanged(qint64 duration) { player->durationChanged(duration); } + void durationChanged(std::chrono::milliseconds ms) { durationChanged(ms.count()); } + void durationChanged(qint64 duration) { emit player->durationChanged(duration); } + void positionChanged(std::chrono::milliseconds ms) { positionChanged(ms.count()); } void positionChanged(qint64 position) { if (m_position == position) return; m_position = position; - player->positionChanged(position); + emit player->positionChanged(position); } void audioAvailableChanged(bool audioAvailable) { if (m_audioAvailable == audioAvailable) return; m_audioAvailable = audioAvailable; - player->hasAudioChanged(audioAvailable); + emit player->hasAudioChanged(audioAvailable); } void videoAvailableChanged(bool videoAvailable) { if (m_videoAvailable == videoAvailable) return; m_videoAvailable = videoAvailable; - player->hasVideoChanged(videoAvailable); + emit player->hasVideoChanged(videoAvailable); } void seekableChanged(bool seekable) { if (m_seekable == seekable) return; m_seekable = seekable; - player->seekableChanged(seekable); + emit player->seekableChanged(seekable); } - void playbackRateChanged(qreal rate) { player->playbackRateChanged(rate); } - void bufferProgressChanged(float progress) { player->bufferProgressChanged(progress); } - void metaDataChanged() { player->metaDataChanged(); } - void tracksChanged() { player->tracksChanged(); } - void activeTracksChanged() { player->activeTracksChanged(); } + void playbackRateChanged(qreal rate) { emit player->playbackRateChanged(rate); } + void bufferProgressChanged(float progress) { emit player->bufferProgressChanged(progress); } + void metaDataChanged() { emit player->metaDataChanged(); } + void tracksChanged() { emit player->tracksChanged(); } + void activeTracksChanged() { emit player->activeTracksChanged(); } void stateChanged(QMediaPlayer::PlaybackState newState); void mediaStatusChanged(QMediaPlayer::MediaStatus status); @@ -151,8 +120,9 @@ public: bool doLoop() { return isSeekable() && (m_loops < 0 || ++m_currentLoop < m_loops); } - int loops() { return m_loops; } - void setLoops(int loops) { + int loops() const { return m_loops; } + virtual void setLoops(int loops) + { if (m_loops == loops) return; m_loops = loops; @@ -160,9 +130,8 @@ public: } protected: - explicit QPlatformMediaPlayer(QMediaPlayer *parent = nullptr) - : player(parent) - {} + explicit QPlatformMediaPlayer(QMediaPlayer *parent = nullptr); + private: QMediaPlayer *player = nullptr; QMediaPlayer::MediaStatus m_status = QMediaPlayer::NoMedia; @@ -175,6 +144,25 @@ private: qint64 m_position = 0; }; +#ifndef QT_NO_DEBUG_STREAM +inline QDebug operator<<(QDebug dbg, QPlatformMediaPlayer::TrackType type) +{ + QDebugStateSaver save(dbg); + dbg.nospace(); + + switch (type) { + case QPlatformMediaPlayer::TrackType::AudioStream: + return dbg << "AudioStream"; + case QPlatformMediaPlayer::TrackType::VideoStream: + return dbg << "VideoStream"; + case QPlatformMediaPlayer::TrackType::SubtitleStream: + return dbg << "SubtitleStream"; + default: + Q_UNREACHABLE_RETURN(dbg); + } +} +#endif + QT_END_NAMESPACE diff --git a/src/multimedia/platform/qplatformmediaplugin.cpp b/src/multimedia/platform/qplatformmediaplugin.cpp new file mode 100644 index 000000000..7828fa08e --- /dev/null +++ b/src/multimedia/platform/qplatformmediaplugin.cpp @@ -0,0 +1,14 @@ +// Copyright (C) 2022 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 "qplatformmediaplugin_p.h" + +QT_BEGIN_NAMESPACE + +QPlatformMediaPlugin::QPlatformMediaPlugin(QObject *parent) : QObject(parent) { } + +QPlatformMediaPlugin::~QPlatformMediaPlugin() = default; + +QT_END_NAMESPACE + +#include "moc_qplatformmediaplugin_p.cpp" diff --git a/src/multimedia/platform/qplatformmediaplugin_p.h b/src/multimedia/platform/qplatformmediaplugin_p.h index 974576b73..4c8b9e458 100644 --- a/src/multimedia/platform/qplatformmediaplugin_p.h +++ b/src/multimedia/platform/qplatformmediaplugin_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2022 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtSql module 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) 2022 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 // // W A R N I N G @@ -66,10 +30,8 @@ class Q_MULTIMEDIA_EXPORT QPlatformMediaPlugin : public QObject { Q_OBJECT public: - explicit QPlatformMediaPlugin(QObject *parent = nullptr) - : QObject(parent) - {} - ~QPlatformMediaPlugin() = default; + explicit QPlatformMediaPlugin(QObject *parent = nullptr); + ~QPlatformMediaPlugin() override; virtual QPlatformMediaIntegration *create(const QString &key) = 0; diff --git a/src/multimedia/platform/qplatformmediarecorder.cpp b/src/multimedia/platform/qplatformmediarecorder.cpp index f53ff62e4..30dba0a45 100644 --- a/src/multimedia/platform/qplatformmediarecorder.cpp +++ b/src/multimedia/platform/qplatformmediarecorder.cpp @@ -1,142 +1,28 @@ -/**************************************************************************** -** -** 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 #include "qplatformmediarecorder_p.h" +#include "qstandardpaths.h" +#include "qmediastoragelocation_p.h" #include <QObject> QT_BEGIN_NAMESPACE - -/*! - \class QPlatformMediaRecorder - \obsolete - \inmodule QtMultimedia - - - \ingroup multimedia_control - - \brief The QPlatformMediaRecorder class provides access to the recording - functionality. - - This control provides a means to set the \l {outputLocation()}{output location}, - and record(), pause(), resume(), and stop() recording. It also - provides feedback on the \l {duration()}{duration} of the recording. - - \sa QMediaRecorder - -*/ - -/*! - Constructs a media recorder control with the given \a parent. -*/ - QPlatformMediaRecorder::QPlatformMediaRecorder(QMediaRecorder *parent) : q(parent) { } -/*! - \fn QUrl QPlatformMediaRecorder::outputLocation() const - - Returns the current output location being used. -*/ - -/*! - \fn bool QPlatformMediaRecorder::setOutputLocation(const QUrl &location) - - Sets the output \a location and returns if this operation is successful. - If file at the output location already exists, it should be overwritten. - - The \a location can be relative or empty; - in this case the service should use the system specific place and file naming scheme. - - After recording has started, the backend should report the actual file location - with actualLocationChanged() signal. -*/ - -/*! - \fn QMediaRecorder::RecorderState QPlatformMediaRecorder::state() const - - Return the current recording state. -*/ - -/*! - \fn qint64 QPlatformMediaRecorder::duration() const - - Return the current duration in milliseconds. -*/ - -/*! - \fn void QPlatformMediaRecorder::record(QMediaEncoderSettings &settings) - - Start media recording in accordance with \a{settings}. -*/ - -/*! - \fn void QPlatformMediaRecorder::pause() - - Pause media recording. Not all platforms supports this operation -*/ -void QPlatformMediaRecorder::pause() { - error(QMediaRecorder::FormatError, QMediaRecorder::tr("Pause not supported")); +void QPlatformMediaRecorder::pause() +{ + updateError(QMediaRecorder::FormatError, QMediaRecorder::tr("Pause not supported")); } -/*! - \fn void QPlatformMediaRecorder::resume() - - Resume media recording. Not all platforms supports this operation -*/ -void QPlatformMediaRecorder::resume() { - error(QMediaRecorder::FormatError, QMediaRecorder::tr("Resume not supported")); +void QPlatformMediaRecorder::resume() +{ + updateError(QMediaRecorder::FormatError, QMediaRecorder::tr("Resume not supported")); } -/*! - \fn void QPlatformMediaRecorder::stop() - - Stop media recording -*/ - -/*! - \fn void QPlatformMediaRecorder::stateChanged(QMediaRecorder::RecorderState state) - - Signals that the \a state of a media recorder has changed. -*/ void QPlatformMediaRecorder::stateChanged(QMediaRecorder::RecorderState state) { if (m_state == state) @@ -145,13 +31,6 @@ void QPlatformMediaRecorder::stateChanged(QMediaRecorder::RecorderState state) emit q->recorderStateChanged(state); } -/*! - \fn void QPlatformMediaRecorder::durationChanged(qint64 duration) - - Signals that the \a duration of the recorded media has changed. - - This only emitted when there is a discontinuous change in the duration such as being reset to 0. -*/ void QPlatformMediaRecorder::durationChanged(qint64 duration) { if (m_duration == duration) @@ -160,12 +39,6 @@ void QPlatformMediaRecorder::durationChanged(qint64 duration) emit q->durationChanged(duration); } -/*! - \fn void QPlatformMediaRecorder::actualLocationChanged(const QUrl &location) - - Signals that the actual media \a location has changed. - This signal should be emitted at start of recording. -*/ void QPlatformMediaRecorder::actualLocationChanged(const QUrl &location) { if (m_actualLocation == location) @@ -174,20 +47,9 @@ void QPlatformMediaRecorder::actualLocationChanged(const QUrl &location) emit q->actualLocationChanged(location); } -/*! - \fn void QPlatformMediaRecorder::error(QMediaRecorder::Error error, const QString &errorString) - - Signals that an \a error has occurred. The \a errorString describes the error. -*/ -void QPlatformMediaRecorder::error(QMediaRecorder::Error error, const QString &errorString) +void QPlatformMediaRecorder::updateError(QMediaRecorder::Error error, const QString &errorString) { - if (error == m_error && errorString == m_errorString) - return; - m_error = error; - m_errorString = errorString; - if (error != QMediaRecorder::NoError) - emit q->errorOccurred(error, errorString); - emit q->errorChanged(); + m_error.setAndNotify(error, errorString, *q); } void QPlatformMediaRecorder::metaDataChanged() @@ -195,4 +57,19 @@ void QPlatformMediaRecorder::metaDataChanged() emit q->metaDataChanged(); } +QString QPlatformMediaRecorder::findActualLocation(const QMediaEncoderSettings &settings) const +{ + const auto audioOnly = settings.videoCodec() == QMediaFormat::VideoCodec::Unspecified; + + const auto primaryLocation = + audioOnly ? QStandardPaths::MusicLocation : QStandardPaths::MoviesLocation; + const QString suffix = settings.mimeType().preferredSuffix(); + const QString location = QMediaStorageLocation::generateFileName( + outputLocation().toString(QUrl::PreferLocalFile), primaryLocation, suffix); + + Q_ASSERT(!location.isEmpty()); + + return location; +} + QT_END_NAMESPACE diff --git a/src/multimedia/platform/qplatformmediarecorder_p.h b/src/multimedia/platform/qplatformmediarecorder_p.h index 8760100c2..ab6af759d 100644 --- a/src/multimedia/platform/qplatformmediarecorder_p.h +++ b/src/multimedia/platform/qplatformmediarecorder_p.h @@ -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 // // W A R N I N G @@ -54,10 +18,13 @@ #include <QtCore/qurl.h> #include <QtCore/qsize.h> #include <QtCore/qmimetype.h> +#include <QtCore/qpointer.h> +#include <QtCore/qiodevice.h> #include <QtMultimedia/qmediarecorder.h> #include <QtMultimedia/qmediametadata.h> #include <QtMultimedia/qmediaformat.h> +#include <QtMultimedia/private/qerrorinfo_p.h> #include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE @@ -151,14 +118,19 @@ public: virtual void setMetaData(const QMediaMetaData &) {} virtual QMediaMetaData metaData() const { return {}; } - QMediaRecorder::Error error() const { return m_error;} - QString errorString() const { return m_errorString; } + QMediaRecorder::Error error() const { return m_error.code(); } + QString errorString() const { return m_error.description(); } QUrl outputLocation() const { return m_outputLocation; } virtual void setOutputLocation(const QUrl &location) { m_outputLocation = location; } QUrl actualLocation() const { return m_actualLocation; } void clearActualLocation() { m_actualLocation.clear(); } - void clearError() { error(QMediaRecorder::NoError, QString()); } + void clearError() { updateError(QMediaRecorder::NoError, QString()); } + + QIODevice *outputDevice() const { return m_outputDevice; } + void setOutputDevice(QIODevice *device) { m_outputDevice = device; } + + virtual void updateAutoStop() { } protected: explicit QPlatformMediaRecorder(QMediaRecorder *parent); @@ -166,17 +138,19 @@ protected: void stateChanged(QMediaRecorder::RecorderState state); void durationChanged(qint64 position); void actualLocationChanged(const QUrl &location); - void error(QMediaRecorder::Error error, const QString &errorString); + void updateError(QMediaRecorder::Error error, const QString &errorString); void metaDataChanged(); QMediaRecorder *mediaRecorder() { return q; } + QString findActualLocation(const QMediaEncoderSettings &settings) const; + private: QMediaRecorder *q = nullptr; - QMediaRecorder::Error m_error = QMediaRecorder::NoError; - QString m_errorString; + QErrorInfo<QMediaRecorder::Error> m_error; QUrl m_actualLocation; QUrl m_outputLocation; + QPointer<QIODevice> m_outputDevice; qint64 m_duration = 0; QMediaRecorder::RecorderState m_state = QMediaRecorder::StoppedState; diff --git a/src/multimedia/platform/qplatformsurfacecapture.cpp b/src/multimedia/platform/qplatformsurfacecapture.cpp new file mode 100644 index 000000000..a56f48b62 --- /dev/null +++ b/src/multimedia/platform/qplatformsurfacecapture.cpp @@ -0,0 +1,83 @@ +// Copyright (C) 2022 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 "platform/qplatformsurfacecapture_p.h" +#include "qvideoframe.h" +#include "qguiapplication.h" +#include "qdebug.h" + +QT_BEGIN_NAMESPACE + +QPlatformSurfaceCapture::QPlatformSurfaceCapture(Source initialSource) : m_source(initialSource) +{ + Q_ASSERT(std::visit([](auto source) { return source == decltype(source){}; }, initialSource)); + qRegisterMetaType<QVideoFrame>(); +} + +void QPlatformSurfaceCapture::setActive(bool active) +{ + if (m_active == active) + return; + + if (!setActiveInternal(active)) + return; + + m_active = active; + emit activeChanged(active); +} + +bool QPlatformSurfaceCapture::isActive() const +{ + return m_active; +} + +void QPlatformSurfaceCapture::setSource(Source source) +{ + Q_ASSERT(source.index() == m_source.index()); + + if (m_source == source) + return; + + if (m_active) + setActiveInternal(false); + + m_source = source; + + if (m_active && !setActiveInternal(true)) { + m_active = false; + emit activeChanged(false); + } + + std::visit([this](auto source) { emit sourceChanged(source); }, m_source); +} + +QPlatformSurfaceCapture::Error QPlatformSurfaceCapture::error() const +{ + return m_error.code(); +} + +QString QPlatformSurfaceCapture::errorString() const +{ + return m_error.description(); +} + +void QPlatformSurfaceCapture::updateError(Error error, const QString &errorString) +{ + m_error.setAndNotify(error, errorString, *this); +} + +bool QPlatformSurfaceCapture::checkScreenWithError(ScreenSource &screen) +{ + if (!screen) + screen = QGuiApplication::primaryScreen(); + + if (screen) + return true; + + updateError(NotFound, QLatin1String("No screens found")); + return false; +} + +QT_END_NAMESPACE + +#include "moc_qplatformsurfacecapture_p.cpp" diff --git a/src/multimedia/platform/qplatformsurfacecapture_p.h b/src/multimedia/platform/qplatformsurfacecapture_p.h new file mode 100644 index 000000000..e4c59c6f4 --- /dev/null +++ b/src/multimedia/platform/qplatformsurfacecapture_p.h @@ -0,0 +1,87 @@ +// Copyright (C) 2022 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 QPLATFORMSURFACECAPTURE_H +#define QPLATFORMSURFACECAPTURE_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "qplatformvideosource_p.h" +#include "qscreen.h" +#include "qcapturablewindow.h" +#include "qpointer.h" +#include "private/qerrorinfo_p.h" + +#include <optional> +#include <variant> + +QT_BEGIN_NAMESPACE + +class QVideoFrame; + +class Q_MULTIMEDIA_EXPORT QPlatformSurfaceCapture : public QPlatformVideoSource +{ + Q_OBJECT + +public: + enum Error { + NoError = 0, + InternalError = 1, + CapturingNotSupported = 2, + CaptureFailed = 4, + NotFound = 5, + }; + + using ScreenSource = QPointer<QScreen>; + using WindowSource = QCapturableWindow; + + using Source = std::variant<ScreenSource, WindowSource>; + + explicit QPlatformSurfaceCapture(Source initialSource); + + void setActive(bool active) override; + bool isActive() const override; + + void setSource(Source source); + + template<typename Type> + Type source() const { + return *q_check_ptr(std::get_if<Type>(&m_source)); + } + + Source source() const { return m_source; } + + Error error() const; + QString errorString() const final; + +protected: + virtual bool setActiveInternal(bool) = 0; + + bool checkScreenWithError(ScreenSource &screen); + +public Q_SLOTS: + void updateError(Error error, const QString &errorString); + +Q_SIGNALS: + void sourceChanged(WindowSource); + void sourceChanged(ScreenSource); + void errorOccurred(Error error, QString errorString); + +private: + QErrorInfo<Error> m_error; + Source m_source; + bool m_active = false; +}; + +QT_END_NAMESPACE + +#endif // QPLATFORMSURFACECAPTURE_H diff --git a/src/multimedia/platform/qplatformvideodevices.cpp b/src/multimedia/platform/qplatformvideodevices.cpp index e7f6d24d3..bcf664cd2 100644 --- a/src/multimedia/platform/qplatformvideodevices.cpp +++ b/src/multimedia/platform/qplatformvideodevices.cpp @@ -1,55 +1,12 @@ -/**************************************************************************** -** -** Copyright (C) 2022 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) 2022 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 "qplatformvideodevices_p.h" -#include "qplatformmediadevices_p.h" QT_BEGIN_NAMESPACE -QPlatformVideoDevices::~QPlatformVideoDevices() -{ - -} - -void QPlatformVideoDevices::videoInputsChanged() -{ - QPlatformMediaDevices::instance()->videoInputsChanged(); -} +QPlatformVideoDevices::~QPlatformVideoDevices() = default; QT_END_NAMESPACE + +#include "moc_qplatformvideodevices_p.cpp" diff --git a/src/multimedia/platform/qplatformvideodevices_p.h b/src/multimedia/platform/qplatformvideodevices_p.h index 0d49b5bce..008322be2 100644 --- a/src/multimedia/platform/qplatformvideodevices_p.h +++ b/src/multimedia/platform/qplatformvideodevices_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2022 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) 2022 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 QPLATFORMVIDEODEVICES_H #define QPLATFORMVIDEODEVICES_H @@ -52,23 +16,28 @@ #include <private/qtmultimediaglobal_p.h> #include <qmediarecorder.h> +#include <qobject.h> QT_BEGIN_NAMESPACE class QPlatformMediaIntegration; -class Q_MULTIMEDIA_EXPORT QPlatformVideoDevices +class Q_MULTIMEDIA_EXPORT QPlatformVideoDevices : public QObject { + Q_OBJECT public: QPlatformVideoDevices(QPlatformMediaIntegration *integration) : m_integration(integration) {} - virtual ~QPlatformVideoDevices(); + + ~QPlatformVideoDevices() override; virtual QList<QCameraDevice> videoDevices() const = 0; -protected: +Q_SIGNALS: void videoInputsChanged(); + +protected: QPlatformMediaIntegration *m_integration = nullptr; }; diff --git a/src/multimedia/platform/qplatformvideoframeinput.cpp b/src/multimedia/platform/qplatformvideoframeinput.cpp new file mode 100644 index 000000000..d90306345 --- /dev/null +++ b/src/multimedia/platform/qplatformvideoframeinput.cpp @@ -0,0 +1,10 @@ +// Copyright (C) 2024 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 "qplatformvideoframeinput_p.h" + +QT_BEGIN_NAMESPACE + +QT_END_NAMESPACE + +#include "moc_qplatformvideoframeinput_p.cpp" diff --git a/src/multimedia/platform/qplatformvideoframeinput_p.h b/src/multimedia/platform/qplatformvideoframeinput_p.h new file mode 100644 index 000000000..45714492c --- /dev/null +++ b/src/multimedia/platform/qplatformvideoframeinput_p.h @@ -0,0 +1,55 @@ +// Copyright (C) 2024 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 QPLATFORMVIDEOFRAMEINPUT_P_H +#define QPLATFORMVIDEOFRAMEINPUT_P_H + +#include "qplatformvideosource_p.h" +#include "qmetaobject.h" +#include "qpointer.h" + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +QT_BEGIN_NAMESPACE + +class QMediaInputEncoderInterface; + +class Q_MULTIMEDIA_EXPORT QPlatformVideoFrameInput : public QPlatformVideoSource +{ + Q_OBJECT +public: + QPlatformVideoFrameInput(QVideoFrameFormat format = {}) : m_format(std::move(format)) { } + + void setActive(bool) final { } + bool isActive() const final { return true; } + + QVideoFrameFormat frameFormat() const final { return m_format; } + + QString errorString() const final { return {}; } + + QMediaInputEncoderInterface *encoderInterface() const { return m_encoderInterface; } + void setEncoderInterface(QMediaInputEncoderInterface *interface) + { + m_encoderInterface = interface; + } + +Q_SIGNALS: + void encoderUpdated(); + +private: + QMediaInputEncoderInterface *m_encoderInterface = nullptr; + QVideoFrameFormat m_format; +}; + +QT_END_NAMESPACE + +#endif // QPLATFORMVIDEOFRAMEINPUT_P_H diff --git a/src/multimedia/platform/qplatformvideosink.cpp b/src/multimedia/platform/qplatformvideosink.cpp index 66126745b..abf82af0f 100644 --- a/src/multimedia/platform/qplatformvideosink.cpp +++ b/src/multimedia/platform/qplatformvideosink.cpp @@ -1,98 +1,77 @@ -/**************************************************************************** -** -** 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 #include "qplatformvideosink_p.h" +#include "qmultimediautils_p.h" QT_BEGIN_NAMESPACE -/*! - \class QPlatformVideoSink - \internal +QPlatformVideoSink::QPlatformVideoSink(QVideoSink *parent) : QObject(parent), m_sink(parent) { } - \inmodule QtMultimedia +QPlatformVideoSink::~QPlatformVideoSink() = default; - \brief The QPlatformVideoSink class provides a media control for rendering video to a window. - - QPlatformVideoSink is one of a number of possible video output controls. - - \sa QVideoWidget -*/ - -/*! - Constructs a new video window control with the given \a parent. -*/ -QPlatformVideoSink::QPlatformVideoSink(QVideoSink *parent) - : QObject(parent), - sink(parent) +QSize QPlatformVideoSink::nativeSize() const { + QMutexLocker locker(&m_mutex); + return m_nativeSize; } -/*! - \fn QPlatformVideoSink::setWinId(WId id) - - Sets the \a id of the window a video overlay end point renders to. -*/ - -/*! - \fn QPlatformVideoSink::setDisplayRect(const QRect &rect) - Sets the sub-\a rect of a window where video is displayed. -*/ - -/*! - \fn QPlatformVideoSink::setFullScreen(bool fullScreen) - - Sets whether a video overlay is a \a fullScreen overlay. -*/ +void QPlatformVideoSink::setNativeSize(QSize s) +{ + { + QMutexLocker locker(&m_mutex); + if (m_nativeSize == s) + return; + m_nativeSize = s; + } + emit m_sink->videoSizeChanged(); +} -/*! - \fn QPlatformVideoSink::nativeSize() const +void QPlatformVideoSink::setVideoFrame(const QVideoFrame &frame) +{ + bool sizeChanged = false; + + { + QMutexLocker locker(&m_mutex); + if (frame == m_currentVideoFrame) + return; + m_currentVideoFrame = frame; + m_currentVideoFrame.setSubtitleText(m_subtitleText); + const auto size = qRotatedFrameSize(frame); + if (size != m_nativeSize) { + m_nativeSize = size; + sizeChanged = true; + } + } + + // emit signals outside the mutex to avoid deadlocks on the user side + if (sizeChanged) + emit m_sink->videoSizeChanged(); + emit m_sink->videoFrameChanged(frame); +} - Returns a suggested size for the video display based on the resolution and aspect ratio of the - video. -*/ +QVideoFrame QPlatformVideoSink::currentVideoFrame() const +{ + QMutexLocker locker(&m_mutex); + return m_currentVideoFrame; +} -/*! - \fn QPlatformVideoSink::setAspectRatioMode(Qt::AspectRatioMode mode) +void QPlatformVideoSink::setSubtitleText(const QString &subtitleText) +{ + { + QMutexLocker locker(&m_mutex); + if (m_subtitleText == subtitleText) + return; + m_subtitleText = subtitleText; + } + emit m_sink->subtitleTextChanged(subtitleText); +} - Sets the aspect ratio \a mode which determines how video is scaled to the fit the display region - with respect to its aspect ratio. -*/ +QString QPlatformVideoSink::subtitleText() const +{ + QMutexLocker locker(&m_mutex); + return m_subtitleText; +} QT_END_NAMESPACE diff --git a/src/multimedia/platform/qplatformvideosink_p.h b/src/multimedia/platform/qplatformvideosink_p.h index a5dabba9f..53eca374f 100644 --- a/src/multimedia/platform/qplatformvideosink_p.h +++ b/src/multimedia/platform/qplatformvideosink_p.h @@ -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 #ifndef QPLATFORMVIDEOSINK_H #define QPLATFORMVIDEOSINK_H @@ -72,6 +36,8 @@ class Q_MULTIMEDIA_EXPORT QPlatformVideoSink : public QObject Q_OBJECT public: + ~QPlatformVideoSink() override; + virtual void setRhi(QRhi * /*rhi*/) {} virtual void setWinId(WId) {} @@ -79,55 +45,34 @@ public: virtual void setFullScreen(bool) {} virtual void setAspectRatioMode(Qt::AspectRatioMode) {} - QSize nativeSize() const - { - QMutexLocker locker(&mutex); - return m_nativeSize; - } + QSize nativeSize() const; virtual void setBrightness(float /*brightness*/) {} virtual void setContrast(float /*contrast*/) {} virtual void setHue(float /*hue*/) {} virtual void setSaturation(float /*saturation*/) {} - QVideoSink *videoSink() { return sink; } - - void setNativeSize(QSize s) { - QMutexLocker locker(&mutex); - if (m_nativeSize == s) - return; - m_nativeSize = s; - sink->videoSizeChanged(); - } - virtual void setVideoFrame(const QVideoFrame &frame) { - setNativeSize(frame.size()); - if (frame == m_currentVideoFrame) - return; - m_currentVideoFrame = frame; - m_currentVideoFrame.setSubtitleText(subtitleText()); - sink->videoFrameChanged(m_currentVideoFrame); - } - QVideoFrame currentVideoFrame() const { return m_currentVideoFrame; } - - void setSubtitleText(const QString &subtitleText) - { - QMutexLocker locker(&mutex); - if (m_subtitleText == subtitleText) - return; - m_subtitleText = subtitleText; - sink->subtitleTextChanged(subtitleText); - } - QString subtitleText() const - { - QMutexLocker locker(&mutex); - return m_subtitleText; - } + QVideoSink *videoSink() { return m_sink; } + + void setNativeSize(QSize s); + + virtual void setVideoFrame(const QVideoFrame &frame); + + QVideoFrame currentVideoFrame() const; + + void setSubtitleText(const QString &subtitleText); + + QString subtitleText() const; protected: explicit QPlatformVideoSink(QVideoSink *parent); - QVideoSink *sink = nullptr; - mutable QMutex mutex; + +Q_SIGNALS: + void rhiChanged(QRhi *rhi); + private: + QVideoSink *m_sink = nullptr; + mutable QMutex m_mutex; QSize m_nativeSize; QString m_subtitleText; QVideoFrame m_currentVideoFrame; diff --git a/src/multimedia/platform/qplatformvideosource.cpp b/src/multimedia/platform/qplatformvideosource.cpp new file mode 100644 index 000000000..a23ed91ae --- /dev/null +++ b/src/multimedia/platform/qplatformvideosource.cpp @@ -0,0 +1,15 @@ +// 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 "qplatformvideosource_p.h" + +QT_BEGIN_NAMESPACE + +std::optional<int> QPlatformVideoSource::ffmpegHWPixelFormat() const +{ + return {}; +}; + +QT_END_NAMESPACE + +//#include "moc_qplatformvideosource_p.cpp diff --git a/src/multimedia/platform/qplatformvideosource_p.h b/src/multimedia/platform/qplatformvideosource_p.h new file mode 100644 index 000000000..b11524226 --- /dev/null +++ b/src/multimedia/platform/qplatformvideosource_p.h @@ -0,0 +1,58 @@ +// 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 + +#ifndef QPLATFORMVIDEOSOURCE_P_H +#define QPLATFORMVIDEOSOURCE_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "qvideoframeformat.h" + +#include <QtCore/qobject.h> +#include <QtCore/qnativeinterface.h> +#include <QtCore/private/qglobal_p.h> + +#include <optional> + +QT_BEGIN_NAMESPACE + +class QVideoFrame; +class QPlatformMediaCaptureSession; + +class Q_MULTIMEDIA_EXPORT QPlatformVideoSource : public QObject +{ + Q_OBJECT +public: + using QObject::QObject; + + virtual void setActive(bool active) = 0; + virtual bool isActive() const = 0; + + virtual QVideoFrameFormat frameFormat() const = 0; + + virtual std::optional<int> ffmpegHWPixelFormat() const; + + virtual void setCaptureSession(QPlatformMediaCaptureSession *) { } + + virtual QString errorString() const = 0; + + bool hasError() const { return !errorString().isEmpty(); } + +Q_SIGNALS: + void newVideoFrame(const QVideoFrame &); + void activeChanged(bool); + void errorChanged(); +}; + +QT_END_NAMESPACE + +#endif // QPLATFORMVIDEOSOURCE_P_H diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index ac7c8fa06..644c2d094 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -1,45 +1,11 @@ -/**************************************************************************** -** -** 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 #include "qmediaplayer_p.h" +#include <private/qmultimediautils_p.h> #include <private/qplatformmediaintegration_p.h> +#include <private/qaudiobufferoutput_p.h> #include <qvideosink.h> #include <qaudiooutput.h> @@ -47,12 +13,15 @@ #include <QtCore/qmetaobject.h> #include <QtCore/qtimer.h> #include <QtCore/qdebug.h> +#include <QtCore/qdir.h> #include <QtCore/qpointer.h> #include <QtCore/qfileinfo.h> #include <QtCore/qtemporaryfile.h> -#include <QtCore/qdir.h> #include <QtCore/qcoreapplication.h> -#include <QtCore/qjniobject.h> + +#if defined(Q_OS_ANDROID) +# include <QtCore/qjniobject.h> +#endif QT_BEGIN_NAMESPACE @@ -130,13 +99,15 @@ QT_BEGIN_NAMESPACE \sa AudioOutput, VideoOutput */ -void QMediaPlayerPrivate::setState(QMediaPlayer::PlaybackState ps) +void QMediaPlayerPrivate::setState(QMediaPlayer::PlaybackState toState) { Q_Q(QMediaPlayer); - if (ps != state) { - state = ps; - emit q->playbackStateChanged(ps); + if (toState != state) { + const auto fromState = std::exchange(state, toState); + if (toState == QMediaPlayer::PlayingState || fromState == QMediaPlayer::PlayingState) + emit q->playingChanged(toState == QMediaPlayer::PlayingState); + emit q->playbackStateChanged(toState); } } @@ -147,14 +118,11 @@ void QMediaPlayerPrivate::setStatus(QMediaPlayer::MediaStatus s) emit q->mediaStatusChanged(s); } -void QMediaPlayerPrivate::setError(int error, const QString &errorString) +void QMediaPlayerPrivate::setError(QMediaPlayer::Error error, const QString &errorString) { Q_Q(QMediaPlayer); - this->error = QMediaPlayer::Error(error); - this->errorString = errorString; - emit q->errorChanged(); - emit q->errorOccurred(this->error, errorString); + this->error.setAndNotify(error, errorString, *q); } void QMediaPlayerPrivate::setMedia(const QUrl &media, QIODevice *stream) @@ -220,25 +188,14 @@ void QMediaPlayerPrivate::setMedia(const QUrl &media, QIODevice *stream) qWarning("Qt was built with -no-feature-temporaryfile: playback from resource file is not supported!"); #endif } -#if defined(Q_OS_ANDROID) - } else if (media.scheme() == QLatin1String("content") && !stream) { - // content scheme should happen only on android - const int fd = QJniObject::callStaticMethod<jint>( - "org/qtproject/qt/android/QtNative", "openFdForContentUrl", - "(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)I", - QNativeInterface::QAndroidApplication::context(), - QJniObject::fromString(media.toString()).object(), - QJniObject::fromString(QLatin1String("r")).object()); - - file.reset(new QFile(QLatin1Char(':') + media.path())); - file->open(fd, QFile::ReadOnly, QFile::FileHandleFlag::AutoCloseHandle); - control->setMedia(media, file.get()); -#endif } else { qrcMedia = QUrl(); - QUrl url = media; - if (url.scheme().isEmpty() || url.scheme() == QLatin1String("file")) - url = QUrl::fromUserInput(media.path(), QDir::currentPath(), QUrl::AssumeLocalFile); + QUrl url = qMediaFromUserInput(media); + if (url.scheme() == QLatin1String("content") && !stream) { + file.reset(new QFile(media.url())); + stream = file.get(); + } + control->setMedia(url, stream); } @@ -266,14 +223,14 @@ QMediaPlayer::QMediaPlayer(QObject *parent) { Q_D(QMediaPlayer); - d->control = QPlatformMediaIntegration::instance()->createPlayer(this); - if (!d->control) { // ### Should this be an assertion? - d->setError(QMediaPlayer::ResourceError, QMediaPlayer::tr("Platform does not support media playback.")); - return; + auto maybeControl = QPlatformMediaIntegration::instance()->createPlayer(this); + if (maybeControl) { + d->control = maybeControl.value(); + d->state = d->control->state(); + } else { + qWarning() << "Failed to initialize QMediaPlayer" << maybeControl.error(); + d->setError(QMediaPlayer::ResourceError, maybeControl.error()); } - Q_ASSERT(d->control); - - d->state = d->control->state(); } @@ -285,9 +242,13 @@ QMediaPlayer::~QMediaPlayer() { Q_D(QMediaPlayer); - // Disconnect everything to prevent notifying - // when a receiver is already destroyed. - disconnect(); + // prevents emitting audioOutputChanged and videoOutputChanged. + QSignalBlocker blocker(this); + + // Reset audio output and video sink to ensure proper unregistering of the source + // To be investigated: registering of the source might be removed after switching on the ffmpeg + // backend; + setAudioOutput(nullptr); d->setVideoSink(nullptr); @@ -316,13 +277,20 @@ const QIODevice *QMediaPlayer::sourceDevice() const return d->stream; } +/*! + \property QMediaPlayer::playbackState + + Returns the \l{QMediaPlayer::}{PlaybackState}. + + \sa playing +*/ QMediaPlayer::PlaybackState QMediaPlayer::playbackState() const { Q_D(const QMediaPlayer); // In case if EndOfMedia status is already received // but state is not. - if (d->control != nullptr + if (d->control && d->control->mediaStatus() == QMediaPlayer::EndOfMedia && d->state != d->control->state()) { return d->control->state(); @@ -347,11 +315,7 @@ QMediaPlayer::MediaStatus QMediaPlayer::mediaStatus() const qint64 QMediaPlayer::duration() const { Q_D(const QMediaPlayer); - - if (d->control != nullptr) - return d->control->duration(); - - return 0; + return d->control ? d->control->duration() : 0; } /*! @@ -364,15 +328,11 @@ qint64 QMediaPlayer::duration() const qint64 QMediaPlayer::position() const { Q_D(const QMediaPlayer); - - if (d->control != nullptr) - return d->control->position(); - - return 0; + return d->control ? d->control->position() : 0; } /*! - Returns a number betwee 0 and 1 when buffering data. + Returns a number between 0 and 1 when buffering data. 0 means that there is no buffered data available, playback is usually stalled in this case. Playback will resume once the buffer reaches 1, @@ -383,11 +343,7 @@ qint64 QMediaPlayer::position() const float QMediaPlayer::bufferProgress() const { Q_D(const QMediaPlayer); - - if (d->control != nullptr) - return d->control->bufferProgress(); - - return 0.; + return d->control ? d->control->bufferProgress() : 0; } /*! @@ -402,11 +358,7 @@ float QMediaPlayer::bufferProgress() const QMediaTimeRange QMediaPlayer::bufferedTimeRange() const { Q_D(const QMediaPlayer); - - if (d->control) - return d->control->availablePlaybackRanges(); - - return {}; + return d->control ? d->control->availablePlaybackRanges() : QMediaTimeRange{}; } /*! @@ -422,11 +374,7 @@ QMediaTimeRange QMediaPlayer::bufferedTimeRange() const bool QMediaPlayer::hasAudio() const { Q_D(const QMediaPlayer); - - if (d->control != nullptr) - return d->control->isAudioAvailable(); - - return false; + return d->control && d->control->isAudioAvailable(); } /*! @@ -442,11 +390,7 @@ bool QMediaPlayer::hasAudio() const bool QMediaPlayer::hasVideo() const { Q_D(const QMediaPlayer); - - if (d->control != nullptr) - return d->control->isVideoAvailable(); - - return false; + return d->control && d->control->isVideoAvailable(); } /*! @@ -458,11 +402,13 @@ bool QMediaPlayer::hasVideo() const bool QMediaPlayer::isSeekable() const { Q_D(const QMediaPlayer); + return d->control && d->control->isSeekable(); +} - if (d->control != nullptr) - return d->control->isSeekable(); - - return false; +bool QMediaPlayer::isPlaying() const +{ + Q_D(const QMediaPlayer); + return d->state == QMediaPlayer::PlayingState; } /*! @@ -471,11 +417,7 @@ bool QMediaPlayer::isSeekable() const qreal QMediaPlayer::playbackRate() const { Q_D(const QMediaPlayer); - - if (d->control != nullptr) - return d->control->playbackRate(); - - return 0.0; + return d->control ? d->control->playbackRate() : 0.; } /*! @@ -507,11 +449,7 @@ qreal QMediaPlayer::playbackRate() const int QMediaPlayer::loops() const { Q_D(const QMediaPlayer); - - if (d->control) - return d->control->loops(); - - return 1; + return d->control ? d->control->loops() : 1; } void QMediaPlayer::setLoops(int loops) @@ -528,7 +466,7 @@ void QMediaPlayer::setLoops(int loops) */ QMediaPlayer::Error QMediaPlayer::error() const { - return d_func()->error; + return d_func()->error.code(); } /*! @@ -545,7 +483,7 @@ QMediaPlayer::Error QMediaPlayer::error() const */ QString QMediaPlayer::errorString() const { - return d_func()->errorString; + return d_func()->error.description(); } /*! @@ -553,7 +491,8 @@ QString QMediaPlayer::errorString() const Starts or resumes playback of the media. - Sets the \l playbackState property to PlayingState. + Sets the \l playbackState property to PlayingState, and changes + \l playing to \c true. */ /*! @@ -569,8 +508,7 @@ void QMediaPlayer::play() return; // Reset error conditions - d->error = NoError; - d->errorString = QString(); + d->setError(NoError, QString()); d->control->play(); } @@ -580,7 +518,8 @@ void QMediaPlayer::play() Pauses playback of the media. - Sets the \l playbackState property to PausedState. + Sets the \l playbackState property to PausedState, + and changes \l playing to \c false. */ /*! @@ -592,7 +531,7 @@ void QMediaPlayer::pause() { Q_D(QMediaPlayer); - if (d->control != nullptr) + if (d->control) d->control->pause(); } @@ -601,7 +540,8 @@ void QMediaPlayer::pause() Stops playback of the media. - Sets the \l playbackState property to StoppedState. + Sets the \l playbackState property to StoppedState, + and changes \l playing to \c false. */ /*! @@ -613,7 +553,7 @@ void QMediaPlayer::stop() { Q_D(QMediaPlayer); - if (d->control != nullptr) + if (d->control) d->control->stop(); } @@ -621,7 +561,7 @@ void QMediaPlayer::setPosition(qint64 position) { Q_D(QMediaPlayer); - if (d->control == nullptr) + if (!d->control) return; if (!d->control->isSeekable()) return; @@ -632,7 +572,7 @@ void QMediaPlayer::setPlaybackRate(qreal rate) { Q_D(QMediaPlayer); - if (d->control != nullptr) + if (d->control) d->control->setPlaybackRate(rate); } @@ -651,12 +591,18 @@ void QMediaPlayer::setPlaybackRate(qreal rate) Setting the media to a null QUrl will cause the player to discard all information relating to the current media source and to cease all I/O operations related - to that media. + to that media. Setting the media will stop the playback. \note This function returns immediately after recording the specified source of the media. It does not wait for the media to finish loading and does not check for errors. Listen for the mediaStatusChanged() and error() signals to be notified when the media is loaded and when an error occurs during loading. + + \note FFmpeg, used by the FFmpeg media backend, restricts use of nested protocols for + security reasons. In controlled environments where all inputs are trusted, the list of + approved protocols can be overridden using the QT_FFMPEG_PROTOCOL_WHITELIST environment + variable. This environment variable is Qt's private API and can change between patch + releases without notice. */ void QMediaPlayer::setSource(const QUrl &source) @@ -704,6 +650,51 @@ void QMediaPlayer::setSourceDevice(QIODevice *device, const QUrl &sourceUrl) } /*! + Sets an audio buffer \a output to the media player. + + If \l QAudioBufferOutput is specified and the media source + contains an audio stream, the media player, it will emit + the signal \l{QAudioBufferOutput::audioBufferReceived} with + audio buffers containing decoded audio data. At the end of + the audio stream, \c QMediaPlayer emits an empty \l QAudioBuffer. + + \c QMediaPlayer emits outputs frames at the same time as it + pushes the matching data to the audio output if it's specified. + However, the sound can be played with a small delay due to + audio bufferization. +*/ +void QMediaPlayer::setAudioBufferOutput(QAudioBufferOutput *output) +{ + Q_D(QMediaPlayer); + + QAudioBufferOutput *oldOutput = d->audioBufferOutput; + if (oldOutput == output) + return; + + d->audioBufferOutput = output; + + if (output) { + auto oldPlayer = QAudioBufferOutputPrivate::exchangeMediaPlayer(*oldOutput, this); + if (oldPlayer) + oldPlayer->setAudioBufferOutput(nullptr); + } + + if (d->control) + d->control->setAudioBufferOutput(output); + + emit audioBufferOutputChanged(); +} + +/*! + Get \l QAudioBufferOutput that has been set to the media player. +*/ +QAudioBufferOutput *QMediaPlayer::audioBufferOutput() const +{ + Q_D(const QMediaPlayer); + return d->audioBufferOutput; +} + +/*! \qmlproperty AudioOutput QtMultimedia::MediaPlayer::audioOutput This property holds the target audio output. @@ -729,12 +720,14 @@ void QMediaPlayer::setAudioOutput(QAudioOutput *output) if (oldOutput == output) return; d->audioOutput = output; - d->control->setAudioOutput(nullptr); + if (d->control) + d->control->setAudioOutput(nullptr); if (oldOutput) oldOutput->setDisconnectFunction({}); if (output) { output->setDisconnectFunction([this](){ setAudioOutput(nullptr); }); - d->control->setAudioOutput(output->handle()); + if (d->control) + d->control->setAudioOutput(output->handle()); } emit audioOutputChanged(); } @@ -759,6 +752,8 @@ QAudioOutput *QMediaPlayer::audioOutput() const */ /*! + \property QMediaPlayer::audioTracks + Lists the set of available audio tracks inside the media. The QMediaMetaData returned describes the properties of individual @@ -784,6 +779,8 @@ QList<QMediaMetaData> QMediaPlayer::audioTracks() const */ /*! + \property QMediaPlayer::videoTracks + Lists the set of available video tracks inside the media. The QMediaMetaData returned describes the properties of individual @@ -809,6 +806,8 @@ QList<QMediaMetaData> QMediaPlayer::videoTracks() const */ /*! + \property QMediaPlayer::subtitleTracks + Lists the set of available subtitle tracks inside the media. The QMediaMetaData returned describes the properties of individual @@ -840,9 +839,7 @@ QList<QMediaMetaData> QMediaPlayer::subtitleTracks() const int QMediaPlayer::activeAudioTrack() const { Q_D(const QMediaPlayer); - if (d->control) - return d->control->activeTrack(QPlatformMediaPlayer::AudioStream); - return 0; + return d->control ? d->control->activeTrack(QPlatformMediaPlayer::AudioStream) : 0; } /*! @@ -866,9 +863,7 @@ int QMediaPlayer::activeAudioTrack() const int QMediaPlayer::activeVideoTrack() const { Q_D(const QMediaPlayer); - if (d->control) - return d->control->activeTrack(QPlatformMediaPlayer::VideoStream); - return -1; + return d->control ? d->control->activeTrack(QPlatformMediaPlayer::VideoStream) : -1; } /*! @@ -892,9 +887,7 @@ int QMediaPlayer::activeVideoTrack() const int QMediaPlayer::activeSubtitleTrack() const { Q_D(const QMediaPlayer); - if (d->control) - return d->control->activeTrack(QPlatformMediaPlayer::SubtitleStream); - return -1; + return d->control ? d->control->activeTrack(QPlatformMediaPlayer::SubtitleStream) : -1; } void QMediaPlayer::setActiveAudioTrack(int index) @@ -958,31 +951,32 @@ QObject *QMediaPlayer::videoOutput() const void QMediaPlayer::setVideoOutput(QObject *output) { Q_D(QMediaPlayer); - if (!d->control) - return; if (d->videoOutput == output) return; - QVideoSink *sink = qobject_cast<QVideoSink *>(output); + auto *sink = qobject_cast<QVideoSink *>(output); if (!sink && output) { auto *mo = output->metaObject(); - if (output) - mo->invokeMethod(output, "videoSink", Q_RETURN_ARG(QVideoSink *, sink)); + mo->invokeMethod(output, "videoSink", Q_RETURN_ARG(QVideoSink *, sink)); } d->videoOutput = output; d->setVideoSink(sink); } +/*! + Sets \a sink to be the QVideoSink instance to + retrieve video data. +*/ void QMediaPlayer::setVideoSink(QVideoSink *sink) { Q_D(QMediaPlayer); - if (!d->control) - return; - d->videoOutput = nullptr; d->setVideoSink(sink); } +/*! + Returns the QVideoSink instance. +*/ QVideoSink *QMediaPlayer::videoSink() const { Q_D(const QMediaPlayer); @@ -1013,11 +1007,7 @@ void QMediaPlayer::setVideoOutput(const QList<QVideoSink *> &sinks) bool QMediaPlayer::isAvailable() const { Q_D(const QMediaPlayer); - - if (!d->control) - return false; - - return true; + return bool(d->control); } /*! @@ -1032,6 +1022,8 @@ bool QMediaPlayer::isAvailable() const */ /*! + \property QMediaPlayer::metaData + Returns meta data for the current media used by the media player. Meta data can contain information such as the title of the video or its creation date. @@ -1042,7 +1034,7 @@ bool QMediaPlayer::isAvailable() const QMediaMetaData QMediaPlayer::metaData() const { Q_D(const QMediaPlayer); - return d->control->metaData(); + return d->control ? d->control->metaData() : QMediaMetaData{}; } // Enums @@ -1053,7 +1045,7 @@ QMediaMetaData QMediaPlayer::metaData() const \value StoppedState The media player is not playing content, playback will begin from the start of the current track. - \value PlayingState The media player is currently playing content. + \value PlayingState The media player is currently playing content. This indicates the same as the \l playing property. \value PausedState The media player has paused playback, playback of the current track will resume from the position the player was paused at. */ @@ -1067,7 +1059,7 @@ QMediaMetaData QMediaPlayer::metaData() const \header \li Property value \li Description \row \li PlayingState - \li The media is currently playing. + \li The media is currently playing. This indicates the same as the \l playing property. \row \li PausedState \li Playback of the media has been suspended. \row \li StoppedState @@ -1082,6 +1074,12 @@ QMediaMetaData QMediaPlayer::metaData() const */ /*! + \qmlsignal QtMultimedia::MediaPlayer::playingChanged() + + This signal is emitted when the \l playing property changes. +*/ + +/*! \enum QMediaPlayer::MediaStatus Defines the status of a media player's current media. @@ -1288,7 +1286,7 @@ QMediaMetaData QMediaPlayer::metaData() const Playback can start or resume only when the buffer is entirely filled. When the buffer is filled, \c MediaPlayer.Buffered is true. - When buffer progress is between \c 0.0 and \c 0.1, \c MediaPlayer.Buffering + When buffer progress is between \c 0.0 and \c 1.0, \c MediaPlayer.Buffering is set to \c{true}. A value lower than \c 1.0 implies that the property \c MediaPlayer.StalledMedia @@ -1327,11 +1325,30 @@ QMediaMetaData QMediaPlayer::metaData() const */ /*! + \qmlproperty bool QtMultimedia::MediaPlayer::playing + \since 6.5 + + Indicates whether the media is currently playing. + + \sa playbackState +*/ + +/*! + \property QMediaPlayer::playing + \brief Whether the media is playing. + \since 6.5 + + \sa playbackState, PlayingState +*/ + +/*! \qmlproperty real QtMultimedia::MediaPlayer::playbackRate - This property holds the rate at which audio is played at as a multiple of + This property holds the rate at which media is played at as a multiple of the normal rate. + For more information, see \l{QMediaPlayer::playbackRate}. + Defaults to \c{1.0}. */ @@ -1339,11 +1356,11 @@ QMediaMetaData QMediaPlayer::metaData() const \property QMediaPlayer::playbackRate \brief the playback rate of the current media. - This value is a multiplier applied to the media's standard play rate. By - default this value is 1.0, indicating that the media is playing at the - standard pace. Values higher than 1.0 will increase the rate of play. - Values less than zero can be set and indicate the media should rewind at the - multiplier of the standard pace. + This value is a multiplier applied to the media's standard playback + rate. By default this value is 1.0, indicating that the media is + playing at the standard speed. Values higher than 1.0 will increase + the playback speed, while values between 0.0 and 1.0 results in + slower playback. Negative playback rates are not supported. Not all playback services support change of the playback rate. It is framework defined as to the status and quality of audio and video diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index 0ccb0eaaf..e0d1fec75 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.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 QMEDIAPLAYER_H #define QMEDIAPLAYER_H @@ -44,7 +8,7 @@ #include <QtCore/qurl.h> #include <QtMultimedia/qtmultimediaglobal.h> #include <QtMultimedia/qmediaenumdebug.h> -#include <QtMultimedia/qaudio.h> +#include <QtMultimedia/qtaudio.h> QT_BEGIN_NAMESPACE @@ -53,6 +17,7 @@ class QAudioOutput; class QAudioDevice; class QMediaMetaData; class QMediaTimeRange; +class QAudioBufferOutput; class QMediaPlayerPrivate; class Q_MULTIMEDIA_EXPORT QMediaPlayer : public QObject @@ -65,6 +30,7 @@ class Q_MULTIMEDIA_EXPORT QMediaPlayer : public QObject Q_PROPERTY(bool hasAudio READ hasAudio NOTIFY hasAudioChanged) Q_PROPERTY(bool hasVideo READ hasVideo NOTIFY hasVideoChanged) Q_PROPERTY(bool seekable READ isSeekable NOTIFY seekableChanged) + Q_PROPERTY(bool playing READ isPlaying NOTIFY playingChanged) Q_PROPERTY(qreal playbackRate READ playbackRate WRITE setPlaybackRate NOTIFY playbackRateChanged) Q_PROPERTY(int loops READ loops WRITE setLoops NOTIFY loopsChanged) Q_PROPERTY(PlaybackState playbackState READ playbackState NOTIFY playbackStateChanged) @@ -141,14 +107,14 @@ public: void setActiveVideoTrack(int index); void setActiveSubtitleTrack(int index); + void setAudioBufferOutput(QAudioBufferOutput *output); + QAudioBufferOutput *audioBufferOutput() const; + void setAudioOutput(QAudioOutput *output); QAudioOutput *audioOutput() const; void setVideoOutput(QObject *); QObject *videoOutput() const; -#if 0 - void setVideoOutput(const QList<QVideoSink *> &sinks); -#endif void setVideoSink(QVideoSink *sink); QVideoSink *videoSink() const; @@ -171,6 +137,8 @@ public: bool isSeekable() const; qreal playbackRate() const; + bool isPlaying() const; + int loops() const; void setLoops(int loops); @@ -206,12 +174,14 @@ Q_SIGNALS: void bufferProgressChanged(float progress); void seekableChanged(bool seekable); + void playingChanged(bool playing); void playbackRateChanged(qreal rate); void loopsChanged(); void metaDataChanged(); void videoOutputChanged(); void audioOutputChanged(); + void audioBufferOutputChanged(); void tracksChanged(); void activeTracksChanged(); diff --git a/src/multimedia/playback/qmediaplayer_p.h b/src/multimedia/playback/qmediaplayer_p.h index 49ee3fd24..3d32d4e68 100644 --- a/src/multimedia/playback/qmediaplayer_p.h +++ b/src/multimedia/playback/qmediaplayer_p.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 QMEDIAPLAYER_P_H #define QMEDIAPLAYER_P_H @@ -55,7 +19,9 @@ #include "qmediametadata.h" #include "qvideosink.h" #include "qaudiooutput.h" +#include "qaudiobufferoutput.h" #include <private/qplatformmediaplayer_p.h> +#include <private/qerrorinfo_p.h> #include "private/qobject_p.h" #include <QtCore/qobject.h> @@ -75,12 +41,17 @@ class QMediaPlayerPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QMediaPlayer) public: + static QMediaPlayerPrivate *get(QMediaPlayer *session) + { + return reinterpret_cast<QMediaPlayerPrivate *>(QObjectPrivate::get(session)); + } + QMediaPlayerPrivate() = default; - QPlatformMediaPlayer* control = nullptr; - QString errorString; + QPlatformMediaPlayer *control = nullptr; - QAudioOutput *audioOutput = nullptr; - QVideoSink *videoSink = nullptr; + QPointer<QAudioBufferOutput> audioBufferOutput; + QPointer<QAudioOutput> audioOutput; + QPointer<QVideoSink> videoSink; QPointer<QObject> videoOutput; QUrl qrcMedia; std::unique_ptr<QFile> qrcFile; @@ -88,7 +59,7 @@ public: QIODevice *stream = nullptr; QMediaPlayer::PlaybackState state = QMediaPlayer::StoppedState; - QMediaPlayer::Error error = QMediaPlayer::NoError; + QErrorInfo<QMediaPlayer::Error> error; void setMedia(const QUrl &media, QIODevice *stream = nullptr); @@ -96,7 +67,7 @@ public: void setState(QMediaPlayer::PlaybackState state); void setStatus(QMediaPlayer::MediaStatus status); - void setError(int error, const QString &errorString); + void setError(QMediaPlayer::Error error, const QString &errorString); void setVideoSink(QVideoSink *sink) { @@ -108,7 +79,8 @@ public: videoSink = sink; if (sink) sink->setSource(q); - control->setVideoSink(sink); + if (control) + control->setVideoSink(sink); emit q->videoOutputChanged(); } }; diff --git a/src/multimedia/pulseaudio/qaudioengine_pulse.cpp b/src/multimedia/pulseaudio/qaudioengine_pulse.cpp index 7b3cf57b1..5fac7234a 100644 --- a/src/multimedia/pulseaudio/qaudioengine_pulse.cpp +++ b/src/multimedia/pulseaudio/qaudioengine_pulse.cpp @@ -1,101 +1,139 @@ -/**************************************************************************** -** -** 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 #include <QtCore/qdebug.h> #include <qaudiodevice.h> +#include <QGuiApplication> +#include <QIcon> #include <QTimer> #include "qaudioengine_pulse_p.h" #include "qpulseaudiodevice_p.h" #include "qpulsehelpers_p.h" #include <sys/types.h> #include <unistd.h> +#include <mutex> // for lock_guard QT_BEGIN_NAMESPACE +template<typename Info> +static bool updateDevicesMap(QReadWriteLock &lock, QByteArray defaultDeviceId, + QMap<int, QAudioDevice> &devices, QAudioDevice::Mode mode, + const Info &info) +{ + QWriteLocker locker(&lock); + + bool isDefault = defaultDeviceId == info.name; + auto newDeviceInfo = std::make_unique<QPulseAudioDeviceInfo>(info.name, info.description, isDefault, mode); + newDeviceInfo->channelConfiguration = QPulseAudioInternal::channelConfigFromMap(info.channel_map); + newDeviceInfo->preferredFormat = QPulseAudioInternal::sampleSpecToAudioFormat(info.sample_spec); + newDeviceInfo->preferredFormat.setChannelConfig(newDeviceInfo->channelConfiguration); + + auto &device = devices[info.index]; + if (device.handle() && *newDeviceInfo == *device.handle()) + return false; + + device = newDeviceInfo.release()->create(); + return true; +} + +static bool updateDevicesMap(QReadWriteLock &lock, QByteArray defaultDeviceId, + QMap<int, QAudioDevice> &devices) +{ + QWriteLocker locker(&lock); + + bool result = false; + + for (QAudioDevice &device : devices) { + auto deviceInfo = device.handle(); + const auto isDefault = deviceInfo->id == defaultDeviceId; + if (deviceInfo->isDefault != isDefault) { + Q_ASSERT(dynamic_cast<const QPulseAudioDeviceInfo *>(deviceInfo)); + auto newDeviceInfo = std::make_unique<QPulseAudioDeviceInfo>( + *static_cast<const QPulseAudioDeviceInfo *>(deviceInfo)); + newDeviceInfo->isDefault = isDefault; + device = newDeviceInfo.release()->create(); + result = true; + } + } + + return result; +}; + static void serverInfoCallback(pa_context *context, const pa_server_info *info, void *userdata) { + using namespace Qt::Literals; + using namespace QPulseAudioInternal; + if (!info) { - qWarning() << QString::fromLatin1("Failed to get server information: %s").arg(QString::fromUtf8(pa_strerror(pa_context_errno(context)))); + qWarning() << "Failed to get server information:" << currentError(context); return; } -#ifdef DEBUG_PULSE - char ss[PA_SAMPLE_SPEC_SNPRINT_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX]; - - pa_sample_spec_snprint(ss, sizeof(ss), &info->sample_spec); - pa_channel_map_snprint(cm, sizeof(cm), &info->channel_map); - - qDebug() << QString("User name: %1\n" - "Host Name: %2\n" - "Server Name: %3\n" - "Server Version: %4\n" - "Default Sample Specification: %5\n" - "Default Channel Map: %6\n" - "Default Sink: %7\n" - "Default Source: %8\n").arg( - info->user_name, - info->host_name, - info->server_name, - info->server_version, - ss, - cm, - info->default_sink_name, - info->default_source_name); -#endif + if (Q_UNLIKELY(qLcPulseAudioEngine().isEnabled(QtDebugMsg))) { + char ss[PA_SAMPLE_SPEC_SNPRINT_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX]; + + pa_sample_spec_snprint(ss, sizeof(ss), &info->sample_spec); + pa_channel_map_snprint(cm, sizeof(cm), &info->channel_map); + + qCDebug(qLcPulseAudioEngine) + << QStringLiteral("User name: %1\n" + "Host Name: %2\n" + "Server Name: %3\n" + "Server Version: %4\n" + "Default Sample Specification: %5\n" + "Default Channel Map: %6\n" + "Default Sink: %7\n" + "Default Source: %8\n") + .arg(QString::fromUtf8(info->user_name), + QString::fromUtf8(info->host_name), + QString::fromUtf8(info->server_name), + QLatin1StringView(info->server_version), QLatin1StringView(ss), + QLatin1StringView(cm), QString::fromUtf8(info->default_sink_name), + QString::fromUtf8(info->default_source_name)); + } QPulseAudioEngine *pulseEngine = static_cast<QPulseAudioEngine*>(userdata); - pulseEngine->m_serverLock.lockForWrite(); - pulseEngine->m_defaultSink = info->default_sink_name; - pulseEngine->m_defaultSource = info->default_source_name; - // ### ensure the QAudioDevices are updated if default changes and emit changed signal in the device manager - pulseEngine->m_serverLock.unlock(); + + bool defaultSinkChanged = false; + bool defaultSourceChanged = false; + + { + QWriteLocker locker(&pulseEngine->m_serverLock); + + if (pulseEngine->m_defaultSink != info->default_sink_name) { + pulseEngine->m_defaultSink = info->default_sink_name; + defaultSinkChanged = true; + } + + if (pulseEngine->m_defaultSource != info->default_source_name) { + pulseEngine->m_defaultSource = info->default_source_name; + defaultSourceChanged = true; + } + } + + if (defaultSinkChanged + && updateDevicesMap(pulseEngine->m_sinkLock, pulseEngine->m_defaultSink, + pulseEngine->m_sinks)) + emit pulseEngine->audioOutputsChanged(); + + if (defaultSourceChanged + && updateDevicesMap(pulseEngine->m_sourceLock, pulseEngine->m_defaultSource, + pulseEngine->m_sources)) + emit pulseEngine->audioInputsChanged(); pa_threaded_mainloop_signal(pulseEngine->mainloop(), 0); } static void sinkInfoCallback(pa_context *context, const pa_sink_info *info, int isLast, void *userdata) { - QPulseAudioEngine *pulseEngine = static_cast<QPulseAudioEngine*>(userdata); + using namespace Qt::Literals; + using namespace QPulseAudioInternal; + + QPulseAudioEngine *pulseEngine = static_cast<QPulseAudioEngine *>(userdata); if (isLast < 0) { - qWarning() << QString::fromLatin1("Failed to get sink information: %s").arg(QString::fromUtf8(pa_strerror(pa_context_errno(context)))); + qWarning() << "Failed to get sink information:" << currentError(context); return; } @@ -106,36 +144,32 @@ static void sinkInfoCallback(pa_context *context, const pa_sink_info *info, int Q_ASSERT(info); -#ifdef DEBUG_PULSE - QMap<pa_sink_state, QString> stateMap; - stateMap[PA_SINK_INVALID_STATE] = "n/a"; - stateMap[PA_SINK_RUNNING] = "RUNNING"; - stateMap[PA_SINK_IDLE] = "IDLE"; - stateMap[PA_SINK_SUSPENDED] = "SUSPENDED"; - - qDebug() << QString("Sink #%1\n" - "\tState: %2\n" - "\tName: %3\n" - "\tDescription: %4\n" - ).arg(QString::number(info->index), - stateMap.value(info->state), - info->name, - info->description); -#endif - - QWriteLocker locker(&pulseEngine->m_sinkLock); - bool isDefault = pulseEngine->m_defaultSink == info->name; - auto *dinfo = new QPulseAudioDeviceInfo(info->name, info->description, isDefault, QAudioDevice::Output); - dinfo->channelMap = info->channel_map; - dinfo->channelConfiguration = QPulseAudioInternal::channelConfigFromMap(info->channel_map); - dinfo->preferredFormat = QPulseAudioInternal::sampleSpecToAudioFormat(info->sample_spec); - dinfo->preferredFormat.setChannelConfig(dinfo->channelConfiguration); - pulseEngine->m_sinks.insert(info->index, dinfo->create()); - emit pulseEngine->audioOutputsChanged(); + if (Q_UNLIKELY(qLcPulseAudioEngine().isEnabled(QtDebugMsg))) { + static const QMap<pa_sink_state, QString> stateMap{ + { PA_SINK_INVALID_STATE, u"n/a"_s }, { PA_SINK_RUNNING, u"RUNNING"_s }, + { PA_SINK_IDLE, u"IDLE"_s }, { PA_SINK_SUSPENDED, u"SUSPENDED"_s }, + { PA_SINK_UNLINKED, u"UNLINKED"_s }, + }; + + qCDebug(qLcPulseAudioEngine) + << QStringLiteral("Sink #%1\n" + "\tState: %2\n" + "\tName: %3\n" + "\tDescription: %4\n") + .arg(QString::number(info->index), stateMap.value(info->state), + QString::fromUtf8(info->name), + QString::fromUtf8(info->description)); + } + + if (updateDevicesMap(pulseEngine->m_sinkLock, pulseEngine->m_defaultSink, pulseEngine->m_sinks, + QAudioDevice::Output, *info)) + emit pulseEngine->audioOutputsChanged(); } static void sourceInfoCallback(pa_context *context, const pa_source_info *info, int isLast, void *userdata) { + using namespace Qt::Literals; + Q_UNUSED(context); QPulseAudioEngine *pulseEngine = static_cast<QPulseAudioEngine*>(userdata); @@ -146,35 +180,30 @@ static void sourceInfoCallback(pa_context *context, const pa_source_info *info, Q_ASSERT(info); -#ifdef DEBUG_PULSE - QMap<pa_source_state, QString> stateMap; - stateMap[PA_SOURCE_INVALID_STATE] = "n/a"; - stateMap[PA_SOURCE_RUNNING] = "RUNNING"; - stateMap[PA_SOURCE_IDLE] = "IDLE"; - stateMap[PA_SOURCE_SUSPENDED] = "SUSPENDED"; - - qDebug() << QString("Source #%1\n" - "\tState: %2\n" - "\tName: %3\n" - "\tDescription: %4\n" - ).arg(QString::number(info->index), - stateMap.value(info->state), - info->name, - info->description); -#endif - - QWriteLocker locker(&pulseEngine->m_sourceLock); + if (Q_UNLIKELY(qLcPulseAudioEngine().isEnabled(QtDebugMsg))) { + static const QMap<pa_source_state, QString> stateMap{ + { PA_SOURCE_INVALID_STATE, u"n/a"_s }, { PA_SOURCE_RUNNING, u"RUNNING"_s }, + { PA_SOURCE_IDLE, u"IDLE"_s }, { PA_SOURCE_SUSPENDED, u"SUSPENDED"_s }, + { PA_SOURCE_UNLINKED, u"UNLINKED"_s }, + }; + + qCDebug(qLcPulseAudioEngine) + << QStringLiteral("Source #%1\n" + "\tState: %2\n" + "\tName: %3\n" + "\tDescription: %4\n") + .arg(QString::number(info->index), stateMap.value(info->state), + QString::fromUtf8(info->name), + QString::fromUtf8(info->description)); + } + // skip monitor channels if (info->monitor_of_sink != PA_INVALID_INDEX) return; - bool isDefault = pulseEngine->m_defaultSink == info->name; - auto *dinfo = new QPulseAudioDeviceInfo(info->name, info->description, isDefault, QAudioDevice::Input); - dinfo->channelMap = info->channel_map; - dinfo->channelConfiguration = QPulseAudioInternal::channelConfigFromMap(info->channel_map); - dinfo->preferredFormat = QPulseAudioInternal::sampleSpecToAudioFormat(info->sample_spec); - dinfo->preferredFormat.setChannelConfig(dinfo->channelConfiguration); - pulseEngine->m_sources.insert(info->index, dinfo->create()); - emit pulseEngine->audioInputsChanged(); + + if (updateDevicesMap(pulseEngine->m_sourceLock, pulseEngine->m_defaultSource, + pulseEngine->m_sources, QAudioDevice::Input, *info)) + emit pulseEngine->audioInputsChanged(); } static void event_cb(pa_context* context, pa_subscription_event_type_t t, uint32_t index, void* userdata) @@ -189,27 +218,23 @@ static void event_cb(pa_context* context, pa_subscription_event_type_t t, uint32 case PA_SUBSCRIPTION_EVENT_CHANGE: switch (facility) { case PA_SUBSCRIPTION_EVENT_SERVER: { - pa_operation *op = pa_context_get_server_info(context, serverInfoCallback, userdata); - if (op) - pa_operation_unref(op); - else - qWarning("PulseAudioService: failed to get server info"); + PAOperationUPtr op(pa_context_get_server_info(context, serverInfoCallback, userdata)); + if (!op) + qWarning() << "PulseAudioService: failed to get server info"; break; } case PA_SUBSCRIPTION_EVENT_SINK: { - pa_operation *op = pa_context_get_sink_info_by_index(context, index, sinkInfoCallback, userdata); - if (op) - pa_operation_unref(op); - else - qWarning("PulseAudioService: failed to get sink info"); + PAOperationUPtr op( + pa_context_get_sink_info_by_index(context, index, sinkInfoCallback, userdata)); + if (!op) + qWarning() << "PulseAudioService: failed to get sink info"; break; } case PA_SUBSCRIPTION_EVENT_SOURCE: { - pa_operation *op = pa_context_get_source_info_by_index(context, index, sourceInfoCallback, userdata); - if (op) - pa_operation_unref(op); - else - qWarning("PulseAudioService: failed to get source info"); + PAOperationUPtr op(pa_context_get_source_info_by_index(context, index, + sourceInfoCallback, userdata)); + if (!op) + qWarning() << "PulseAudioService: failed to get source info"; break; } default: @@ -218,16 +243,16 @@ static void event_cb(pa_context* context, pa_subscription_event_type_t t, uint32 break; case PA_SUBSCRIPTION_EVENT_REMOVE: switch (facility) { - case PA_SUBSCRIPTION_EVENT_SINK: - pulseEngine->m_sinkLock.lockForWrite(); + case PA_SUBSCRIPTION_EVENT_SINK: { + QWriteLocker locker(&pulseEngine->m_sinkLock); pulseEngine->m_sinks.remove(index); - pulseEngine->m_sinkLock.unlock(); break; - case PA_SUBSCRIPTION_EVENT_SOURCE: - pulseEngine->m_sourceLock.lockForWrite(); + } + case PA_SUBSCRIPTION_EVENT_SOURCE: { + QWriteLocker locker(&pulseEngine->m_sourceLock); pulseEngine->m_sources.remove(index); - pulseEngine->m_sourceLock.unlock(); break; + } default: break; } @@ -240,9 +265,10 @@ static void event_cb(pa_context* context, pa_subscription_event_type_t t, uint32 static void contextStateCallbackInit(pa_context *context, void *userdata) { Q_UNUSED(context); -#ifdef DEBUG_PULSE - qDebug() << QPulseAudioInternal::stateToQString(pa_context_get_state(context)); -#endif + + if (Q_UNLIKELY(qLcPulseAudioEngine().isEnabled(QtDebugMsg))) + qCDebug(qLcPulseAudioEngine) << pa_context_get_state(context); + QPulseAudioEngine *pulseEngine = reinterpret_cast<QPulseAudioEngine*>(userdata); pa_threaded_mainloop_signal(pulseEngine->mainloop(), 0); } @@ -252,9 +278,8 @@ static void contextStateCallback(pa_context *c, void *userdata) QPulseAudioEngine *self = reinterpret_cast<QPulseAudioEngine*>(userdata); pa_context_state_t state = pa_context_get_state(c); -#ifdef DEBUG_PULSE - qDebug() << QPulseAudioInternal::stateToQString(state); -#endif + if (Q_UNLIKELY(qLcPulseAudioEngine().isEnabled(QtDebugMsg))) + qCDebug(qLcPulseAudioEngine) << state; if (state == PA_CONTEXT_FAILED) QMetaObject::invokeMethod(self, "onContextFailed", Qt::QueuedConnection); @@ -279,17 +304,18 @@ QPulseAudioEngine::~QPulseAudioEngine() void QPulseAudioEngine::prepare() { + using namespace QPulseAudioInternal; bool keepGoing = true; bool ok = true; m_mainLoop = pa_threaded_mainloop_new(); if (m_mainLoop == nullptr) { - qWarning("PulseAudioService: unable to create pulseaudio mainloop"); + qWarning() << "PulseAudioService: unable to create pulseaudio mainloop"; return; } if (pa_threaded_mainloop_start(m_mainLoop) != 0) { - qWarning("PulseAudioService: unable to start pulseaudio mainloop"); + qWarning() << "PulseAudioService: unable to start pulseaudio mainloop"; pa_threaded_mainloop_free(m_mainLoop); m_mainLoop = nullptr; return; @@ -299,10 +325,19 @@ void QPulseAudioEngine::prepare() lock(); - m_context = pa_context_new(m_mainLoopApi, QString(QLatin1String("QtPulseAudio:%1")).arg(::getpid()).toLatin1().constData()); + pa_proplist *proplist = pa_proplist_new(); + if (!QGuiApplication::applicationDisplayName().isEmpty()) + pa_proplist_sets(proplist, PA_PROP_APPLICATION_NAME, qUtf8Printable(QGuiApplication::applicationDisplayName())); + if (!QGuiApplication::desktopFileName().isEmpty()) + pa_proplist_sets(proplist, PA_PROP_APPLICATION_ID, qUtf8Printable(QGuiApplication::desktopFileName())); + if (const QString windowIconName = QGuiApplication::windowIcon().name(); !windowIconName.isEmpty()) + pa_proplist_sets(proplist, PA_PROP_WINDOW_ICON_NAME, qUtf8Printable(windowIconName)); + + m_context = pa_context_new_with_proplist(m_mainLoopApi, nullptr, proplist); + pa_proplist_free(proplist); if (m_context == nullptr) { - qWarning("PulseAudioService: Unable to create new pulseaudio context"); + qWarning() << "PulseAudioService: Unable to create new pulseaudio context"; pa_threaded_mainloop_unlock(m_mainLoop); pa_threaded_mainloop_free(m_mainLoop); m_mainLoop = nullptr; @@ -312,8 +347,8 @@ void QPulseAudioEngine::prepare() pa_context_set_state_callback(m_context, contextStateCallbackInit, this); - if (pa_context_connect(m_context, nullptr, (pa_context_flags_t)0, nullptr) < 0) { - qWarning("PulseAudioService: pa_context_connect() failed"); + if (pa_context_connect(m_context, nullptr, static_cast<pa_context_flags_t>(0), nullptr) < 0) { + qWarning() << "PulseAudioService: pa_context_connect() failed"; pa_context_unref(m_context); pa_threaded_mainloop_unlock(m_mainLoop); pa_threaded_mainloop_free(m_mainLoop); @@ -332,9 +367,7 @@ void QPulseAudioEngine::prepare() break; case PA_CONTEXT_READY: -#ifdef DEBUG_PULSE - qDebug("Connection established."); -#endif + qCDebug(qLcPulseAudioEngine) << "Connection established."; keepGoing = false; break; @@ -346,8 +379,8 @@ void QPulseAudioEngine::prepare() case PA_CONTEXT_FAILED: default: - qCritical() << QString::fromLatin1("PulseAudioService: Connection failure: %1") - .arg(QString::fromUtf8(pa_strerror(pa_context_errno(m_context)))); + qCritical() << "PulseAudioService: Connection failure:" + << currentError(m_context); keepGoing = false; ok = false; } @@ -360,15 +393,13 @@ void QPulseAudioEngine::prepare() pa_context_set_state_callback(m_context, contextStateCallback, this); pa_context_set_subscribe_callback(m_context, event_cb, this); - pa_operation *op = pa_context_subscribe(m_context, - pa_subscription_mask_t(PA_SUBSCRIPTION_MASK_SINK | - PA_SUBSCRIPTION_MASK_SOURCE | - PA_SUBSCRIPTION_MASK_SERVER), - nullptr, nullptr); - if (op) - pa_operation_unref(op); - else - qWarning("PulseAudioService: failed to subscribe to context notifications"); + PAOperationUPtr op(pa_context_subscribe( + m_context, + pa_subscription_mask_t(PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SOURCE + | PA_SUBSCRIPTION_MASK_SERVER), + nullptr, nullptr)); + if (!op) + qWarning() << "PulseAudioService: failed to subscribe to context notifications"; } else { pa_context_unref(m_context); m_context = nullptr; @@ -408,39 +439,34 @@ void QPulseAudioEngine::release() void QPulseAudioEngine::updateDevices() { - lock(); + std::lock_guard lock(*this); // Get default input and output devices - pa_operation *operation = pa_context_get_server_info(m_context, serverInfoCallback, this); + PAOperationUPtr operation(pa_context_get_server_info(m_context, serverInfoCallback, this)); if (operation) { - while (pa_operation_get_state(operation) == PA_OPERATION_RUNNING) + while (pa_operation_get_state(operation.get()) == PA_OPERATION_RUNNING) pa_threaded_mainloop_wait(m_mainLoop); - pa_operation_unref(operation); } else { - qWarning("PulseAudioService: failed to get server info"); + qWarning() << "PulseAudioService: failed to get server info"; } // Get output devices - operation = pa_context_get_sink_info_list(m_context, sinkInfoCallback, this); + operation.reset(pa_context_get_sink_info_list(m_context, sinkInfoCallback, this)); if (operation) { - while (pa_operation_get_state(operation) == PA_OPERATION_RUNNING) + while (pa_operation_get_state(operation.get()) == PA_OPERATION_RUNNING) pa_threaded_mainloop_wait(m_mainLoop); - pa_operation_unref(operation); } else { - qWarning("PulseAudioService: failed to get sink info"); + qWarning() << "PulseAudioService: failed to get sink info"; } // Get input devices - operation = pa_context_get_source_info_list(m_context, sourceInfoCallback, this); + operation.reset(pa_context_get_source_info_list(m_context, sourceInfoCallback, this)); if (operation) { - while (pa_operation_get_state(operation) == PA_OPERATION_RUNNING) + while (pa_operation_get_state(operation.get()) == PA_OPERATION_RUNNING) pa_threaded_mainloop_wait(m_mainLoop); - pa_operation_unref(operation); } else { - qWarning("PulseAudioService: failed to get source info"); + qWarning() << "PulseAudioService: failed to get source info"; } - - unlock(); } void QPulseAudioEngine::onContextFailed() @@ -451,7 +477,7 @@ void QPulseAudioEngine::onContextFailed() release(); // Try to reconnect later - QTimer::singleShot(3000, this, SLOT(prepare())); + QTimer::singleShot(3000, this, &QPulseAudioEngine::prepare); } QPulseAudioEngine *QPulseAudioEngine::instance() @@ -461,24 +487,17 @@ QPulseAudioEngine *QPulseAudioEngine::instance() QList<QAudioDevice> QPulseAudioEngine::availableDevices(QAudioDevice::Mode mode) const { - QList<QAudioDevice> devices; - QByteArray defaultDevice; - - m_serverLock.lockForRead(); - if (mode == QAudioDevice::Output) { QReadLocker locker(&m_sinkLock); - devices = m_sinks.values(); - defaultDevice = m_defaultSink; - } else { - QReadLocker locker(&m_sourceLock); - devices = m_sources.values(); - defaultDevice = m_defaultSource; + return m_sinks.values(); } - m_serverLock.unlock(); + if (mode == QAudioDevice::Input) { + QReadLocker locker(&m_sourceLock); + return m_sources.values(); + } - return devices; + return {}; } QByteArray QPulseAudioEngine::defaultDevice(QAudioDevice::Mode mode) const diff --git a/src/multimedia/pulseaudio/qaudioengine_pulse_p.h b/src/multimedia/pulseaudio/qaudioengine_pulse_p.h index 79a3d8d3d..2ed1fa0b1 100644 --- a/src/multimedia/pulseaudio/qaudioengine_pulse_p.h +++ b/src/multimedia/pulseaudio/qaudioengine_pulse_p.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 QPULSEAUDIOENGINE_H #define QPULSEAUDIOENGINE_H diff --git a/src/multimedia/pulseaudio/qpulseaudiodevice.cpp b/src/multimedia/pulseaudio/qpulseaudiodevice.cpp index c25467a8f..487b88f6d 100644 --- a/src/multimedia/pulseaudio/qpulseaudiodevice.cpp +++ b/src/multimedia/pulseaudio/qpulseaudiodevice.cpp @@ -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 #include "qpulseaudiodevice_p.h" #include "qaudioengine_pulse_p.h" diff --git a/src/multimedia/pulseaudio/qpulseaudiodevice_p.h b/src/multimedia/pulseaudio/qpulseaudiodevice_p.h index 0175efca1..b44c71e0d 100644 --- a/src/multimedia/pulseaudio/qpulseaudiodevice_p.h +++ b/src/multimedia/pulseaudio/qpulseaudiodevice_p.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 QAUDIODEVICEINFOPULSE_H #define QAUDIODEVICEINFOPULSE_H @@ -69,8 +33,6 @@ class QPulseAudioDeviceInfo : public QAudioDevicePrivate public: QPulseAudioDeviceInfo(const char *device, const char *description, bool isDefault, QAudioDevice::Mode mode); ~QPulseAudioDeviceInfo() {} - - pa_channel_map channelMap; }; QT_END_NAMESPACE diff --git a/src/multimedia/pulseaudio/qpulseaudiomediadevices.cpp b/src/multimedia/pulseaudio/qpulseaudiomediadevices.cpp index 75058a887..4deee6033 100644 --- a/src/multimedia/pulseaudio/qpulseaudiomediadevices.cpp +++ b/src/multimedia/pulseaudio/qpulseaudiomediadevices.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 "qpulseaudiomediadevices_p.h" #include "qmediadevices.h" @@ -52,6 +16,13 @@ QPulseAudioMediaDevices::QPulseAudioMediaDevices() : QPlatformMediaDevices() { pulseEngine = new QPulseAudioEngine(); + + // TODO: it might make sense to connect device changing signals + // to each added QMediaDevices + QObject::connect(pulseEngine, &QPulseAudioEngine::audioInputsChanged, + this, &QPulseAudioMediaDevices::audioInputsChanged, Qt::DirectConnection); + QObject::connect(pulseEngine, &QPulseAudioEngine::audioOutputsChanged, + this, &QPulseAudioMediaDevices::audioOutputsChanged, Qt::DirectConnection); } QPulseAudioMediaDevices::~QPulseAudioMediaDevices() @@ -69,19 +40,16 @@ QList<QAudioDevice> QPulseAudioMediaDevices::audioOutputs() const return pulseEngine->availableDevices(QAudioDevice::Output); } -QList<QCameraDevice> QPulseAudioMediaDevices::videoInputs() const -{ - return {}; -} - -QPlatformAudioSource *QPulseAudioMediaDevices::createAudioSource(const QAudioDevice &deviceInfo) +QPlatformAudioSource *QPulseAudioMediaDevices::createAudioSource(const QAudioDevice &deviceInfo, + QObject *parent) { - return new QPulseAudioSource(deviceInfo.id()); + return new QPulseAudioSource(deviceInfo.id(), parent); } -QPlatformAudioSink *QPulseAudioMediaDevices::createAudioSink(const QAudioDevice &deviceInfo) +QPlatformAudioSink *QPulseAudioMediaDevices::createAudioSink(const QAudioDevice &deviceInfo, + QObject *parent) { - return new QPulseAudioSink(deviceInfo.id()); + return new QPulseAudioSink(deviceInfo.id(), parent); } QT_END_NAMESPACE diff --git a/src/multimedia/pulseaudio/qpulseaudiomediadevices_p.h b/src/multimedia/pulseaudio/qpulseaudiomediadevices_p.h index dd811f550..094dc3907 100644 --- a/src/multimedia/pulseaudio/qpulseaudiomediadevices_p.h +++ b/src/multimedia/pulseaudio/qpulseaudiomediadevices_p.h @@ -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 #ifndef QPULSEAUDIOMEDIADEVICES_H #define QPULSEAUDIOMEDIADEVICES_H @@ -67,9 +31,10 @@ public: QList<QAudioDevice> audioInputs() const override; QList<QAudioDevice> audioOutputs() const override; - QList<QCameraDevice> videoInputs() const override; - QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo) override; - QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo) override; + QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo, + QObject *parent) override; + QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo, + QObject *parent) override; private: QPulseAudioEngine *pulseEngine; diff --git a/src/multimedia/pulseaudio/qpulseaudiosink.cpp b/src/multimedia/pulseaudio/qpulseaudiosink.cpp index b3e39d746..610677eeb 100644 --- a/src/multimedia/pulseaudio/qpulseaudiosink.cpp +++ b/src/multimedia/pulseaudio/qpulseaudiosink.cpp @@ -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 #include <QtCore/qcoreapplication.h> #include <QtCore/qdebug.h> @@ -43,21 +7,20 @@ #include <private/qaudiohelpers_p.h> #include "qpulseaudiosink_p.h" -#include "qpulseaudiodevice_p.h" #include "qaudioengine_pulse_p.h" #include "qpulsehelpers_p.h" #include <sys/types.h> #include <unistd.h> - -Q_DECLARE_LOGGING_CATEGORY(qLcPulseAudio) +#include <mutex> // for std::lock_guard QT_BEGIN_NAMESPACE -const int PeriodTimeMs = 20; +static constexpr uint SinkPeriodTimeMs = 20; +static constexpr uint DefaultBufferLengthMs = 100; #define LOW_LATENCY_CATEGORY_NAME "game" -static void outputStreamWriteCallback(pa_stream *stream, size_t length, void *userdata) +static void outputStreamWriteCallback(pa_stream *stream, size_t length, void *userdata) { Q_UNUSED(stream); Q_UNUSED(userdata); @@ -72,17 +35,19 @@ static void outputStreamStateCallback(pa_stream *stream, void *userdata) pa_stream_state_t state = pa_stream_get_state(stream); qCDebug(qLcPulseAudioOut) << "Stream state callback:" << state; switch (state) { - case PA_STREAM_CREATING: - case PA_STREAM_READY: - case PA_STREAM_TERMINATED: - break; - - case PA_STREAM_FAILED: - default: - qWarning() << QString::fromLatin1("Stream error: %1").arg(QString::fromUtf8(pa_strerror(pa_context_errno(pa_stream_get_context(stream))))); - QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); - pa_threaded_mainloop_signal(pulseEngine->mainloop(), 0); - break; + case PA_STREAM_CREATING: + case PA_STREAM_READY: + case PA_STREAM_TERMINATED: + break; + + case PA_STREAM_FAILED: + default: + qWarning() << QStringLiteral("Stream error: %1") + .arg(QString::fromUtf8(pa_strerror( + pa_context_errno(pa_stream_get_context(stream))))); + QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); + pa_threaded_mainloop_signal(pulseEngine->mainloop(), 0); + break; } } @@ -133,90 +98,73 @@ static void outputStreamDrainComplete(pa_stream *stream, int success, void *user { Q_UNUSED(stream); - qCDebug(qLcPulseAudioOut) << "Stream drained:" << bool(success) << userdata; - if (success && userdata) + qCDebug(qLcPulseAudioOut) << "Stream drained:" << static_cast<bool>(success) << userdata; + + QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); + pa_threaded_mainloop_signal(pulseEngine->mainloop(), 0); + + if (userdata && success) static_cast<QPulseAudioSink *>(userdata)->streamDrainedCallback(); } +static void outputStreamFlushComplete(pa_stream *stream, int success, void *userdata) +{ + Q_UNUSED(stream); + + qCDebug(qLcPulseAudioOut) << "Stream flushed:" << static_cast<bool>(success) << userdata; +} + static void streamAdjustPrebufferCallback(pa_stream *stream, int success, void *userdata) { Q_UNUSED(stream); Q_UNUSED(success); Q_UNUSED(userdata); - qCDebug(qLcPulseAudioOut) << "Prebuffer adjusted:" << bool(success); + qCDebug(qLcPulseAudioOut) << "Prebuffer adjusted:" << static_cast<bool>(success); } - -QPulseAudioSink::QPulseAudioSink(const QByteArray &device) - : m_device(device) +QPulseAudioSink::QPulseAudioSink(const QByteArray &device, QObject *parent) + : QPlatformAudioSink(parent), m_device(device), m_stateMachine(*this) { } QPulseAudioSink::~QPulseAudioSink() { - close(); - QCoreApplication::processEvents(); -} - -void QPulseAudioSink::setError(QAudio::Error error) -{ - if (m_errorState == error) - return; - - m_errorState = error; - emit errorChanged(error); + if (auto notifier = m_stateMachine.stop()) + close(); } QAudio::Error QPulseAudioSink::error() const { - return m_errorState; -} - -void QPulseAudioSink::setState(QAudio::State state) -{ - if (m_deviceState == state) - return; - - m_deviceState = state; - emit stateChanged(state); + return m_stateMachine.error(); } QAudio::State QPulseAudioSink::state() const { - return m_deviceState; + return m_stateMachine.state(); } void QPulseAudioSink::streamUnderflowCallback() { - if (m_audioSource && m_audioSource->atEnd()) { + bool atEnd = m_audioSource && m_audioSource->atEnd(); + if (atEnd && m_stateMachine.state() != QAudio::StoppedState) { qCDebug(qLcPulseAudioOut) << "Draining stream at end of buffer"; - pa_operation *o = pa_stream_drain(m_stream, outputStreamDrainComplete, this); - if (o) - pa_operation_unref(o); - } else if (m_deviceState != QAudio::IdleState && !m_resuming) { - setError(QAudio::UnderrunError); - setState(QAudio::IdleState); + exchangeDrainOperation(pa_stream_drain(m_stream, outputStreamDrainComplete, this)); } + + m_stateMachine.updateActiveOrIdle( + false, (m_pullMode && atEnd) ? QAudio::NoError : QAudio::UnderrunError); } void QPulseAudioSink::streamDrainedCallback() { - setError(QAudio::NoError); - setState(QAudio::IdleState); + if (!exchangeDrainOperation(nullptr)) + return; } void QPulseAudioSink::start(QIODevice *device) { - setState(QAudio::StoppedState); - setError(QAudio::NoError); - - // Handle change of mode - if (m_audioSource && !m_pullMode) - delete m_audioSource; - m_audioSource = nullptr; - - close(); + reset(); m_pullMode = true; m_audioSource = device; @@ -230,27 +178,29 @@ void QPulseAudioSink::start(QIODevice *device) gettimeofday(&lastTimingInfo, nullptr); lastProcessedUSecs = 0; - connect(m_audioSource, &QIODevice::readyRead, this, &QPulseAudioSink::startReading); - setState(QAudio::ActiveState); + connect(m_audioSource, &QIODevice::readyRead, this, &QPulseAudioSink::startPulling); + + m_stateMachine.start(); } -void QPulseAudioSink::startReading() +void QPulseAudioSink::startPulling() { - if (!m_tickTimer.isActive()) - m_tickTimer.start(m_periodTime, this); + Q_ASSERT(m_pullMode); + if (m_tickTimer.isActive()) + return; + + m_tickTimer.start(m_pullingPeriodTime, this); } -QIODevice *QPulseAudioSink::start() +void QPulseAudioSink::stopTimer() { - setState(QAudio::StoppedState); - setError(QAudio::NoError); - - // Handle change of mode - if (m_audioSource && !m_pullMode) - delete m_audioSource; - m_audioSource = nullptr; + if (m_tickTimer.isActive()) + m_tickTimer.stop(); +} - close(); +QIODevice *QPulseAudioSink::start() +{ + reset(); m_pullMode = false; @@ -258,13 +208,13 @@ QIODevice *QPulseAudioSink::start() return nullptr; m_audioSource = new PulseOutputPrivate(this); - m_audioSource->open(QIODevice::WriteOnly|QIODevice::Unbuffered); + m_audioSource->open(QIODevice::WriteOnly | QIODevice::Unbuffered); // ensure we only process timing infos that are up to date gettimeofday(&lastTimingInfo, nullptr); lastProcessedUSecs = 0; - setState(QAudio::IdleState); + m_stateMachine.start(false); return m_audioSource; } @@ -276,10 +226,9 @@ bool QPulseAudioSink::open() QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); - if (!pulseEngine->context() || pa_context_get_state(pulseEngine->context()) != PA_CONTEXT_READY) { - setError(QAudio::FatalError); - setState(QAudio::StoppedState); - emit stateChanged(m_deviceState); + if (!pulseEngine->context() + || pa_context_get_state(pulseEngine->context()) != PA_CONTEXT_READY) { + m_stateMachine.stopOrUpdateError(QAudio::FatalError); return false; } @@ -288,9 +237,7 @@ bool QPulseAudioSink::open() Q_ASSERT(spec.channels == channel_map.channels); if (!pa_sample_spec_valid(&spec)) { - setError(QAudio::OpenError); - setState(QAudio::StoppedState); - emit stateChanged(m_deviceState); + m_stateMachine.stopOrUpdateError(QAudio::OpenError); return false; } @@ -298,11 +245,12 @@ bool QPulseAudioSink::open() m_totalTimeValue = 0; if (m_streamName.isNull()) - m_streamName = QString(QLatin1String("QtmPulseStream-%1-%2")).arg(::getpid()).arg(quintptr(this)).toUtf8(); + m_streamName = + QStringLiteral("QtmPulseStream-%1-%2").arg(::getpid()).arg(quintptr(this)).toUtf8(); if (Q_UNLIKELY(qLcPulseAudioOut().isEnabled(QtDebugMsg))) { qCDebug(qLcPulseAudioOut) << "Opening stream with."; - qCDebug(qLcPulseAudioOut) << "\tFormat: " << QPulseAudioInternal::sampleFormatToQString(spec.format); + qCDebug(qLcPulseAudioOut) << "\tFormat: " << spec.format; qCDebug(qLcPulseAudioOut) << "\tRate: " << spec.rate; qCDebug(qLcPulseAudioOut) << "\tChannels: " << spec.channels; qCDebug(qLcPulseAudioOut) << "\tFrame size: " << pa_frame_size(&spec); @@ -310,7 +258,6 @@ bool QPulseAudioSink::open() pulseEngine->lock(); - pa_proplist *propList = pa_proplist_new(); #if 0 qint64 bytesPerSecond = m_format.sampleRate() * m_format.bytesPerFrame(); @@ -332,18 +279,18 @@ bool QPulseAudioSink::open() pa_proplist_sets(propList, PA_PROP_MEDIA_ROLE, r); #endif - m_stream = pa_stream_new_with_proplist(pulseEngine->context(), m_streamName.constData(), &m_spec, &channel_map, propList); + m_stream = pa_stream_new_with_proplist(pulseEngine->context(), m_streamName.constData(), + &m_spec, &channel_map, propList); + pa_proplist_free(propList); + if (!m_stream) { qCWarning(qLcPulseAudioOut) << "QAudioSink: pa_stream_new_with_proplist() failed!"; pulseEngine->unlock(); - setError(QAudio::OpenError); - setState(QAudio::StoppedState); - emit stateChanged(m_deviceState); + + m_stateMachine.stopOrUpdateError(QAudio::OpenError); return false; } - pa_proplist_free(propList); - pa_stream_set_state_callback(m_stream, outputStreamStateCallback, this); pa_stream_set_write_callback(m_stream, outputStreamWriteCallback, this); @@ -352,21 +299,26 @@ bool QPulseAudioSink::open() pa_stream_set_latency_update_callback(m_stream, outputStreamLatencyCallback, this); pa_buffer_attr requestedBuffer; - requestedBuffer.fragsize = (uint32_t)-1; - requestedBuffer.maxlength = (uint32_t)-1; - requestedBuffer.minreq = (uint32_t)-1; - requestedBuffer.prebuf = (uint32_t)-1; - requestedBuffer.tlength = m_bufferSize; - - pa_stream_flags flags = pa_stream_flags(PA_STREAM_AUTO_TIMING_UPDATE|PA_STREAM_ADJUST_LATENCY); - if (pa_stream_connect_playback(m_stream, m_device.data(), (m_bufferSize > 0) ? &requestedBuffer : nullptr, flags, nullptr, nullptr) < 0) { + // Request a target buffer size + auto targetBufferSize = m_userBufferSize ? *m_userBufferSize : defaultBufferSize(); + requestedBuffer.tlength = + targetBufferSize ? static_cast<uint32_t>(targetBufferSize) : static_cast<uint32_t>(-1); + // Rest should be determined by PulseAudio + requestedBuffer.fragsize = static_cast<uint32_t>(-1); + requestedBuffer.maxlength = static_cast<uint32_t>(-1); + requestedBuffer.minreq = static_cast<uint32_t>(-1); + requestedBuffer.prebuf = static_cast<uint32_t>(-1); + + pa_stream_flags flags = + pa_stream_flags(PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_ADJUST_LATENCY); + if (pa_stream_connect_playback(m_stream, m_device.data(), &requestedBuffer, flags, nullptr, + nullptr) + < 0) { qCWarning(qLcPulseAudioOut) << "pa_stream_connect_playback() failed!"; pa_stream_unref(m_stream); m_stream = nullptr; pulseEngine->unlock(); - setError(QAudio::OpenError); - setState(QAudio::StoppedState); - emit stateChanged(m_deviceState); + m_stateMachine.stopOrUpdateError(QAudio::OpenError); return false; } @@ -374,20 +326,25 @@ bool QPulseAudioSink::open() pa_threaded_mainloop_wait(pulseEngine->mainloop()); const pa_buffer_attr *buffer = pa_stream_get_buffer_attr(m_stream); - m_periodTime = PeriodTimeMs; - m_periodSize = pa_usec_to_bytes(m_periodTime * 1000, &m_spec); m_bufferSize = buffer->tlength; - m_maxBufferSize = buffer->maxlength; - m_audioBuffer = new char[m_maxBufferSize]; + + if (m_pullMode) { + // Adjust period time to reduce chance of it being higher than amount of bytes requested by + // PulseAudio server + m_pullingPeriodTime = + qMin(SinkPeriodTimeMs, pa_bytes_to_usec(m_bufferSize, &m_spec) / 1000 / 2); + m_pullingPeriodSize = pa_usec_to_bytes(m_pullingPeriodTime * 1000, &m_spec); + } + + m_audioBuffer.resize(buffer->maxlength); const qint64 streamSize = m_audioSource ? m_audioSource->size() : 0; if (m_pullMode && streamSize > 0 && static_cast<qint64>(buffer->prebuf) > streamSize) { pa_buffer_attr newBufferAttr; newBufferAttr = *buffer; newBufferAttr.prebuf = streamSize; - pa_operation *o = pa_stream_set_buffer_attr(m_stream, &newBufferAttr, streamAdjustPrebufferCallback, nullptr); - if (o) - pa_operation_unref(o); + PAOperationUPtr(pa_stream_set_buffer_attr(m_stream, &newBufferAttr, + streamAdjustPrebufferCallback, nullptr)); } if (Q_UNLIKELY(qLcPulseAudioOut().isEnabled(QtDebugMsg))) { @@ -401,11 +358,13 @@ bool QPulseAudioSink::open() pulseEngine->unlock(); - connect(pulseEngine, &QPulseAudioEngine::contextFailed, this, &QPulseAudioSink::onPulseContextFailed); + connect(pulseEngine, &QPulseAudioEngine::contextFailed, this, + &QPulseAudioSink::onPulseContextFailed); m_opened = true; - startReading(); + if (m_pullMode) + startPulling(); m_elapsedTimeOffset = 0; @@ -417,12 +376,12 @@ void QPulseAudioSink::close() if (!m_opened) return; - m_tickTimer.stop(); + stopTimer(); QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); if (m_stream) { - pulseEngine->lock(); + std::lock_guard lock(*pulseEngine); pa_stream_set_state_callback(m_stream, nullptr, nullptr); pa_stream_set_write_callback(m_stream, nullptr, nullptr); @@ -430,37 +389,37 @@ void QPulseAudioSink::close() pa_stream_set_overflow_callback(m_stream, nullptr, nullptr); pa_stream_set_latency_update_callback(m_stream, nullptr, nullptr); - pa_operation *o = pa_stream_drain(m_stream, outputStreamDrainComplete, nullptr); - if (o) - pa_operation_unref(o); + if (auto prevOp = exchangeDrainOperation(nullptr)) + // cancel draining operation to prevent calling draining callback after closing. + pa_operation_cancel(prevOp.get()); + + PAOperationUPtr operation(pa_stream_flush(m_stream, outputStreamFlushComplete, nullptr)); pa_stream_disconnect(m_stream); pa_stream_unref(m_stream); m_stream = nullptr; - - pulseEngine->unlock(); } - disconnect(pulseEngine, &QPulseAudioEngine::contextFailed, this, &QPulseAudioSink::onPulseContextFailed); + disconnect(pulseEngine, &QPulseAudioEngine::contextFailed, this, + &QPulseAudioSink::onPulseContextFailed); if (m_audioSource) { if (m_pullMode) { disconnect(m_audioSource, &QIODevice::readyRead, this, nullptr); + m_audioSource->reset(); } else { delete m_audioSource; m_audioSource = nullptr; } } + m_opened = false; - if (m_audioBuffer) { - delete[] m_audioBuffer; - m_audioBuffer = nullptr; - } + m_audioBuffer.clear(); } void QPulseAudioSink::timerEvent(QTimerEvent *event) { - if (event->timerId() == m_tickTimer.timerId()) + if (event->timerId() == m_tickTimer.timerId() && m_pullMode) userFeed(); QPlatformAudioSink::timerEvent(event); @@ -468,54 +427,48 @@ void QPulseAudioSink::timerEvent(QTimerEvent *event) void QPulseAudioSink::userFeed() { - if (m_deviceState == QAudio::StoppedState || m_deviceState == QAudio::SuspendedState) + int writableSize = bytesFree(); + + if (writableSize == 0) { + // PulseAudio server doesn't want any more data + m_stateMachine.activateFromIdle(); return; + } - m_resuming = false; + // Write up to writableSize + const int inputSize = + std::min({ m_pullingPeriodSize, static_cast<int>(m_audioBuffer.size()), writableSize }); - if (m_pullMode) { - setError(QAudio::NoError); - setState(QAudio::ActiveState); - int writableSize = bytesFree(); - int chunks = writableSize / m_periodSize; - if (chunks == 0) - return; - - int input = m_periodSize; // always request 1 chunk of data from user - if (input > m_maxBufferSize) - input = m_maxBufferSize; - - Q_ASSERT(m_audioBuffer); - int audioBytesPulled = m_audioSource->read(m_audioBuffer, input); - Q_ASSERT(audioBytesPulled <= input); - if (audioBytesPulled > 0) { - if (audioBytesPulled > input) { - qCWarning(qLcPulseAudioOut) << "Invalid audio data size provided by pull source:" - << audioBytesPulled << "should be less than" << input; - audioBytesPulled = input; - } - qint64 bytesWritten = write(m_audioBuffer, audioBytesPulled); - Q_ASSERT(bytesWritten == audioBytesPulled); //unfinished write should not happen since the data provided is less than writableSize - Q_UNUSED(bytesWritten); - - if (chunks > 1) { - // PulseAudio needs more data. Ask for it immediately. - QMetaObject::invokeMethod(this, "userFeed", Qt::QueuedConnection); - } - } else if (audioBytesPulled == 0) { - m_tickTimer.stop(); - qCDebug(qLcPulseAudioOut) << "No more data available, source is done:" << m_audioSource->atEnd(); - setError(m_audioSource->atEnd() ? QAudio::NoError : QAudio::UnderrunError); - setState(QAudio::IdleState); + Q_ASSERT(!m_audioBuffer.empty()); + int audioBytesPulled = m_audioSource->read(m_audioBuffer.data(), inputSize); + Q_ASSERT(audioBytesPulled <= inputSize); + + if (audioBytesPulled > 0) { + if (audioBytesPulled > inputSize) { + qCWarning(qLcPulseAudioOut) + << "Invalid audio data size provided by pull source:" << audioBytesPulled + << "should be less than" << inputSize; + audioBytesPulled = inputSize; } + auto bytesWritten = write(m_audioBuffer.data(), audioBytesPulled); + if (bytesWritten != audioBytesPulled) + qWarning() << "Unfinished write:" << bytesWritten << "vs" << audioBytesPulled; + + m_stateMachine.activateFromIdle(); + + if (inputSize < writableSize) // PulseAudio needs more data. + QMetaObject::invokeMethod(this, &QPulseAudioSink::userFeed, Qt::QueuedConnection); + } else if (audioBytesPulled == 0) { + stopTimer(); + const auto atEnd = m_audioSource->atEnd(); + qCDebug(qLcPulseAudioOut) << "No more data available, source is done:" << atEnd; } - - if (m_deviceState != QAudio::ActiveState) - return; } qint64 QPulseAudioSink::write(const char *data, qint64 len) { + using namespace QPulseAudioInternal; + QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); pulseEngine->lock(); @@ -524,9 +477,10 @@ qint64 QPulseAudioSink::write(const char *data, qint64 len) void *dest = nullptr; if (pa_stream_begin_write(m_stream, &dest, &nbytes) < 0) { - qCWarning(qLcPulseAudioOut) << "pa_stream_begin_write error:" - << pa_strerror(pa_context_errno(pulseEngine->context())); - setError(QAudio::IOError); + pulseEngine->unlock(); + qCWarning(qLcPulseAudioOut) + << "pa_stream_begin_write error:" << currentError(pulseEngine->context()); + m_stateMachine.updateActiveOrIdle(false, QAudio::IOError); return 0; } @@ -543,65 +497,76 @@ qint64 QPulseAudioSink::write(const char *data, qint64 len) data = reinterpret_cast<char *>(dest); if ((pa_stream_write(m_stream, data, len, nullptr, 0, PA_SEEK_RELATIVE)) < 0) { - qCWarning(qLcPulseAudioOut) << "pa_stream_write error:" - << pa_strerror(pa_context_errno(pulseEngine->context())); - setError(QAudio::IOError); + pulseEngine->unlock(); + qCWarning(qLcPulseAudioOut) + << "pa_stream_write error:" << currentError(pulseEngine->context()); + m_stateMachine.updateActiveOrIdle(false, QAudio::IOError); return 0; } pulseEngine->unlock(); m_totalTimeValue += len; - setError(QAudio::NoError); - setState(QAudio::ActiveState); - + m_stateMachine.updateActiveOrIdle(true); return len; } void QPulseAudioSink::stop() { - if (m_deviceState == QAudio::StoppedState) - return; + if (auto notifier = m_stateMachine.stop()) { + { + QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); + std::lock_guard lock(*pulseEngine); - close(); + if (auto prevOp = exchangeDrainOperation(nullptr)) + // cancel the draining callback that is not relevant already + pa_operation_cancel(prevOp.get()); - setError(QAudio::NoError); - setState(QAudio::StoppedState); + PAOperationUPtr drainOp(pa_stream_drain(m_stream, outputStreamDrainComplete, nullptr)); + pulseEngine->wait(drainOp.get()); + } + + close(); + } } qsizetype QPulseAudioSink::bytesFree() const { - if (m_deviceState != QAudio::ActiveState && m_deviceState != QAudio::IdleState) + if (!m_stateMachine.isActiveOrIdle()) return 0; - QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); - pulseEngine->lock(); - int writableSize = pa_stream_writable_size(m_stream); - pulseEngine->unlock(); - return writableSize; + std::lock_guard lock(*QPulseAudioEngine::instance()); + return pa_stream_writable_size(m_stream); } void QPulseAudioSink::setBufferSize(qsizetype value) { - m_bufferSize = value; + m_userBufferSize = value; } qsizetype QPulseAudioSink::bufferSize() const { - return m_bufferSize; + if (m_bufferSize) + return m_bufferSize; + + if (m_userBufferSize) + return *m_userBufferSize; + + return defaultBufferSize(); } static qint64 operator-(timeval t1, timeval t2) { constexpr qint64 secsToUSecs = 1000000; - return (t1.tv_sec - t2.tv_sec)*secsToUSecs + (t1.tv_usec - t2.tv_usec); + return (t1.tv_sec - t2.tv_sec) * secsToUSecs + (t1.tv_usec - t2.tv_usec); } qint64 QPulseAudioSink::processedUSecs() const { - if (!m_stream || m_deviceState == QAudio::StoppedState) + const auto state = this->state(); + if (!m_stream || state == QAudio::StoppedState) return 0; - if (m_deviceState == QAudio::SuspendedState) + if (state == QAudio::SuspendedState) return lastProcessedUSecs; auto info = pa_stream_get_timing_info(m_stream); @@ -612,13 +577,16 @@ qint64 QPulseAudioSink::processedUSecs() const if (info->timestamp - lastTimingInfo > 0) { lastTimingInfo.tv_sec = info->timestamp.tv_sec; lastTimingInfo.tv_usec = info->timestamp.tv_usec; - averageLatency = 0; // also use that as long as we don't have valid data from the timing info + averageLatency = + 0; // also use that as long as we don't have valid data from the timing info // Only use timing values when playing, otherwise the latency numbers can be way off - if (info->since_underrun >= 0 && pa_bytes_to_usec(info->since_underrun, &m_spec) > info->sink_usec) { + if (info->since_underrun >= 0 + && pa_bytes_to_usec(info->since_underrun, &m_spec) > info->sink_usec) { latencyList.append(info->sink_usec); // Average over the last X timing infos to keep numbers more stable. - // 10 seems to be a decent number that keeps values relatively stable but doesn't make the list too big + // 10 seems to be a decent number that keeps values relatively stable but doesn't make + // the list too big const int latencyListMaxSize = 10; if (latencyList.size() > latencyListMaxSize) latencyList.pop_front(); @@ -631,7 +599,8 @@ qint64 QPulseAudioSink::processedUSecs() const } const qint64 usecsRead = info->read_index < 0 ? 0 : pa_bytes_to_usec(info->read_index, &m_spec); - const qint64 usecsWritten = info->write_index < 0 ? 0 : pa_bytes_to_usec(info->write_index, &m_spec); + const qint64 usecsWritten = + info->write_index < 0 ? 0 : pa_bytes_to_usec(info->write_index, &m_spec); // processed data is the amount read by the server minus its latency qint64 usecs = usecsRead - averageLatency; @@ -659,27 +628,22 @@ qint64 QPulseAudioSink::processedUSecs() const void QPulseAudioSink::resume() { - if (m_deviceState == QAudio::SuspendedState) { - m_resuming = true; - - QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); - - pulseEngine->lock(); - - pa_operation *operation = pa_stream_cork(m_stream, 0, outputStreamSuccessCallback, nullptr); - pulseEngine->wait(operation); - pa_operation_unref(operation); + if (auto notifier = m_stateMachine.resume()) { + { + QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); - operation = pa_stream_trigger(m_stream, outputStreamSuccessCallback, nullptr); - pulseEngine->wait(operation); - pa_operation_unref(operation); + std::lock_guard lock(*pulseEngine); - pulseEngine->unlock(); + PAOperationUPtr operation( + pa_stream_cork(m_stream, 0, outputStreamSuccessCallback, nullptr)); + pulseEngine->wait(operation.get()); - m_tickTimer.start(m_periodTime, this); + operation.reset(pa_stream_trigger(m_stream, outputStreamSuccessCallback, nullptr)); + pulseEngine->wait(operation.get()); + } - setState(m_pullMode ? QAudio::ActiveState : QAudio::IdleState); - setError(QAudio::NoError); + if (m_pullMode) + startPulling(); } } @@ -695,33 +659,28 @@ QAudioFormat QPulseAudioSink::format() const void QPulseAudioSink::suspend() { - if (m_deviceState == QAudio::ActiveState || m_deviceState == QAudio::IdleState) { - setError(QAudio::NoError); - setState(QAudio::SuspendedState); - - m_tickTimer.stop(); + if (auto notifier = m_stateMachine.suspend()) { + stopTimer(); QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); - pa_operation *operation; - - pulseEngine->lock(); - operation = pa_stream_cork(m_stream, 1, outputStreamSuccessCallback, nullptr); - pulseEngine->wait(operation); - pa_operation_unref(operation); + std::lock_guard lock(*pulseEngine); - pulseEngine->unlock(); + PAOperationUPtr operation( + pa_stream_cork(m_stream, 1, outputStreamSuccessCallback, nullptr)); + pulseEngine->wait(operation.get()); } } void QPulseAudioSink::reset() { - stop(); + if (auto notifier = m_stateMachine.stopOrUpdateError()) + close(); } PulseOutputPrivate::PulseOutputPrivate(QPulseAudioSink *audio) { - m_audioDevice = qobject_cast<QPulseAudioSink*>(audio); + m_audioDevice = qobject_cast<QPulseAudioSink *>(audio); } qint64 PulseOutputPrivate::readData(char *data, qint64 len) @@ -736,13 +695,13 @@ qint64 PulseOutputPrivate::writeData(const char *data, qint64 len) { qint64 written = 0; - if ((m_audioDevice->m_deviceState == QAudio::ActiveState - || m_audioDevice->m_deviceState == QAudio::IdleState)) { - while(written < len) { - int chunk = m_audioDevice->write(data+written, (len-written)); + const auto state = m_audioDevice->state(); + if (state == QAudio::ActiveState || state == QAudio::IdleState) { + while (written < len) { + int chunk = m_audioDevice->write(data + written, (len - written)); if (chunk <= 0) return written; - written+=chunk; + written += chunk; } } @@ -764,10 +723,25 @@ qreal QPulseAudioSink::volume() const void QPulseAudioSink::onPulseContextFailed() { - close(); + if (auto notifier = m_stateMachine.stop(QAudio::FatalError)) + close(); +} - setError(QAudio::FatalError); - setState(QAudio::StoppedState); +PAOperationUPtr QPulseAudioSink::exchangeDrainOperation(pa_operation *newOperation) +{ + return PAOperationUPtr(m_drainOperation.exchange(newOperation)); +} + +qsizetype QPulseAudioSink::defaultBufferSize() const +{ + if (m_spec.rate > 0) + return pa_usec_to_bytes(DefaultBufferLengthMs * 1000, &m_spec); + + auto spec = QPulseAudioInternal::audioFormatToSampleSpec(m_format); + if (pa_sample_spec_valid(&spec)) + return pa_usec_to_bytes(DefaultBufferLengthMs * 1000, &spec); + + return 0; } QT_END_NAMESPACE diff --git a/src/multimedia/pulseaudio/qpulseaudiosink_p.h b/src/multimedia/pulseaudio/qpulseaudiosink_p.h index 1a7b6d212..cf0b181ec 100644 --- a/src/multimedia/pulseaudio/qpulseaudiosink_p.h +++ b/src/multimedia/pulseaudio/qpulseaudiosink_p.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 QAUDIOOUTPUTPULSE_H #define QAUDIOOUTPUTPULSE_H @@ -60,8 +24,10 @@ #include "qaudio.h" #include "qaudiodevice.h" -#include <private/qaudiosystem_p.h> +#include "pulseaudio/qpulsehelpers_p.h" +#include <private/qaudiosystem_p.h> +#include <private/qaudiostatemachine_p.h> #include <pulse/pulseaudio.h> QT_BEGIN_NAMESPACE @@ -72,7 +38,7 @@ class QPulseAudioSink : public QPlatformAudioSink Q_OBJECT public: - QPulseAudioSink(const QByteArray &device); + QPulseAudioSink(const QByteArray &device, QObject *parent); ~QPulseAudioSink(); void start(QIODevice *device) override; @@ -100,9 +66,8 @@ protected: void timerEvent(QTimerEvent *event) override; private: - void setState(QAudio::State state); - void setError(QAudio::Error error); - void startReading(); + void startPulling(); + void stopTimer(); bool open(); void close(); @@ -112,7 +77,11 @@ private Q_SLOTS: void userFeed(); void onPulseContextFailed(); + PAOperationUPtr exchangeDrainOperation(pa_operation *newOperation); + private: + qsizetype defaultBufferSize() const; + pa_sample_spec m_spec = {}; // calculate timing manually, as pulseaudio doesn't give us good enough data mutable timeval lastTimingInfo = {}; @@ -126,7 +95,7 @@ private: QIODevice *m_audioSource = nullptr; pa_stream *m_stream = nullptr; - char *m_audioBuffer = nullptr; + std::vector<char> m_audioBuffer; qint64 m_totalTimeValue = 0; qint64 m_elapsedTimeOffset = 0; @@ -134,15 +103,15 @@ private: mutable qint64 lastProcessedUSecs = 0; qreal m_volume = 1.0; - QAudio::Error m_errorState = QAudio::NoError; - QAudio::State m_deviceState = QAudio::StoppedState; - int m_periodSize = 0; - int m_bufferSize = 0; - int m_maxBufferSize = 0; - int m_periodTime = 0; + std::atomic<pa_operation *> m_drainOperation = nullptr; + qsizetype m_bufferSize = 0; + std::optional<qsizetype> m_userBufferSize = std::nullopt; + int m_pullingPeriodSize = 0; + int m_pullingPeriodTime = 0; bool m_pullMode = true; bool m_opened = false; - bool m_resuming = false; + + QAudioStateMachine m_stateMachine; }; class PulseOutputPrivate : public QIODevice diff --git a/src/multimedia/pulseaudio/qpulseaudiosource.cpp b/src/multimedia/pulseaudio/qpulseaudiosource.cpp index 4db294b55..488daa48b 100644 --- a/src/multimedia/pulseaudio/qpulseaudiosource.cpp +++ b/src/multimedia/pulseaudio/qpulseaudiosource.cpp @@ -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 #include <QtCore/qcoreapplication.h> #include <QtCore/qdebug.h> @@ -48,10 +12,11 @@ #include "qpulsehelpers_p.h" #include <sys/types.h> #include <unistd.h> +#include <mutex> // for lock_guard QT_BEGIN_NAMESPACE -const int PeriodTimeMs = 50; +const int SourcePeriodTimeMs = 50; static void inputStreamReadCallback(pa_stream *stream, size_t length, void *userdata) { @@ -64,37 +29,38 @@ static void inputStreamReadCallback(pa_stream *stream, size_t length, void *user static void inputStreamStateCallback(pa_stream *stream, void *userdata) { + using namespace QPulseAudioInternal; + Q_UNUSED(userdata); pa_stream_state_t state = pa_stream_get_state(stream); -#ifdef DEBUG_PULSE - qDebug() << "Stream state: " << QPulseAudioInternal::stateToQString(state); -#endif + qCDebug(qLcPulseAudioIn) << "Stream state: " << state; switch (state) { - case PA_STREAM_CREATING: + case PA_STREAM_CREATING: break; - case PA_STREAM_READY: { -#ifdef DEBUG_PULSE - QPulseAudioSource *audioInput = static_cast<QPulseAudioSource*>(userdata); + case PA_STREAM_READY: + if (Q_UNLIKELY(qLcPulseAudioIn().isEnabled(QtDebugMsg))) { + QPulseAudioSource *audioInput = static_cast<QPulseAudioSource *>(userdata); const pa_buffer_attr *buffer_attr = pa_stream_get_buffer_attr(stream); - qDebug() << "*** maxlength: " << buffer_attr->maxlength; - qDebug() << "*** prebuf: " << buffer_attr->prebuf; - qDebug() << "*** fragsize: " << buffer_attr->fragsize; - qDebug() << "*** minreq: " << buffer_attr->minreq; - qDebug() << "*** tlength: " << buffer_attr->tlength; - - pa_sample_spec spec = QPulseAudioInternal::audioFormatToSampleSpec(audioInput->format()); - qDebug() << "*** bytes_to_usec: " << pa_bytes_to_usec(buffer_attr->fragsize, &spec); -#endif - } - break; - case PA_STREAM_TERMINATED: - break; - case PA_STREAM_FAILED: - default: - qWarning() << QString::fromLatin1("Stream error: %1").arg(QString::fromUtf8(pa_strerror(pa_context_errno(pa_stream_get_context(stream))))); - QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); - pa_threaded_mainloop_signal(pulseEngine->mainloop(), 0); - break; + qCDebug(qLcPulseAudioIn) << "*** maxlength: " << buffer_attr->maxlength; + qCDebug(qLcPulseAudioIn) << "*** prebuf: " << buffer_attr->prebuf; + qCDebug(qLcPulseAudioIn) << "*** fragsize: " << buffer_attr->fragsize; + qCDebug(qLcPulseAudioIn) << "*** minreq: " << buffer_attr->minreq; + qCDebug(qLcPulseAudioIn) << "*** tlength: " << buffer_attr->tlength; + + pa_sample_spec spec = + QPulseAudioInternal::audioFormatToSampleSpec(audioInput->format()); + qCDebug(qLcPulseAudioIn) + << "*** bytes_to_usec: " << pa_bytes_to_usec(buffer_attr->fragsize, &spec); + } + break; + case PA_STREAM_TERMINATED: + break; + case PA_STREAM_FAILED: + default: + qWarning() << "Stream error: " << currentError(stream); + QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); + pa_threaded_mainloop_signal(pulseEngine->mainloop(), 0); + break; } } @@ -118,71 +84,49 @@ static void inputStreamSuccessCallback(pa_stream *stream, int success, void *use Q_UNUSED(userdata); Q_UNUSED(success); - //if (!success) - //TODO: Is cork success? i->operation_success = success; + // if (!success) + // TODO: Is cork success? i->operation_success = success; QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); pa_threaded_mainloop_signal(pulseEngine->mainloop(), 0); } -QPulseAudioSource::QPulseAudioSource(const QByteArray &device) - : m_totalTimeValue(0) - , m_audioSource(nullptr) - , m_errorState(QAudio::NoError) - , m_deviceState(QAudio::StoppedState) - , m_volume(qreal(1.0f)) - , m_pullMode(true) - , m_opened(false) - , m_bytesAvailable(0) - , m_bufferSize(0) - , m_periodSize(0) - , m_periodTime(PeriodTimeMs) - , m_stream(nullptr) - , m_device(device) +QPulseAudioSource::QPulseAudioSource(const QByteArray &device, QObject *parent) + : QPlatformAudioSource(parent), + m_totalTimeValue(0), + m_audioSource(nullptr), + m_volume(qreal(1.0f)), + m_pullMode(true), + m_opened(false), + m_bufferSize(0), + m_periodSize(0), + m_periodTime(SourcePeriodTimeMs), + m_stream(nullptr), + m_device(device), + m_stateMachine(*this) { - m_timer = new QTimer(this); - connect(m_timer, SIGNAL(timeout()), SLOT(userFeed())); } QPulseAudioSource::~QPulseAudioSource() { - close(); - disconnect(m_timer, SIGNAL(timeout())); - QCoreApplication::processEvents(); - delete m_timer; -} - -void QPulseAudioSource::setError(QAudio::Error error) -{ - if (m_errorState == error) - return; - - m_errorState = error; - emit errorChanged(error); + // TODO: Investigate draining the stream + if (auto notifier = m_stateMachine.stop()) + close(); } QAudio::Error QPulseAudioSource::error() const { - return m_errorState; -} - -void QPulseAudioSource::setState(QAudio::State state) -{ - if (m_deviceState == state) - return; - - m_deviceState = state; - emit stateChanged(state); + return m_stateMachine.error(); } QAudio::State QPulseAudioSource::state() const { - return m_deviceState; + return m_stateMachine.state(); } void QPulseAudioSource::setFormat(const QAudioFormat &format) { - if (m_deviceState == QAudio::StoppedState) + if (!m_stateMachine.isActiveOrIdle()) m_format = format; } @@ -193,15 +137,7 @@ QAudioFormat QPulseAudioSource::format() const void QPulseAudioSource::start(QIODevice *device) { - setState(QAudio::StoppedState); - setError(QAudio::NoError); - - if (!m_pullMode && m_audioSource) { - delete m_audioSource; - m_audioSource = nullptr; - } - - close(); + reset(); if (!open()) return; @@ -209,20 +145,12 @@ void QPulseAudioSource::start(QIODevice *device) m_pullMode = true; m_audioSource = device; - setState(QAudio::ActiveState); + m_stateMachine.start(); } QIODevice *QPulseAudioSource::start() { - setState(QAudio::StoppedState); - setError(QAudio::NoError); - - if (!m_pullMode && m_audioSource) { - delete m_audioSource; - m_audioSource = nullptr; - } - - close(); + reset(); if (!open()) return nullptr; @@ -231,20 +159,15 @@ QIODevice *QPulseAudioSource::start() m_audioSource = new PulseInputPrivate(this); m_audioSource->open(QIODevice::ReadOnly | QIODevice::Unbuffered); - setState(QAudio::IdleState); + m_stateMachine.start(false); return m_audioSource; } void QPulseAudioSource::stop() { - if (m_deviceState == QAudio::StoppedState) - return; - - close(); - - setError(QAudio::NoError); - setState(QAudio::StoppedState); + if (auto notifier = m_stateMachine.stop()) + close(); } bool QPulseAudioSource::open() @@ -254,9 +177,9 @@ bool QPulseAudioSource::open() QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); - if (!pulseEngine->context() || pa_context_get_state(pulseEngine->context()) != PA_CONTEXT_READY) { - setError(QAudio::FatalError); - setState(QAudio::StoppedState); + if (!pulseEngine->context() + || pa_context_get_state(pulseEngine->context()) != PA_CONTEXT_READY) { + m_stateMachine.stopOrUpdateError(QAudio::FatalError); return false; } @@ -265,27 +188,27 @@ bool QPulseAudioSource::open() Q_ASSERT(spec.channels == channel_map.channels); if (!pa_sample_spec_valid(&spec)) { - setError(QAudio::OpenError); - setState(QAudio::StoppedState); + m_stateMachine.stopOrUpdateError(QAudio::OpenError); return false; } m_spec = spec; -#ifdef DEBUG_PULSE -// QTime now(QTime::currentTime()); -// qDebug()<<now.second()<<"s "<<now.msec()<<"ms :open()"; -#endif + //if (Q_UNLIKELY(qLcPulseAudioIn().isEnabled(QtDebugMsg)) { + // QTime now(QTime::currentTime()); + // qCDebug(qLcPulseAudioIn) << now.second() << "s " << now.msec() << "ms :open()"; + //} if (m_streamName.isNull()) - m_streamName = QString(QLatin1String("QtmPulseStream-%1-%2")).arg(::getpid()).arg(quintptr(this)).toUtf8(); - -#ifdef DEBUG_PULSE - qDebug() << "Format: " << QPulseAudioInternal::sampleFormatToQString(spec.format); - qDebug() << "Rate: " << spec.rate; - qDebug() << "Channels: " << spec.channels; - qDebug() << "Frame size: " << pa_frame_size(&spec); -#endif + m_streamName = + QStringLiteral("QtmPulseStream-%1-%2").arg(::getpid()).arg(quintptr(this)).toUtf8(); + + if (Q_UNLIKELY(qLcPulseAudioIn().isEnabled(QtDebugMsg))) { + qCDebug(qLcPulseAudioIn) << "Format: " << spec.format; + qCDebug(qLcPulseAudioIn) << "Rate: " << spec.rate; + qCDebug(qLcPulseAudioIn) << "Channels: " << spec.channels; + qCDebug(qLcPulseAudioIn) << "Frame size: " << pa_frame_size(&spec); + } pulseEngine->lock(); @@ -297,37 +220,41 @@ bool QPulseAudioSource::open() pa_stream_set_underflow_callback(m_stream, inputStreamUnderflowCallback, this); pa_stream_set_overflow_callback(m_stream, inputStreamOverflowCallback, this); - m_periodSize = pa_usec_to_bytes(PeriodTimeMs*1000, &spec); + m_periodSize = pa_usec_to_bytes(SourcePeriodTimeMs * 1000, &spec); int flags = 0; pa_buffer_attr buffer_attr; - buffer_attr.maxlength = (uint32_t) -1; - buffer_attr.prebuf = (uint32_t) -1; - buffer_attr.tlength = (uint32_t) -1; - buffer_attr.minreq = (uint32_t) -1; + buffer_attr.maxlength = static_cast<uint32_t>(-1); + buffer_attr.prebuf = static_cast<uint32_t>(-1); + buffer_attr.tlength = static_cast<uint32_t>(-1); + buffer_attr.minreq = static_cast<uint32_t>(-1); flags |= PA_STREAM_ADJUST_LATENCY; if (m_bufferSize > 0) - buffer_attr.fragsize = (uint32_t) m_bufferSize; + buffer_attr.fragsize = static_cast<uint32_t>(m_bufferSize); else - buffer_attr.fragsize = (uint32_t) m_periodSize; + buffer_attr.fragsize = static_cast<uint32_t>(m_periodSize); + + flags |= PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_INTERPOLATE_TIMING; - flags |= PA_STREAM_AUTO_TIMING_UPDATE|PA_STREAM_INTERPOLATE_TIMING; - if (pa_stream_connect_record(m_stream, m_device.data(), &buffer_attr, (pa_stream_flags_t)flags) < 0) { + int connectionResult = pa_stream_connect_record(m_stream, m_device.data(), &buffer_attr, + static_cast<pa_stream_flags_t>(flags)); + if (connectionResult < 0) { qWarning() << "pa_stream_connect_record() failed!"; pa_stream_unref(m_stream); m_stream = nullptr; pulseEngine->unlock(); - setError(QAudio::OpenError); - setState(QAudio::StoppedState); + m_stateMachine.stopOrUpdateError(QAudio::OpenError); return false; } -// auto *ss = pa_stream_get_sample_spec(m_stream); -// qDebug() << "connected stream:"; -// qDebug() << " channels" << ss->channels << spec.channels; -// qDebug() << " format" << ss->format << spec.format; -// qDebug() << " rate" << ss->rate << spec.rate; + //if (Q_UNLIKELY(qLcPulseAudioIn().isEnabled(QtDebugMsg))) { + // auto *ss = pa_stream_get_sample_spec(m_stream); + // qCDebug(qLcPulseAudioIn) << "connected stream:"; + // qCDebug(qLcPulseAudioIn) << " channels" << ss->channels << spec.channels; + // qCDebug(qLcPulseAudioIn) << " format" << ss->format << spec.format; + // qCDebug(qLcPulseAudioIn) << " rate" << ss->rate << spec.rate; + //} while (pa_stream_get_state(m_stream) != PA_STREAM_READY) pa_threaded_mainloop_wait(pulseEngine->mainloop()); @@ -335,15 +262,16 @@ bool QPulseAudioSource::open() const pa_buffer_attr *actualBufferAttr = pa_stream_get_buffer_attr(m_stream); m_periodSize = actualBufferAttr->fragsize; m_periodTime = pa_bytes_to_usec(m_periodSize, &spec) / 1000; - if (actualBufferAttr->tlength != (uint32_t)-1) + if (actualBufferAttr->tlength != static_cast<uint32_t>(-1)) m_bufferSize = actualBufferAttr->tlength; pulseEngine->unlock(); - connect(pulseEngine, &QPulseAudioEngine::contextFailed, this, &QPulseAudioSource::onPulseContextFailed); + connect(pulseEngine, &QPulseAudioEngine::contextFailed, this, + &QPulseAudioSource::onPulseContextFailed); m_opened = true; - m_timer->start(m_periodTime); + m_timer.start(m_periodTime, this); m_elapsedTimeOffset = 0; m_totalTimeValue = 0; @@ -356,12 +284,12 @@ void QPulseAudioSource::close() if (!m_opened) return; - m_timer->stop(); + m_timer.stop(); QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); if (m_stream) { - pulseEngine->lock(); + std::lock_guard lock(*pulseEngine); pa_stream_set_state_callback(m_stream, nullptr, nullptr); pa_stream_set_read_callback(m_stream, nullptr, nullptr); @@ -371,11 +299,10 @@ void QPulseAudioSource::close() pa_stream_disconnect(m_stream); pa_stream_unref(m_stream); m_stream = nullptr; - - pulseEngine->unlock(); } - disconnect(pulseEngine, &QPulseAudioEngine::contextFailed, this, &QPulseAudioSource::onPulseContextFailed); + disconnect(pulseEngine, &QPulseAudioEngine::contextFailed, this, + &QPulseAudioSource::onPulseContextFailed); if (!m_pullMode && m_audioSource) { delete m_audioSource; @@ -384,32 +311,31 @@ void QPulseAudioSource::close() m_opened = false; } -int QPulseAudioSource::checkBytesReady() +qsizetype QPulseAudioSource::bytesReady() const { - if (m_deviceState != QAudio::ActiveState && m_deviceState != QAudio::IdleState) { - m_bytesAvailable = 0; - } else { - m_bytesAvailable = pa_stream_readable_size(m_stream); - } + using namespace QPulseAudioInternal; - return m_bytesAvailable; -} + if (!m_stateMachine.isActiveOrIdle()) + return 0; -qsizetype QPulseAudioSource::bytesReady() const -{ - return qMax(m_bytesAvailable, 0); + std::lock_guard lock(*QPulseAudioEngine::instance()); + + int bytes = pa_stream_readable_size(m_stream); + if (bytes < 0) { + qWarning() << "pa_stream_readable_size() failed:" << currentError(m_stream); + return 0; + } + + return static_cast<qsizetype>(bytes); } qint64 QPulseAudioSource::read(char *data, qint64 len) { - Q_ASSERT(data != nullptr || len == 0); + using namespace QPulseAudioInternal; - m_bytesAvailable = checkBytesReady(); - - setError(QAudio::NoError); - if (state() == QAudio::IdleState) - setState(QAudio::ActiveState); + Q_ASSERT(data != nullptr || len == 0); + m_stateMachine.updateActiveOrIdle(true, QAudio::NoError); int readBytes = 0; if (!m_pullMode && !m_tempBuffer.isEmpty()) { @@ -429,21 +355,22 @@ qint64 QPulseAudioSource::read(char *data, qint64 len) while (pa_stream_readable_size(m_stream) > 0) { size_t readLength = 0; -#ifdef DEBUG_PULSE - qDebug() << "QPulseAudioSource::read -- " << pa_stream_readable_size(m_stream) << " bytes available from pulse audio"; -#endif + if (Q_UNLIKELY(qLcPulseAudioIn().isEnabled(QtDebugMsg))) { + auto readableSize = pa_stream_readable_size(m_stream); + qCDebug(qLcPulseAudioIn) << "QPulseAudioSource::read -- " << readableSize + << " bytes available from pulse audio"; + } QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); pulseEngine->lock(); const void *audioBuffer; - // Second and third parameters (audioBuffer and length) to pa_stream_peek are output parameters, - // the audioBuffer pointer is set to point to the actual pulse audio data, - // and the length is set to the length of this data. + // Second and third parameters (audioBuffer and length) to pa_stream_peek are output + // parameters, the audioBuffer pointer is set to point to the actual pulse audio data, and + // the length is set to the length of this data. if (pa_stream_peek(m_stream, &audioBuffer, &readLength) < 0) { - qWarning() << QString::fromLatin1("pa_stream_peek() failed: %1") - .arg(QString::fromUtf8(pa_strerror(pa_context_errno(pa_stream_get_context(m_stream))))); + qWarning() << "pa_stream_peek() failed:" << currentError(m_stream); pulseEngine->unlock(); return 0; } @@ -456,10 +383,7 @@ qint64 QPulseAudioSource::read(char *data, qint64 len) if (actualLength < qint64(readLength)) { pulseEngine->unlock(); - - setError(QAudio::UnderrunError); - setState(QAudio::IdleState); - + m_stateMachine.updateActiveOrIdle(false, QAudio::UnderrunError); return actualLength; } } else { @@ -467,18 +391,19 @@ qint64 QPulseAudioSource::read(char *data, qint64 len) applyVolume(audioBuffer, data + readBytes, actualLength); } -#ifdef DEBUG_PULSE - qDebug() << "QPulseAudioSource::read -- wrote " << actualLength << " to client"; -#endif + qCDebug(qLcPulseAudioIn) << "QPulseAudioSource::read -- wrote " << actualLength + << " to client"; if (actualLength < qint64(readLength)) { -#ifdef DEBUG_PULSE - qDebug() << "QPulseAudioSource::read -- appending " << readLength - actualLength << " bytes of data to temp buffer"; -#endif int diff = readLength - actualLength; int oldSize = m_tempBuffer.size(); + + qCDebug(qLcPulseAudioIn) << "QPulseAudioSource::read -- appending " << diff + << " bytes of data to temp buffer"; + m_tempBuffer.resize(m_tempBuffer.size() + diff); - applyVolume(static_cast<const char *>(audioBuffer) + actualLength, m_tempBuffer.data() + oldSize, diff); + applyVolume(static_cast<const char *>(audioBuffer) + actualLength, + m_tempBuffer.data() + oldSize, diff); QMetaObject::invokeMethod(this, "userFeed", Qt::QueuedConnection); } @@ -492,9 +417,8 @@ qint64 QPulseAudioSource::read(char *data, qint64 len) break; } -#ifdef DEBUG_PULSE - qDebug() << "QPulseAudioSource::read -- returning after reading " << readBytes << " bytes"; -#endif + qCDebug(qLcPulseAudioIn) << "QPulseAudioSource::read -- returning after reading " << readBytes + << " bytes"; return readBytes; } @@ -510,22 +434,18 @@ void QPulseAudioSource::applyVolume(const void *src, void *dest, int len) void QPulseAudioSource::resume() { - if (m_deviceState == QAudio::SuspendedState || m_deviceState == QAudio::IdleState) { - QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); - pa_operation *operation; - - pulseEngine->lock(); - - operation = pa_stream_cork(m_stream, 0, inputStreamSuccessCallback, nullptr); - pulseEngine->wait(operation); - pa_operation_unref(operation); + if (auto notifier = m_stateMachine.resume()) { + { + QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); - pulseEngine->unlock(); + std::lock_guard lock(*pulseEngine); - m_timer->start(m_periodTime); + PAOperationUPtr operation( + pa_stream_cork(m_stream, 0, inputStreamSuccessCallback, nullptr)); + pulseEngine->wait(operation.get()); + } - setState(QAudio::ActiveState); - setError(QAudio::NoError); + m_timer.start(m_periodTime, this); } } @@ -559,81 +479,69 @@ qint64 QPulseAudioSource::processedUSecs() const pa_usec_t usecs = 0; int result = pa_stream_get_time(m_stream, &usecs); Q_UNUSED(result); -// if (result != 0) -// qWarning() << "no timing info from pulse"; + //if (result != 0) + // qWarning() << "no timing info from pulse"; return usecs; } void QPulseAudioSource::suspend() { - if (m_deviceState == QAudio::ActiveState) { - setError(QAudio::NoError); - setState(QAudio::SuspendedState); - - m_timer->stop(); + if (auto notifier = m_stateMachine.suspend()) { + m_timer.stop(); QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); - pa_operation *operation; - pulseEngine->lock(); + std::lock_guard lock(*pulseEngine); - operation = pa_stream_cork(m_stream, 1, inputStreamSuccessCallback, nullptr); - pulseEngine->wait(operation); - pa_operation_unref(operation); - - pulseEngine->unlock(); + PAOperationUPtr operation(pa_stream_cork(m_stream, 1, inputStreamSuccessCallback, nullptr)); + pulseEngine->wait(operation.get()); } } -void QPulseAudioSource::userFeed() +void QPulseAudioSource::timerEvent(QTimerEvent *event) { - if (m_deviceState == QAudio::StoppedState || m_deviceState == QAudio::SuspendedState) - return; -#ifdef DEBUG_PULSE -// QTime now(QTime::currentTime()); -// qDebug()<< now.second() << "s " << now.msec() << "ms :userFeed() IN"; -#endif - deviceReady(); + if (event->timerId() == m_timer.timerId()) + userFeed(); + + QPlatformAudioSource::timerEvent(event); } -bool QPulseAudioSource::deviceReady() +void QPulseAudioSource::userFeed() { - if (m_pullMode) { + if (!m_stateMachine.isActiveOrIdle()) + return; + + //if (Q_UNLIKELY(qLcPulseAudioIn().isEnabled(QtDebugMsg)) { + // QTime now(QTime::currentTime()); + // qCDebug(qLcPulseAudioIn) << now.second() << "s " << now.msec() << "ms :userFeed() IN"; + //} + + if (m_pullMode) { // reads some audio data and writes it to QIODevice read(nullptr,0); - } else { + } else if (m_audioSource != nullptr) { // emits readyRead() so user will call read() on QIODevice to get some audio data - if (m_audioSource != nullptr) { - PulseInputPrivate *a = qobject_cast<PulseInputPrivate*>(m_audioSource); - a->trigger(); - } + PulseInputPrivate *a = qobject_cast<PulseInputPrivate*>(m_audioSource); + a->trigger(); } - m_bytesAvailable = checkBytesReady(); - - if (m_deviceState != QAudio::ActiveState) - return true; - - return true; } void QPulseAudioSource::reset() { - stop(); - m_bytesAvailable = 0; + if (auto notifier = m_stateMachine.stopOrUpdateError()) + close(); } void QPulseAudioSource::onPulseContextFailed() { - close(); - - setError(QAudio::FatalError); - setState(QAudio::StoppedState); + if (auto notifier = m_stateMachine.stopOrUpdateError(QAudio::FatalError)) + close(); } PulseInputPrivate::PulseInputPrivate(QPulseAudioSource *audio) { - m_audioDevice = qobject_cast<QPulseAudioSource*>(audio); + m_audioDevice = qobject_cast<QPulseAudioSource *>(audio); } qint64 PulseInputPrivate::readData(char *data, qint64 len) diff --git a/src/multimedia/pulseaudio/qpulseaudiosource_p.h b/src/multimedia/pulseaudio/qpulseaudiosource_p.h index 7a9f047dd..d652f81a0 100644 --- a/src/multimedia/pulseaudio/qpulseaudiosource_p.h +++ b/src/multimedia/pulseaudio/qpulseaudiosource_p.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 // // W A R N I N G @@ -61,6 +25,7 @@ #include "qaudio.h" #include "qaudiodevice.h" #include <private/qaudiosystem_p.h> +#include <private/qaudiostatemachine_p.h> #include <pulse/pulseaudio.h> @@ -73,7 +38,7 @@ class QPulseAudioSource : public QPlatformAudioSource Q_OBJECT public: - QPulseAudioSource(const QByteArray &device); + QPulseAudioSource(const QByteArray &device, QObject *parent); ~QPulseAudioSource(); qint64 read(char *data, qint64 len); @@ -99,38 +64,35 @@ public: qint64 m_totalTimeValue; QIODevice *m_audioSource; QAudioFormat m_format; - QAudio::Error m_errorState; - QAudio::State m_deviceState; qreal m_volume; +protected: + void timerEvent(QTimerEvent *event) override; + private slots: void userFeed(); - bool deviceReady(); void onPulseContextFailed(); private: - void setState(QAudio::State state); - void setError(QAudio::Error error); - void applyVolume(const void *src, void *dest, int len); - int checkBytesReady(); bool open(); void close(); bool m_pullMode; bool m_opened; - int m_bytesAvailable; int m_bufferSize; int m_periodSize; unsigned int m_periodTime; - QTimer *m_timer; + QBasicTimer m_timer; qint64 m_elapsedTimeOffset; pa_stream *m_stream; QByteArray m_streamName; QByteArray m_device; QByteArray m_tempBuffer; pa_sample_spec m_spec; + + QAudioStateMachine m_stateMachine; }; class PulseInputPrivate : public QIODevice @@ -138,7 +100,7 @@ class PulseInputPrivate : public QIODevice Q_OBJECT public: PulseInputPrivate(QPulseAudioSource *audio); - ~PulseInputPrivate() {}; + ~PulseInputPrivate() override = default; qint64 readData(char *data, qint64 len) override; qint64 writeData(const char *data, qint64 len) override; diff --git a/src/multimedia/pulseaudio/qpulsehelpers.cpp b/src/multimedia/pulseaudio/qpulsehelpers.cpp index 0136fd125..bc03e133f 100644 --- a/src/multimedia/pulseaudio/qpulsehelpers.cpp +++ b/src/multimedia/pulseaudio/qpulsehelpers.cpp @@ -1,47 +1,13 @@ -/**************************************************************************** -** -** 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 #include "qpulsehelpers_p.h" QT_BEGIN_NAMESPACE Q_LOGGING_CATEGORY(qLcPulseAudioOut, "qt.multimedia.pulseaudio.output") +Q_LOGGING_CATEGORY(qLcPulseAudioIn, "qt.multimedia.pulseaudio.input") +Q_LOGGING_CATEGORY(qLcPulseAudioEngine, "qt.multimedia.pulseaudio.engine") namespace QPulseAudioInternal { @@ -233,6 +199,86 @@ QAudioFormat sampleSpecToAudioFormat(const pa_sample_spec &spec) return format; } +QUtf8StringView currentError(const pa_context *context) +{ + return pa_strerror(pa_context_errno(context)); +} + +QUtf8StringView currentError(const pa_stream *stream) +{ + return currentError(pa_stream_get_context(stream)); +} + +} // namespace QPulseAudioInternal + +static QLatin1StringView stateToQStringView(pa_stream_state_t state) +{ + using namespace Qt::StringLiterals; + switch (state) + { + case PA_STREAM_UNCONNECTED: return "Unconnected"_L1; + case PA_STREAM_CREATING: return "Creating"_L1; + case PA_STREAM_READY: return "Ready"_L1; + case PA_STREAM_FAILED: return "Failed"_L1; + case PA_STREAM_TERMINATED: return "Terminated"_L1; + default: Q_UNREACHABLE_RETURN("Unknown stream state"_L1); + } +} + +static QLatin1StringView sampleFormatToQStringView(pa_sample_format format) +{ + using namespace Qt::StringLiterals; + switch (format) + { + case PA_SAMPLE_U8: return "Unsigned 8 Bit PCM."_L1; + case PA_SAMPLE_ALAW: return "8 Bit a-Law "_L1; + case PA_SAMPLE_ULAW: return "8 Bit mu-Law"_L1; + case PA_SAMPLE_S16LE: return "Signed 16 Bit PCM, little endian (PC)."_L1; + case PA_SAMPLE_S16BE: return "Signed 16 Bit PCM, big endian."_L1; + case PA_SAMPLE_FLOAT32LE: return "32 Bit IEEE floating point, little endian (PC), range -1.0 to 1.0"_L1; + case PA_SAMPLE_FLOAT32BE: return "32 Bit IEEE floating point, big endian, range -1.0 to 1.0"_L1; + case PA_SAMPLE_S32LE: return "Signed 32 Bit PCM, little endian (PC)."_L1; + case PA_SAMPLE_S32BE: return "Signed 32 Bit PCM, big endian."_L1; + case PA_SAMPLE_S24LE: return "Signed 24 Bit PCM packed, little endian (PC)."_L1; + case PA_SAMPLE_S24BE: return "Signed 24 Bit PCM packed, big endian."_L1; + case PA_SAMPLE_S24_32LE: return "Signed 24 Bit PCM in LSB of 32 Bit words, little endian (PC)."_L1; + case PA_SAMPLE_S24_32BE: return "Signed 24 Bit PCM in LSB of 32 Bit words, big endian."_L1; + case PA_SAMPLE_MAX: return "Upper limit of valid sample types."_L1; + case PA_SAMPLE_INVALID: return "Invalid sample format"_L1; + default: Q_UNREACHABLE_RETURN("Unknown sample format"_L1); + } +} + +static QLatin1StringView stateToQStringView(pa_context_state_t state) +{ + using namespace Qt::StringLiterals; + switch (state) + { + case PA_CONTEXT_UNCONNECTED: return "Unconnected"_L1; + case PA_CONTEXT_CONNECTING: return "Connecting"_L1; + case PA_CONTEXT_AUTHORIZING: return "Authorizing"_L1; + case PA_CONTEXT_SETTING_NAME: return "Setting Name"_L1; + case PA_CONTEXT_READY: return "Ready"_L1; + case PA_CONTEXT_FAILED: return "Failed"_L1; + case PA_CONTEXT_TERMINATED: return "Terminated"_L1; + default: Q_UNREACHABLE_RETURN("Unknown context state"_L1); + } +} + + +QDebug operator<<(QDebug dbg, pa_stream_state_t state) +{ + return dbg << stateToQStringView(state); +} + +QDebug operator<<(QDebug dbg, pa_sample_format format) +{ + return dbg << sampleFormatToQStringView(format); +} + +QDebug operator<<(QDebug dbg, pa_context_state_t state) +{ + return dbg << stateToQStringView(state); } QT_END_NAMESPACE diff --git a/src/multimedia/pulseaudio/qpulsehelpers_p.h b/src/multimedia/pulseaudio/qpulsehelpers_p.h index 00f26757e..d271fde48 100644 --- a/src/multimedia/pulseaudio/qpulsehelpers_p.h +++ b/src/multimedia/pulseaudio/qpulsehelpers_p.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 QPULSEHELPER_H #define QPULSEHELPER_H @@ -55,10 +19,20 @@ #include <qaudioformat.h> #include <pulse/pulseaudio.h> #include <QtCore/QLoggingCategory> +#include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE Q_DECLARE_LOGGING_CATEGORY(qLcPulseAudioOut) +Q_DECLARE_LOGGING_CATEGORY(qLcPulseAudioIn) +Q_DECLARE_LOGGING_CATEGORY(qLcPulseAudioEngine) + +struct PAOperationDeleter +{ + void operator()(pa_operation *op) const { pa_operation_unref(op); } +}; + +using PAOperationUPtr = std::unique_ptr<pa_operation, PAOperationDeleter>; namespace QPulseAudioInternal { @@ -67,63 +41,14 @@ QAudioFormat sampleSpecToAudioFormat(const pa_sample_spec &spec); pa_channel_map channelMapForAudioFormat(const QAudioFormat &format); QAudioFormat::ChannelConfig channelConfigFromMap(const pa_channel_map &map); -static inline QString stateToQString(pa_stream_state_t state) -{ - using namespace Qt::StringLiterals; - switch (state) - { - case PA_STREAM_UNCONNECTED: return "Unconnected"_L1; - case PA_STREAM_CREATING: return "Creating"_L1; - case PA_STREAM_READY: return "Ready"_L1; - case PA_STREAM_FAILED: return "Failed"_L1; - case PA_STREAM_TERMINATED: return "Terminated"_L1; - } - - return u"Unknown state: %0"_s.arg(int(state)); -} +QUtf8StringView currentError(const pa_context *); +QUtf8StringView currentError(const pa_stream *); -static inline QString sampleFormatToQString(pa_sample_format format) -{ - using namespace Qt::StringLiterals; - switch (format) - { - case PA_SAMPLE_U8: return "Unsigned 8 Bit PCM."_L1; - case PA_SAMPLE_ALAW: return "8 Bit a-Law "_L1; - case PA_SAMPLE_ULAW: return "8 Bit mu-Law"_L1; - case PA_SAMPLE_S16LE: return "Signed 16 Bit PCM, little endian (PC)."_L1; - case PA_SAMPLE_S16BE: return "Signed 16 Bit PCM, big endian."_L1; - case PA_SAMPLE_FLOAT32LE: return "32 Bit IEEE floating point, little endian (PC), range -1.0 to 1.0"_L1; - case PA_SAMPLE_FLOAT32BE: return "32 Bit IEEE floating point, big endian, range -1.0 to 1.0"_L1; - case PA_SAMPLE_S32LE: return "Signed 32 Bit PCM, little endian (PC)."_L1; - case PA_SAMPLE_S32BE: return "Signed 32 Bit PCM, big endian."_L1; - case PA_SAMPLE_S24LE: return "Signed 24 Bit PCM packed, little endian (PC)."_L1; - case PA_SAMPLE_S24BE: return "Signed 24 Bit PCM packed, big endian."_L1; - case PA_SAMPLE_S24_32LE: return "Signed 24 Bit PCM in LSB of 32 Bit words, little endian (PC)."_L1; - case PA_SAMPLE_S24_32BE: return "Signed 24 Bit PCM in LSB of 32 Bit words, big endian."_L1; - case PA_SAMPLE_MAX: return "Upper limit of valid sample types."_L1; - case PA_SAMPLE_INVALID: return "Invalid sample format"_L1; - } - - return u"Invalid value: %0"_s.arg(int(format)); -} - -static inline QString stateToQString(pa_context_state_t state) -{ - using namespace Qt::StringLiterals; - switch (state) - { - case PA_CONTEXT_UNCONNECTED: return "Unconnected"_L1; - case PA_CONTEXT_CONNECTING: return "Connecting"_L1; - case PA_CONTEXT_AUTHORIZING: return "Authorizing"_L1; - case PA_CONTEXT_SETTING_NAME: return "Setting Name"_L1; - case PA_CONTEXT_READY: return "Ready"_L1; - case PA_CONTEXT_FAILED: return "Failed"_L1; - case PA_CONTEXT_TERMINATED: return "Terminated"_L1; - } +} // namespace QPulseAudioInternal - return u"Unknown state: %0"_s.arg(int(state)); -} -} +QDebug operator<<(QDebug, pa_stream_state_t); +QDebug operator<<(QDebug, pa_sample_format); +QDebug operator<<(QDebug, pa_context_state_t); QT_END_NAMESPACE diff --git a/src/multimedia/qerrorinfo_p.h b/src/multimedia/qerrorinfo_p.h new file mode 100644 index 000000000..6428cb00f --- /dev/null +++ b/src/multimedia/qerrorinfo_p.h @@ -0,0 +1,57 @@ +// Copyright (C) 2023 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 QERRORINFO_P_H +#define QERRORINFO_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtMultimedia/qtmultimediaglobal.h> +#include <QString> + +QT_BEGIN_NAMESPACE + +template <typename ErrorCode, ErrorCode NoError = ErrorCode::NoError> +class QErrorInfo +{ +public: + QErrorInfo(ErrorCode error = NoError, QString description = {}) + : m_code(error), m_description(std::move(description)) + { + } + + template <typename Notifier> + void setAndNotify(ErrorCode code, QString description, Notifier ¬ifier) + { + const bool changed = code != m_code || description != m_description; + + m_code = code; + m_description = std::move(description); + + if (code != NoError) + emit notifier.errorOccurred(m_code, m_description); + + if (changed) + emit notifier.errorChanged(); + } + + ErrorCode code() const { return m_code; } + QString description() const { return m_description; }; + +private: + ErrorCode m_code; + QString m_description; +}; + +QT_END_NAMESPACE + +#endif // QERRORINFO_P_H diff --git a/src/multimedia/qmaybe_p.h b/src/multimedia/qmaybe_p.h new file mode 100644 index 000000000..5fe2d4d6c --- /dev/null +++ b/src/multimedia/qmaybe_p.h @@ -0,0 +1,96 @@ +// Copyright (C) 2024 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 QMAYBE_P_H +#define QMAYBE_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtCore/private/qglobal_p.h> +#include <qstring.h> +#include <optional> +#include <utility> +#include <memory> + +QT_BEGIN_NAMESPACE + +struct QUnexpect +{ +}; + +static constexpr QUnexpect unexpect{}; + +template <typename Value, typename Error = QString> +class QMaybe +{ +public: + QMaybe(const Value &v) + { + if constexpr (std::is_pointer_v<Value>) { + if (!v) + return; // nullptr is treated as nullopt (for raw pointer types only) + } + m_value = v; + } + + QMaybe(Value &&v) + { + if constexpr (std::is_pointer_v<Value>) { + if (!v) + return; // nullptr is treated as nullopt (for raw pointer types only) + } + m_value = std::move(v); + } + + QMaybe(const QMaybe &other) = default; + + QMaybe &operator=(const QMaybe &other) = default; + + QMaybe(const Error &error) : m_error(error) { } + + template <class... Args> + QMaybe(QUnexpect, Args &&...args) : m_error{ std::forward<Args>(args)... } + { + static_assert(std::is_constructible_v<Error, Args &&...>, + "Invalid arguments for creating an error type"); + } + + constexpr explicit operator bool() const noexcept { return m_value.has_value(); } + + constexpr Value &value() + { + Q_ASSERT(m_value.has_value()); + return *m_value; + } + + constexpr const Value &value() const + { + Q_ASSERT(m_value.has_value()); + return *m_value; + } + + constexpr Value *operator->() noexcept { return std::addressof(value()); } + constexpr const Value *operator->() const noexcept { return std::addressof(value()); } + + constexpr Value &operator*() &noexcept { return value(); } + constexpr const Value &operator*() const &noexcept { return value(); } + + constexpr const Error &error() const { return m_error; } + +private: + std::optional<Value> m_value; + Error m_error; +}; + +QT_END_NAMESPACE + +#endif // QMAYBE_P_H diff --git a/src/multimedia/qmediadevices.cpp b/src/multimedia/qmediadevices.cpp index 23df0473b..1d77f4de8 100644 --- a/src/multimedia/qmediadevices.cpp +++ b/src/multimedia/qmediadevices.cpp @@ -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 #include "qmediadevices.h" #include "private/qplatformmediaintegration_p.h" @@ -66,6 +30,19 @@ QT_BEGIN_NAMESPACE from the system, it will update the corresponding device list and emit a signal notifying about the change. + The QMediaDevices::audioInputs and QMediaDevices::audioOutputs functions can be used + to enumerate all microphones and speakers/headsets on the system. This example first + gets a list of all connected microphones, and then prints their identifier, description, + and if it is the default device or not. + + \snippet multimedia-snippets/devices.cpp Media Audio Input Device Enumeration + + Similarly, the QMediaDevices::videoInputs will return a list of all connected cameras. + In this example we list all connected cameras and their identifier, description, and + if it is the default camera or not. + + \snippet multimedia-snippets/devices.cpp Media Video Input Device Enumeration + QMediaDevices monitors the system defaults for each device group. It will notify about any changes done through the system settings. For example, if the user selects a new default audio output in the system settings, QMediaDevices will update the default audio @@ -140,6 +117,8 @@ QT_BEGIN_NAMESPACE */ /*! + \property QMediaDevices::audioInputs + Returns a list of available audio input devices on the system. Those devices are usually microphones. Devices can be either built-in, or @@ -147,7 +126,7 @@ QT_BEGIN_NAMESPACE */ QList<QAudioDevice> QMediaDevices::audioInputs() { - return QPlatformMediaDevices::instance()->audioInputs(); + return QPlatformMediaIntegration::instance()->mediaDevices()->audioInputs(); } /*! @@ -159,6 +138,8 @@ QList<QAudioDevice> QMediaDevices::audioInputs() */ /*! + \property QMediaDevices::audioOutputs + Returns a list of available audio output devices on the system. Those devices are usually loudspeakers or head sets. Devices can be either @@ -166,7 +147,7 @@ QList<QAudioDevice> QMediaDevices::audioInputs() */ QList<QAudioDevice> QMediaDevices::audioOutputs() { - return QPlatformMediaDevices::instance()->audioOutputs(); + return QPlatformMediaIntegration::instance()->mediaDevices()->audioOutputs(); } /*! @@ -175,10 +156,13 @@ QList<QAudioDevice> QMediaDevices::audioOutputs() */ /*! + \property QMediaDevices::videoInputs + Returns a list of available cameras on the system. */ QList<QCameraDevice> QMediaDevices::videoInputs() { + QPlatformMediaIntegration::instance()->mediaDevices()->initVideoDevicesConnection(); return QPlatformMediaIntegration::instance()->videoInputs(); } @@ -191,6 +175,8 @@ QList<QCameraDevice> QMediaDevices::videoInputs() */ /*! + \property QMediaDevices::defaultAudioInput + Returns the default audio input device. The default device can change during the runtime of the application. @@ -216,6 +202,8 @@ QAudioDevice QMediaDevices::defaultAudioInput() */ /*! + \property QMediaDevices::defaultAudioOutput + Returns the default audio output device. The default device can change during the runtime of the application. The @@ -244,9 +232,11 @@ QAudioDevice QMediaDevices::defaultAudioOutput() */ /*! + \property QMediaDevices::defaultVideoInput + Returns the default camera on the system. - /note The returned object should be checked using isNull() before being used, + \note The returned object should be checked using isNull() before being used, in case there is no default camera or no cameras at all. The default device can change during the runtime of the application. The @@ -271,17 +261,27 @@ QCameraDevice QMediaDevices::defaultVideoInput() QMediaDevices::QMediaDevices(QObject *parent) : QObject(parent) { - QPlatformMediaDevices::instance()->addMediaDevices(this); + auto platformDevices = QPlatformMediaIntegration::instance()->mediaDevices(); + connect(platformDevices, &QPlatformMediaDevices::videoInputsChanged, this, + &QMediaDevices::videoInputsChanged); + connect(platformDevices, &QPlatformMediaDevices::audioInputsChanged, this, + &QMediaDevices::audioInputsChanged); + connect(platformDevices, &QPlatformMediaDevices::audioOutputsChanged, this, + &QMediaDevices::audioOutputsChanged); } /*! \internal */ -QMediaDevices::~QMediaDevices() +QMediaDevices::~QMediaDevices() = default; + +void QMediaDevices::connectNotify(const QMetaMethod &signal) { - QPlatformMediaDevices::instance()->removeMediaDevices(this); -} + if (signal == QMetaMethod::fromSignal(&QMediaDevices::videoInputsChanged)) + QPlatformMediaIntegration::instance()->mediaDevices()->initVideoDevicesConnection(); + QObject::connectNotify(signal); +} QT_END_NAMESPACE diff --git a/src/multimedia/qmediadevices.h b/src/multimedia/qmediadevices.h index ee69a3da8..832799095 100644 --- a/src/multimedia/qmediadevices.h +++ b/src/multimedia/qmediadevices.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 QMEDIADEVICES_H #define QMEDIADEVICES_H @@ -78,6 +42,9 @@ Q_SIGNALS: void audioOutputsChanged(); void videoInputsChanged(); +protected: + void connectNotify(const QMetaMethod &signal) override; + private: friend class QMediaDevicesPrivate; }; diff --git a/src/multimedia/qmediaenumdebug.h b/src/multimedia/qmediaenumdebug.h index 6fc151bbf..e9efb0983 100644 --- a/src/multimedia/qmediaenumdebug.h +++ b/src/multimedia/qmediaenumdebug.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 QMEDIAENUMDEBUG_H #define QMEDIAENUMDEBUG_H 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" diff --git a/src/multimedia/qmediaformat.h b/src/multimedia/qmediaformat.h index cff960514..225d21896 100644 --- a/src/multimedia/qmediaformat.h +++ b/src/multimedia/qmediaformat.h @@ -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 #ifndef QMEDIAFORMAT_H #define QMEDIAFORMAT_H diff --git a/src/multimedia/qmediaframeinput.cpp b/src/multimedia/qmediaframeinput.cpp new file mode 100644 index 000000000..4bb90d3ee --- /dev/null +++ b/src/multimedia/qmediaframeinput.cpp @@ -0,0 +1,43 @@ +// Copyright (C) 2024 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 "qmediaframeinput_p.h" + +QT_BEGIN_NAMESPACE + +void QMediaFrameInputPrivate::setCaptureSession(QMediaCaptureSession *session) +{ + if (session == m_captureSession) + return; + + auto prevSession = std::exchange(m_captureSession, session); + updateCaptureSessionConnections(prevSession, session); + updateCanSendMediaFrame(); +} + +void QMediaFrameInputPrivate::updateCanSendMediaFrame() +{ + const bool canSendMediaFrame = m_captureSession && checkIfCanSendMediaFrame(); + if (m_canSendMediaFrame != canSendMediaFrame) { + m_canSendMediaFrame = canSendMediaFrame; + if (m_canSendMediaFrame) + emitReadyToSendMediaFrame(); + } +} + +void QMediaFrameInputPrivate::postponeCheckReadyToSend() +{ + if (m_canSendMediaFrame && !m_postponeReadyToSendCheckRun) { + m_postponeReadyToSendCheckRun = true; + QMetaObject::invokeMethod( + q_ptr, + [this]() { + m_postponeReadyToSendCheckRun = false; + if (m_canSendMediaFrame) + emitReadyToSendMediaFrame(); + }, + Qt::QueuedConnection); + } +} + +QT_END_NAMESPACE diff --git a/src/multimedia/qmediaframeinput_p.h b/src/multimedia/qmediaframeinput_p.h new file mode 100644 index 000000000..22277865d --- /dev/null +++ b/src/multimedia/qmediaframeinput_p.h @@ -0,0 +1,74 @@ +// Copyright (C) 2024 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 QMEDIAFRAMEINPUT_P_H +#define QMEDIAFRAMEINPUT_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "qmediacapturesession.h" +#include <QtCore/private/qobject_p.h> + +QT_BEGIN_NAMESPACE + +class QMediaFrameInputPrivate : public QObjectPrivate +{ +public: + void setCaptureSession(QMediaCaptureSession *session); + + QMediaCaptureSession *captureSession() const { return m_captureSession; } + +protected: + template <typename Sender> + bool sendMediaFrame(Sender &&sender) + { + if (!m_canSendMediaFrame) + return false; + + sender(); + postponeCheckReadyToSend(); + return true; + } + + template <typename Sender, typename Signal> + void addUpdateSignal(Sender sender, Signal signal) + { + connect(sender, signal, this, &QMediaFrameInputPrivate::updateCanSendMediaFrame); + } + + template <typename Sender, typename Signal> + void removeUpdateSignal(Sender sender, Signal signal) + { + disconnect(sender, signal, this, &QMediaFrameInputPrivate::updateCanSendMediaFrame); + } + + void updateCanSendMediaFrame(); + +private: + void postponeCheckReadyToSend(); + + virtual bool checkIfCanSendMediaFrame() const = 0; + + virtual void emitReadyToSendMediaFrame() = 0; + + virtual void updateCaptureSessionConnections(QMediaCaptureSession *prevSession, + QMediaCaptureSession *currentSession) = 0; + +private: + QMediaCaptureSession *m_captureSession = nullptr; + bool m_canSendMediaFrame = false; + bool m_postponeReadyToSendCheckRun = false; +}; + +QT_END_NAMESPACE + +#endif // QMEDIAFRAMEINPUT_P_H diff --git a/src/multimedia/qmediainputencoderinterface_p.h b/src/multimedia/qmediainputencoderinterface_p.h new file mode 100644 index 000000000..c199e59b4 --- /dev/null +++ b/src/multimedia/qmediainputencoderinterface_p.h @@ -0,0 +1,31 @@ +// Copyright (C) 2024 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 QMEDIAINPUTENCODERINTERFACE_P_H +#define QMEDIAINPUTENCODERINTERFACE_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtMultimedia/qtmultimediaglobal.h> + +QT_BEGIN_NAMESPACE + +class QMediaInputEncoderInterface +{ +public: + virtual ~QMediaInputEncoderInterface() = default; + virtual bool canPushFrame() const = 0; +}; + +QT_END_NAMESPACE + +#endif // QMEDIAINPUTENCODERINTERFACE_P_H diff --git a/src/multimedia/qmediametadata.cpp b/src/multimedia/qmediametadata.cpp index 129889095..29b2a0a8d 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 and Darwin media backends 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 and Darwin media backends 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,10 +487,31 @@ 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(); } +QDebug operator<<(QDebug dbg, const QMediaMetaData &metaData) +{ + QDebugStateSaver sv(dbg); + dbg.nospace(); + + dbg << "QMediaMetaData{"; + auto range = metaData.asKeyValueRange(); + auto begin = std::begin(range); + + for (auto it = begin; it != std::end(range); ++it) { + if (it != begin) + dbg << ", "; + dbg << it->first << ": " << it->second; + } + + dbg << "}"; + return dbg; +} + // operator documentation /*! \fn QVariant &QMediaMetaData ::operator[](QMediaMetaData::Key k) @@ -507,4 +540,11 @@ QString QMediaMetaData::metaDataKeyToString(QMediaMetaData::Key key) \note this is a \c protected member of its class. */ +/*! + \fn auto QMediaMetaData::asKeyValueRange() const + \internal +*/ + QT_END_NAMESPACE + +#include "moc_qmediametadata.cpp" diff --git a/src/multimedia/qmediametadata.h b/src/multimedia/qmediametadata.h index 3040d3473..e8c028dd2 100644 --- a/src/multimedia/qmediametadata.h +++ b/src/multimedia/qmediametadata.h @@ -1,45 +1,13 @@ -/**************************************************************************** -** -** 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 QMEDIAMETADATA_H #define QMEDIAMETADATA_H +#if 0 +#pragma qt_class(QMediaMetaData) +#endif + #include <QtCore/qpair.h> #include <QtCore/qvariant.h> #include <QtCore/qstring.h> @@ -89,11 +57,13 @@ public: CoverArtImage, Orientation, - Resolution + Resolution, + + HasHdrContent, }; Q_ENUM(Key) - static constexpr int NumMetaData = Resolution + 1; + static constexpr int NumMetaData = HasHdrContent + 1; // QMetaType typeForKey(Key k); Q_INVOKABLE QVariant value(Key k) const { return data.value(k); } @@ -109,7 +79,11 @@ public: Q_INVOKABLE static QString metaDataKeyToString(Key k); + QT_TECH_PREVIEW_API auto asKeyValueRange() const { return data.asKeyValueRange(); } + protected: + Q_MULTIMEDIA_EXPORT friend QDebug operator<<(QDebug, const QMediaMetaData &); + friend bool operator==(const QMediaMetaData &a, const QMediaMetaData &b) { return a.data == b.data; } friend bool operator!=(const QMediaMetaData &a, const QMediaMetaData &b) diff --git a/src/multimedia/qmediastoragelocation.cpp b/src/multimedia/qmediastoragelocation.cpp index 2c30562ee..61c4061f4 100644 --- a/src/multimedia/qmediastoragelocation.cpp +++ b/src/multimedia/qmediastoragelocation.cpp @@ -1,45 +1,10 @@ -/**************************************************************************** -** -** 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 "qmediastoragelocation_p.h" #include <QStandardPaths> +#include <QUrl> QT_BEGIN_NAMESPACE @@ -57,7 +22,7 @@ QDir QMediaStorageLocation::defaultDirectory(QStandardPaths::StandardLocation ty dirCandidates << QDir::currentPath(); dirCandidates << QDir::tempPath(); - for (const QString &path : qAsConst(dirCandidates)) { + for (const QString &path : std::as_const(dirCandidates)) { QDir dir(path); if (dir.exists() && QFileInfo(path).isWritable()) return dir; @@ -69,13 +34,13 @@ QDir QMediaStorageLocation::defaultDirectory(QStandardPaths::StandardLocation ty static QString generateFileName(const QDir &dir, const QString &prefix, const QString &extension) { auto lastMediaIndex = 0; - const auto list = dir.entryList({ QString::fromLatin1("%1*.%2").arg(prefix, extension) }); + const auto list = dir.entryList({ QStringLiteral("%1*.%2").arg(prefix, extension) }); for (const QString &fileName : list) { - auto mediaIndex = QStringView{fileName}.mid(prefix.length(), fileName.size() - prefix.length() - extension.length() - 1).toInt(); + auto mediaIndex = QStringView{fileName}.mid(prefix.size(), fileName.size() - prefix.size() - extension.size() - 1).toInt(); lastMediaIndex = qMax(lastMediaIndex, mediaIndex); } - const QString name = QString::fromLatin1("%1%2.%3") + const QString name = QStringLiteral("%1%2.%3") .arg(prefix) .arg(lastMediaIndex + 1, 4, 10, QLatin1Char('0')) .arg(extension); @@ -88,11 +53,16 @@ QString QMediaStorageLocation::generateFileName(const QString &requestedName, QStandardPaths::StandardLocation type, const QString &extension) { - auto prefix = QLatin1String("clip_"); + using namespace Qt::StringLiterals; + + if (QUrl(requestedName).scheme() == "content"_L1) + return requestedName; + + auto prefix = "clip_"_L1; switch (type) { - case QStandardPaths::PicturesLocation: prefix = QLatin1String("image_"); break; - case QStandardPaths::MoviesLocation: prefix = QLatin1String("video_"); break; - case QStandardPaths::MusicLocation: prefix = QLatin1String("record_"); break; + case QStandardPaths::PicturesLocation: prefix = "image_"_L1; break; + case QStandardPaths::MoviesLocation: prefix = "video_"_L1; break; + case QStandardPaths::MusicLocation: prefix = "record_"_L1; break; default: break; } @@ -101,14 +71,14 @@ QString QMediaStorageLocation::generateFileName(const QString &requestedName, QString path = requestedName; - if (QFileInfo(path).isRelative()) + if (QFileInfo(path).isRelative() && QUrl(path).isRelative()) path = defaultDirectory(type).absoluteFilePath(path); if (QFileInfo(path).isDir()) return generateFileName(QDir(path), prefix, extension); if (!path.endsWith(extension)) - path.append(QString(QLatin1String(".%1")).arg(extension)); + path.append(QStringLiteral(".%1").arg(extension)); return path; } diff --git a/src/multimedia/qmediastoragelocation_p.h b/src/multimedia/qmediastoragelocation_p.h index 5310c8dc6..39c4b7162 100644 --- a/src/multimedia/qmediastoragelocation_p.h +++ b/src/multimedia/qmediastoragelocation_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2022 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) 2022 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 QMEDIASTORAGELOCATION_H #define QMEDIASTORAGELOCATION_H diff --git a/src/multimedia/qmediatimerange.cpp b/src/multimedia/qmediatimerange.cpp index 80ab5d928..2af9cefc6 100644 --- a/src/multimedia/qmediatimerange.cpp +++ b/src/multimedia/qmediatimerange.cpp @@ -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 #include <QtCore/qdebug.h> @@ -166,7 +130,7 @@ void QMediaTimeRangePrivate::addInterval(const QMediaTimeRange::Interval &interv // Find a place to insert the interval int i; - for (i = 0; i < intervals.count(); i++) { + for (i = 0; i < intervals.size(); i++) { // Insert before this element if(interval.s < intervals[i].s) { intervals.insert(i, interval); @@ -175,7 +139,7 @@ void QMediaTimeRangePrivate::addInterval(const QMediaTimeRange::Interval &interv } // Interval needs to be added to the end of the list - if (i == intervals.count()) + if (i == intervals.size()) intervals.append(interval); // Do we need to correct the element before us? @@ -183,7 +147,7 @@ void QMediaTimeRangePrivate::addInterval(const QMediaTimeRange::Interval &interv i--; // Merge trailing ranges - while (i < intervals.count() - 1 + while (i < intervals.size() - 1 && intervals[i].e >= intervals[i + 1].s - 1) { intervals[i].e = qMax(intervals[i].e, intervals[i + 1].e); intervals.removeAt(i + 1); @@ -196,7 +160,7 @@ void QMediaTimeRangePrivate::removeInterval(const QMediaTimeRange::Interval &int if (!interval.isNormal()) return; - for (int i = 0; i < intervals.count(); i++) { + for (int i = 0; i < intervals.size(); i++) { const QMediaTimeRange::Interval r = intervals.at(i); if (r.e < interval.s) { @@ -296,6 +260,12 @@ QMediaTimeRange::QMediaTimeRange(const QMediaTimeRange &range) noexcept = defaul */ /*! + \fn void QMediaTimeRange::swap(QMediaTimeRange &other) noexcept + + Swaps the current instance with the \a other. +*/ + +/*! \fn QMediaTimeRange::~QMediaTimeRange() Destructor. @@ -347,7 +317,7 @@ qint64 QMediaTimeRange::earliestTime() const qint64 QMediaTimeRange::latestTime() const { if (!d->intervals.isEmpty()) - return d->intervals[d->intervals.count() - 1].end(); + return d->intervals[d->intervals.size() - 1].end(); return 0; } @@ -536,7 +506,7 @@ bool QMediaTimeRange::isEmpty() const */ bool QMediaTimeRange::isContinuous() const { - return (d->intervals.count() <= 1); + return (d->intervals.size() <= 1); } /*! @@ -546,7 +516,7 @@ bool QMediaTimeRange::isContinuous() const */ bool QMediaTimeRange::contains(qint64 time) const { - for (int i = 0; i < d->intervals.count(); i++) { + for (int i = 0; i < d->intervals.size(); i++) { if (d->intervals[i].contains(time)) return true; diff --git a/src/multimedia/qmediatimerange.h b/src/multimedia/qmediatimerange.h index 8fcef3be8..7245a845a 100644 --- a/src/multimedia/qmediatimerange.h +++ b/src/multimedia/qmediatimerange.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 QMEDIATIMERANGE_H #define QMEDIATIMERANGE_H diff --git a/src/multimedia/qmultimediautils.cpp b/src/multimedia/qmultimediautils.cpp index 54653751b..9740b6d60 100644 --- a/src/multimedia/qmultimediautils.cpp +++ b/src/multimedia/qmultimediautils.cpp @@ -1,50 +1,20 @@ -/**************************************************************************** -** -** 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 #include "qmultimediautils_p.h" +#include "qvideoframe.h" +#include "qvideoframeformat.h" + +#include <QtCore/qdir.h> QT_BEGIN_NAMESPACE -void qt_real_to_fraction(qreal value, int *numerator, int *denominator) +Fraction qRealToFraction(qreal value) { - if (!numerator || !denominator) - return; + int integral = int(floor(value)); + value -= qreal(integral); + if (value == 0.) + return {integral, 1}; const int dMax = 1000; int n1 = 0, d1 = 1, n2 = 1, d2 = 1; @@ -53,19 +23,7 @@ void qt_real_to_fraction(qreal value, int *numerator, int *denominator) mid = qreal(n1 + n2) / (d1 + d2); if (qAbs(value - mid) < 0.000001) { - if (d1 + d2 <= dMax) { - *numerator = n1 + n2; - *denominator = d1 + d2; - return; - } else if (d2 > d1) { - *numerator = n2; - *denominator = d2; - return; - } else { - *numerator = n1; - *denominator = d1; - return; - } + break; } else if (value > mid) { n1 = n1 + n2; d1 = d1 + d2; @@ -75,13 +33,68 @@ void qt_real_to_fraction(qreal value, int *numerator, int *denominator) } } - if (d1 > dMax) { - *numerator = n2; - *denominator = d2; - } else { - *numerator = n1; - *denominator = d1; - } + if (d1 + d2 <= dMax) + return {n1 + n2 + integral * (d1 + d2), d1 + d2}; + else if (d2 < d1) + return { n2 + integral * d2, d2 }; + else + return { n1 + integral * d1, d1 }; +} + +QSize qCalculateFrameSize(QSize resolution, Fraction par) +{ + if (par.numerator == par.denominator || par.numerator < 1 || par.denominator < 1) + return resolution; + + if (par.numerator > par.denominator) + return { resolution.width() * par.numerator / par.denominator, resolution.height() }; + + return { resolution.width(), resolution.height() * par.denominator / par.numerator }; +} + +QSize qRotatedFrameSize(QSize size, int rotation) +{ + Q_ASSERT(rotation % 90 == 0); + return rotation % 180 ? size.transposed() : size; +} + +QSize qRotatedFrameSize(const QVideoFrame &frame) +{ + return qRotatedFrameSize(frame.size(), frame.rotation()); +} + +QUrl qMediaFromUserInput(QUrl url) +{ + using namespace Qt::Literals; + if (url.scheme().isEmpty() || url.scheme() == "file"_L1) + url = QUrl::fromUserInput(url.toString(), QDir::currentPath(), QUrl::AssumeLocalFile); + return url; +} + +bool qIsAutoHdrEnabled() +{ + static const bool autoHdrEnabled = qEnvironmentVariableIntValue("QT_MEDIA_AUTO_HDR"); + + return autoHdrEnabled; +} + +QRhiSwapChain::Format qGetRequiredSwapChainFormat(const QVideoFrameFormat &format) +{ + constexpr auto sdrMaxLuminance = 100.0f; + const auto formatMaxLuminance = format.maxLuminance(); + + return formatMaxLuminance > sdrMaxLuminance ? QRhiSwapChain::HDRExtendedSrgbLinear + : QRhiSwapChain::SDR; +} + +bool qShouldUpdateSwapChainFormat(QRhiSwapChain *swapChain, + QRhiSwapChain::Format requiredSwapChainFormat) +{ + if (!swapChain) + return false; + + return qIsAutoHdrEnabled() && swapChain->format() != requiredSwapChainFormat + && swapChain->isFormatSupported(requiredSwapChainFormat); } QT_END_NAMESPACE diff --git a/src/multimedia/qmultimediautils_p.h b/src/multimedia/qmultimediautils_p.h index 3b1def5d6..a5d60e066 100644 --- a/src/multimedia/qmultimediautils_p.h +++ b/src/multimedia/qmultimediautils_p.h @@ -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 #ifndef QMULTIMEDIAUTILS_P_H #define QMULTIMEDIAUTILS_P_H @@ -52,11 +16,48 @@ // #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtCore/private/qglobal_p.h> +#include <QtMultimedia/qtvideo.h> +#include <QtMultimedia/private/qmaybe_p.h> +#include <QtCore/qsize.h> +#include <QtCore/qurl.h> +#include <QtGui/rhi/qrhi.h> QT_BEGIN_NAMESPACE -Q_MULTIMEDIA_EXPORT void qt_real_to_fraction(qreal value, int *numerator, int *denominator); +class QRhiSwapChain; +class QVideoFrame; +class QVideoFrameFormat; + +struct Fraction { + int numerator; + int denominator; +}; + +Q_MULTIMEDIA_EXPORT Fraction qRealToFraction(qreal value); + +Q_MULTIMEDIA_EXPORT QSize qCalculateFrameSize(QSize resolution, Fraction pixelAspectRatio); + +// TODO: after adding pixel aspect ratio to QVideoFrameFormat, the function should +// consider PAR as well as rotation +Q_MULTIMEDIA_EXPORT QSize qRotatedFrameSize(QSize size, int rotation); + +inline QSize qRotatedFrameSize(QSize size, QtVideo::Rotation rotation) +{ + return qRotatedFrameSize(size, qToUnderlying(rotation)); +} + +Q_MULTIMEDIA_EXPORT QSize qRotatedFrameSize(const QVideoFrame &frame); + +Q_MULTIMEDIA_EXPORT QUrl qMediaFromUserInput(QUrl fileName); + +Q_MULTIMEDIA_EXPORT bool qIsAutoHdrEnabled(); + +Q_MULTIMEDIA_EXPORT QRhiSwapChain::Format +qGetRequiredSwapChainFormat(const QVideoFrameFormat &format); + +Q_MULTIMEDIA_EXPORT bool +qShouldUpdateSwapChainFormat(QRhiSwapChain *swapChain, + QRhiSwapChain::Format requiredSwapChainFormat); QT_END_NAMESPACE diff --git a/src/multimedia/qnx/qqnxaudiodevice.cpp b/src/multimedia/qnx/qqnxaudiodevice.cpp index 65574de1f..4e1390e8b 100644 --- a/src/multimedia/qnx/qqnxaudiodevice.cpp +++ b/src/multimedia/qnx/qqnxaudiodevice.cpp @@ -1,42 +1,6 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Research In Motion -** Copyright (C) 2021 The Qt Company -** 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 Research In Motion +// Copyright (C) 2021 The Qt Company +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qqnxaudiodevice_p.h" diff --git a/src/multimedia/qnx/qqnxaudiodevice_p.h b/src/multimedia/qnx/qqnxaudiodevice_p.h index ed1afa720..52c89c14f 100644 --- a/src/multimedia/qnx/qqnxaudiodevice_p.h +++ b/src/multimedia/qnx/qqnxaudiodevice_p.h @@ -1,42 +1,6 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Research In Motion -** Copyright (C) 2021 The Qt Company -** 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 Research In Motion +// Copyright (C) 2021 The Qt Company +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QNXAUDIODEVICE_P_H #define QNXAUDIODEVICE_P_H diff --git a/src/multimedia/qnx/qqnxaudiosink.cpp b/src/multimedia/qnx/qqnxaudiosink.cpp index 9d846b774..fa4b97ab6 100644 --- a/src/multimedia/qnx/qqnxaudiosink.cpp +++ b/src/multimedia/qnx/qqnxaudiosink.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Research In Motion -** 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 Research In Motion +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qqnxaudiosink_p.h" @@ -50,11 +14,14 @@ QT_BEGIN_NAMESPACE -QQnxAudioSink::QQnxAudioSink(const QAudioDevice &deviceInfo) - : m_source(0) +QQnxAudioSink::QQnxAudioSink(const QAudioDevice &deviceInfo, QObject *parent) + : QPlatformAudioSink(parent) + , m_source(0) , m_pushSource(false) + , m_timer(new QTimer(this)) , m_error(QAudio::NoError) , m_state(QAudio::StoppedState) + , m_suspendedInState(QAudio::SuspendedState) , m_volume(1.0) , m_periodSize(0) , m_bytesWritten(0) @@ -62,9 +29,9 @@ QQnxAudioSink::QQnxAudioSink(const QAudioDevice &deviceInfo) , m_deviceInfo(deviceInfo) , m_pcmNotifier(0) { - m_timer.setSingleShot(false); - m_timer.setInterval(20); - connect(&m_timer, &QTimer::timeout, this, &QQnxAudioSink::pullData); + m_timer->setSingleShot(false); + m_timer->setInterval(20); + connect(m_timer, &QTimer::timeout, this, &QQnxAudioSink::pullData); const std::optional<snd_pcm_channel_info_t> info = QnxAudioUtils::pcmChannelInfo( m_deviceInfo.id(), QAudioDevice::Output); @@ -88,7 +55,7 @@ void QQnxAudioSink::start(QIODevice *source) if (open()) { changeState(QAudio::ActiveState, QAudio::NoError); - m_timer.start(); + m_timer->start(); } else { changeState(QAudio::StoppedState, QAudio::OpenError); } @@ -344,7 +311,7 @@ bool QQnxAudioSink::open() void QQnxAudioSink::close() { if (!m_pushSource) - m_timer.stop(); + m_timer->stop(); destroyPcmNotifiers(); @@ -448,18 +415,17 @@ qint64 QQnxAudioSink::write(const char *data, qint64 len) void QQnxAudioSink::suspendInternal(QAudio::State suspendState) { if (!m_pushSource) - m_timer.stop(); + m_timer->stop(); + m_suspendedInState = m_state; changeState(suspendState, QAudio::NoError); } void QQnxAudioSink::resumeInternal() { - const QAudio::State state = m_pushSource ? QAudio::IdleState : QAudio::ActiveState; + changeState(m_suspendedInState, QAudio::NoError); - changeState(state, QAudio::NoError); - - m_timer.start(); + m_timer->start(); } QAudio::State suspendState(const snd_pcm_event_t &event) diff --git a/src/multimedia/qnx/qqnxaudiosink_p.h b/src/multimedia/qnx/qqnxaudiosink_p.h index fb3616635..1275121b3 100644 --- a/src/multimedia/qnx/qqnxaudiosink_p.h +++ b/src/multimedia/qnx/qqnxaudiosink_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Research In Motion -** 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 Research In Motion +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QNXAUDIOOUTPUT_H #define QNXAUDIOOUTPUT_H @@ -72,7 +36,7 @@ class QQnxAudioSink : public QPlatformAudioSink Q_OBJECT public: - explicit QQnxAudioSink(const QAudioDevice &deviceInfo); + explicit QQnxAudioSink(const QAudioDevice &deviceInfo, QObject *parent); ~QQnxAudioSink(); void start(QIODevice *source) override; @@ -115,10 +79,11 @@ private: QIODevice *m_source; bool m_pushSource; - QTimer m_timer; + QTimer *m_timer; QAudio::Error m_error; QAudio::State m_state; + QAudio::State m_suspendedInState; QAudioFormat m_format; qreal m_volume; int m_periodSize; diff --git a/src/multimedia/qnx/qqnxaudiosource.cpp b/src/multimedia/qnx/qqnxaudiosource.cpp index e46b2a6ce..becbaa0c0 100644 --- a/src/multimedia/qnx/qqnxaudiosource.cpp +++ b/src/multimedia/qnx/qqnxaudiosource.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Research In Motion -** 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 Research In Motion +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qqnxaudiosource_p.h" @@ -45,8 +9,9 @@ QT_BEGIN_NAMESPACE -QQnxAudioSource::QQnxAudioSource(const QAudioDevice &deviceInfo) - : m_audioSource(0) +QQnxAudioSource::QQnxAudioSource(const QAudioDevice &deviceInfo, QObject *parent) + : QPlatformAudioSource(parent) + , m_audioSource(0) , m_pcmNotifier(0) , m_error(QAudio::NoError) , m_state(QAudio::StoppedState) @@ -287,7 +252,7 @@ bool QQnxAudioSource::open() m_pcmNotifier = new QSocketNotifier(snd_pcm_file_descriptor(m_pcmHandle.get(), SND_PCM_CHANNEL_CAPTURE), QSocketNotifier::Read, this); - connect(m_pcmNotifier, SIGNAL(activated(QSocketDescriptor)), SLOT(userFeed())); + connect(m_pcmNotifier, SIGNAL(activated(QSocketDescriptor)), this, SLOT(userFeed())); return true; } diff --git a/src/multimedia/qnx/qqnxaudiosource_p.h b/src/multimedia/qnx/qqnxaudiosource_p.h index 3c93574d4..6b9cf61ac 100644 --- a/src/multimedia/qnx/qqnxaudiosource_p.h +++ b/src/multimedia/qnx/qqnxaudiosource_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Research In Motion -** 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 Research In Motion +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QNXAUDIOINPUT_H #define QNXAUDIOINPUT_H @@ -69,7 +33,7 @@ class QQnxAudioSource : public QPlatformAudioSource Q_OBJECT public: - explicit QQnxAudioSource(const QAudioDevice &deviceInfo); + explicit QQnxAudioSource(const QAudioDevice &deviceInfo, QObject *parent); ~QQnxAudioSource(); void start(QIODevice*) override; diff --git a/src/multimedia/qnx/qqnxaudioutils.cpp b/src/multimedia/qnx/qqnxaudioutils.cpp index 83f67f5d4..ddcb4f0de 100644 --- a/src/multimedia/qnx/qqnxaudioutils.cpp +++ b/src/multimedia/qnx/qqnxaudioutils.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Research In Motion -** 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 Research In Motion +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qqnxaudioutils_p.h" diff --git a/src/multimedia/qnx/qqnxaudioutils_p.h b/src/multimedia/qnx/qqnxaudioutils_p.h index 5eabf630d..c0d2e5b1c 100644 --- a/src/multimedia/qnx/qqnxaudioutils_p.h +++ b/src/multimedia/qnx/qqnxaudioutils_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Research In Motion -** 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 Research In Motion +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QNXAUDIOUTILS_H #define QNXAUDIOUTILS_H diff --git a/src/multimedia/qnx/qqnxmediadevices.cpp b/src/multimedia/qnx/qqnxmediadevices.cpp index df9ef8e0b..d9e33fcdc 100644 --- a/src/multimedia/qnx/qqnxmediadevices.cpp +++ b/src/multimedia/qnx/qqnxmediadevices.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 "qqnxmediadevices_p.h" #include "qmediadevices.h" @@ -91,14 +55,16 @@ QList<QAudioDevice> QQnxMediaDevices::audioOutputs() const return ::enumeratePcmDevices(QAudioDevice::Output); } -QPlatformAudioSource *QQnxMediaDevices::createAudioSource(const QAudioDevice &deviceInfo) +QPlatformAudioSource *QQnxMediaDevices::createAudioSource(const QAudioDevice &deviceInfo, + QObject *parent) { - return new QQnxAudioSource(deviceInfo); + return new QQnxAudioSource(deviceInfo, parent); } -QPlatformAudioSink *QQnxMediaDevices::createAudioSink(const QAudioDevice &deviceInfo) +QPlatformAudioSink *QQnxMediaDevices::createAudioSink(const QAudioDevice &deviceInfo, + QObject *parent) { - return new QQnxAudioSink(deviceInfo); + return new QQnxAudioSink(deviceInfo, parent); } QT_END_NAMESPACE diff --git a/src/multimedia/qnx/qqnxmediadevices_p.h b/src/multimedia/qnx/qqnxmediadevices_p.h index 68cf9607b..b8ccf5807 100644 --- a/src/multimedia/qnx/qqnxmediadevices_p.h +++ b/src/multimedia/qnx/qqnxmediadevices_p.h @@ -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 #ifndef QQNXMEDIADEVICES_H #define QQNXMEDIADEVICES_H @@ -64,8 +28,10 @@ public: QList<QAudioDevice> audioInputs() const override; QList<QAudioDevice> audioOutputs() const override; - QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo) override; - QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo) override; + QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo, + QObject *parent) override; + QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo, + QObject *parent) override; }; QT_END_NAMESPACE diff --git a/src/multimedia/qsymbolsresolveutils.cpp b/src/multimedia/qsymbolsresolveutils.cpp new file mode 100644 index 000000000..81c7410d2 --- /dev/null +++ b/src/multimedia/qsymbolsresolveutils.cpp @@ -0,0 +1,79 @@ +// Copyright (C) 2024 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 "qsymbolsresolveutils_p.h" + +#include <qdebug.h> +#include <algorithm> +#include <qloggingcategory.h> + +QT_BEGIN_NAMESPACE + +Q_STATIC_LOGGING_CATEGORY(qLcSymbolsResolver, "qt.multimedia.symbolsresolver"); + +bool SymbolsResolver::isLazyLoadEnabled() +{ + static const bool lazyLoad = + !static_cast<bool>(qEnvironmentVariableIntValue("QT_INSTANT_LOAD_FFMPEG_STUBS")); + return lazyLoad; +} + +SymbolsResolver::SymbolsResolver(const char *libLoggingName, LibraryLoader loader) + : m_libLoggingName(libLoggingName) +{ + Q_ASSERT(libLoggingName); + Q_ASSERT(loader); + + auto library = loader(); + if (library && library->isLoaded()) + m_library = std::move(library); + else + qCWarning(qLcSymbolsResolver) << "Couldn't load" << m_libLoggingName << "library"; +} + +SymbolsResolver::SymbolsResolver(const char *libName, const char *version, + const char *libLoggingName) + : m_libLoggingName(libLoggingName ? libLoggingName : libName) +{ + Q_ASSERT(libName); + Q_ASSERT(version); + + auto library = std::make_unique<QLibrary>(QString::fromLocal8Bit(libName), + QString::fromLocal8Bit(version)); + if (library->load()) + m_library = std::move(library); + else + qCWarning(qLcSymbolsResolver) << "Couldn't load" << m_libLoggingName << "library"; +} + +SymbolsResolver::~SymbolsResolver() +{ + if (m_library) + m_library->unload(); +} + +QFunctionPointer SymbolsResolver::initFunction(const char *funcName) +{ + if (!m_library) + return nullptr; + if (auto func = m_library->resolve(funcName)) + return func; + + qCWarning(qLcSymbolsResolver) << "Couldn't resolve" << m_libLoggingName << "symbol" << funcName; + m_library->unload(); + m_library.reset(); + return nullptr; +} + +void SymbolsResolver::checkLibrariesLoaded(SymbolsMarker *begin, SymbolsMarker *end) +{ + if (m_library) { + qCDebug(qLcSymbolsResolver) << m_libLoggingName << "symbols resolved"; + } else { + const auto size = reinterpret_cast<char *>(end) - reinterpret_cast<char *>(begin); + memset(begin, 0, size); + qCWarning(qLcSymbolsResolver) << "Couldn't resolve" << m_libLoggingName << "symbols"; + } +} + +QT_END_NAMESPACE diff --git a/src/multimedia/qsymbolsresolveutils_p.h b/src/multimedia/qsymbolsresolveutils_p.h new file mode 100644 index 000000000..98a552170 --- /dev/null +++ b/src/multimedia/qsymbolsresolveutils_p.h @@ -0,0 +1,178 @@ +// Copyright (C) 2024 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 Q_SYMBOLSRESOLVEUTILS +#define Q_SYMBOLSRESOLVEUTILS + +#include <QtCore/qlibrary.h> +#include <QtMultimedia/qtmultimediaexports.h> +#include <tuple> +#include <memory> + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +QT_BEGIN_NAMESPACE + +constexpr bool areVersionsEqual(const char lhs[], const char rhs[]) +{ + int i = 0; + for (; lhs[i] && rhs[i]; ++i) + if (lhs[i] != rhs[i]) + return false; + return lhs[i] == rhs[i]; +} + +constexpr bool areVersionsEqual(const char lhs[], int rhsInt) +{ + int lhsInt = 0; + for (int i = 0; lhs[i]; ++i) { + if (lhs[i] < '0' || lhs[i] > '9') + return false; + + lhsInt *= 10; + lhsInt += lhs[i] - '0'; + } + + return lhsInt == rhsInt; +} + + +template <typename T> +struct DefaultReturn +{ + template <typename... Arg> + T operator()(Arg &&...) { return val; } + T val; +}; + +template <> +struct DefaultReturn<void> +{ + template <typename... Arg> + void operator()(Arg &&...) { } +}; + +template <typename...> +struct FuncInfo; + +template <typename R, typename... A> +struct FuncInfo<R(A...)> +{ + using Return = R; + using Args = std::tuple<A...>; +}; + +class Q_MULTIMEDIA_EXPORT SymbolsResolver +{ +public: + using LibraryLoader = std::unique_ptr<QLibrary> (*)(); + static bool isLazyLoadEnabled(); + + ~SymbolsResolver(); +protected: + SymbolsResolver(const char *libLoggingName, LibraryLoader loader); + + SymbolsResolver(const char *libName, const char *version = "", + const char *libLoggingName = nullptr); + + QFunctionPointer initFunction(const char *name); + + struct SymbolsMarker {}; + void checkLibrariesLoaded(SymbolsMarker *begin, SymbolsMarker *end); + +private: + const char *m_libLoggingName; + std::unique_ptr<QLibrary> m_library; +}; + + +QT_END_NAMESPACE + +// clang-format off + +#define CHECK_VERSIONS(Name, NeededSoversion, DetectedVersion) \ + static_assert(areVersionsEqual(NeededSoversion, DetectedVersion), \ + "Configuartion error: misleading " Name " versions!") + +#define BEGIN_INIT_FUNCS(...) \ + QT_USE_NAMESPACE \ + namespace { \ + class SymbolsResolverImpl : SymbolsResolver { \ + public: \ + SymbolsResolverImpl() : SymbolsResolver(__VA_ARGS__) \ + { checkLibrariesLoaded(&symbolsBegin, &symbolsEnd); } \ + static const SymbolsResolverImpl& instance() \ + { static const SymbolsResolverImpl instance; return instance; } \ + SymbolsMarker symbolsBegin; + +#define INIT_FUNC(F) QFunctionPointer F = initFunction(#F); + +#define END_INIT_FUNCS() \ + SymbolsMarker symbolsEnd; \ + }; \ + [[maybe_unused]] static const auto *instantResolver = \ + SymbolsResolver::isLazyLoadEnabled() ? &SymbolsResolverImpl::instance() : nullptr; \ + } + + +#ifdef Q_EXPORT_STUB_SYMBOLS +#define EXPORT_FUNC Q_MULTIMEDIA_EXPORT +#else +#define EXPORT_FUNC +#endif + +#define DEFINE_FUNC_IMPL(F, Vars, TypesWithVars, ReturnFunc) \ + using F##_ReturnType = FuncInfo<decltype(F)>::Return; \ + extern "C" EXPORT_FUNC [[maybe_unused]] F##_ReturnType F(TypesWithVars(F)) { \ + using F##_Type = F##_ReturnType (*)(TypesWithVars(F)); \ + const auto f = SymbolsResolverImpl::instance().F; \ + return f ? (reinterpret_cast<F##_Type>(f))(Vars()) : ReturnFunc(); \ + } + + +#define VAR(I) a##I +#define VARS0() +#define VARS1() VAR(0) +#define VARS2() VARS1(), VAR(1) +#define VARS3() VARS2(), VAR(2) +#define VARS4() VARS3(), VAR(3) +#define VARS5() VARS4(), VAR(4) +#define VARS6() VARS5(), VAR(5) +#define VARS7() VARS6(), VAR(6) +#define VARS8() VARS7(), VAR(7) +#define VARS9() VARS8(), VAR(8) +#define VARS10() VARS9(), VAR(9) +#define VARS11() VARS10(), VAR(10) + +#define TYPE_WITH_VAR(F, I) std::tuple_element_t<I, FuncInfo<decltype(F)>::Args> VAR(I) +#define TYPES_WITH_VARS0(F) +#define TYPES_WITH_VARS1(F) TYPE_WITH_VAR(F, 0) +#define TYPES_WITH_VARS2(F) TYPES_WITH_VARS1(F), TYPE_WITH_VAR(F, 1) +#define TYPES_WITH_VARS3(F) TYPES_WITH_VARS2(F), TYPE_WITH_VAR(F, 2) +#define TYPES_WITH_VARS4(F) TYPES_WITH_VARS3(F), TYPE_WITH_VAR(F, 3) +#define TYPES_WITH_VARS5(F) TYPES_WITH_VARS4(F), TYPE_WITH_VAR(F, 4) +#define TYPES_WITH_VARS6(F) TYPES_WITH_VARS5(F), TYPE_WITH_VAR(F, 5) +#define TYPES_WITH_VARS7(F) TYPES_WITH_VARS6(F), TYPE_WITH_VAR(F, 6) +#define TYPES_WITH_VARS8(F) TYPES_WITH_VARS7(F), TYPE_WITH_VAR(F, 7) +#define TYPES_WITH_VARS9(F) TYPES_WITH_VARS8(F), TYPE_WITH_VAR(F, 8) +#define TYPES_WITH_VARS10(F) TYPES_WITH_VARS9(F), TYPE_WITH_VAR(F, 9) +#define TYPES_WITH_VARS11(F) TYPES_WITH_VARS10(F), TYPE_WITH_VAR(F, 10) + + +#define RET(F, ...) DefaultReturn<FuncInfo<decltype(F)>::Return>{__VA_ARGS__} + +#define DEFINE_FUNC(F, ArgsCount, /*Return value*/...) \ + DEFINE_FUNC_IMPL(F, VARS##ArgsCount, TYPES_WITH_VARS##ArgsCount, RET(F, __VA_ARGS__)); + +// clang-format on + +#endif // Q_SYMBOLSRESOLVEUTILS diff --git a/src/multimedia/qt_cmdline.cmake b/src/multimedia/qt_cmdline.cmake index 4c5710464..5aabbbcb7 100644 --- a/src/multimedia/qt_cmdline.cmake +++ b/src/multimedia/qt_cmdline.cmake @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + qt_commandline_option(alsa TYPE boolean) qt_commandline_option(evr TYPE boolean) qt_commandline_option(wmf TYPE boolean) diff --git a/src/multimedia/qtmultimediaglobal.h b/src/multimedia/qtmultimediaglobal.h index f4007605c..6b6200add 100644 --- a/src/multimedia/qtmultimediaglobal.h +++ b/src/multimedia/qtmultimediaglobal.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2022 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtMultimedia module 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) 2022 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 QTMULTIMEDIAGLOBAL_H #define QTMULTIMEDIAGLOBAL_H diff --git a/src/multimedia/qtmultimediaglobal_p.h b/src/multimedia/qtmultimediaglobal_p.h index 84361910e..e8ff737a7 100644 --- a/src/multimedia/qtmultimediaglobal_p.h +++ b/src/multimedia/qtmultimediaglobal_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2022 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtMultimedia module 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) 2022 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 QTMULTIMEDIAGLOBAL_P_H #define QTMULTIMEDIAGLOBAL_P_H diff --git a/src/multimedia/recording/qcapturablewindow.cpp b/src/multimedia/recording/qcapturablewindow.cpp new file mode 100644 index 000000000..34b6a1f5d --- /dev/null +++ b/src/multimedia/recording/qcapturablewindow.cpp @@ -0,0 +1,156 @@ +// Copyright (C) 2023 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 "qcapturablewindow.h" +#include "qcapturablewindow_p.h" +#include "qplatformmediaintegration_p.h" + +QT_BEGIN_NAMESPACE + +QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QCapturableWindowPrivate) + +/*! + \class QCapturableWindow + \inmodule QtMultimedia + \ingroup multimedia + \ingroup multimedia_video + \since 6.6 + + \brief Used for getting the basic information of a capturable window. + + The class contains a set of window information, except the method + QCapturableWindow::isValid which pulls the current state + whenever it's called. + + \sa QWindowCapture +*/ +/*! + \qmlvaluetype CapturableWindow + \instantiates QCapturableWindow + \brief The CapturableWindow type is used getting basic + of a window that is available for capturing via WindowCapture. + + \inqmlmodule QtMultimedia + \ingroup multimedia_qml + \ingroup multimedia_video_qml + \since 6.6 + + The class contains a dump of window information, except the property + 'isValid' which pulls the actual window state every time. + + \sa WindowCapture +*/ + +/*! + \fn QCapturableWindow::QCapturableWindow(QCapturableWindow &&other) + + Constructs a QCapturableWindow by moving from \a other. +*/ + +/*! + \fn void QCapturableWindow::swap(QCapturableWindow &other) noexcept + + Swaps the current window information with \a other. +*/ + +/*! + \fn QCapturableWindow &QCapturableWindow::operator=(QCapturableWindow &&other) + + Moves \a other into this QCapturableWindow. +*/ + +/*! + Constructs a null capturable window information that doesn't refer to any window. +*/ +QCapturableWindow::QCapturableWindow() = default; + +/*! + Destroys the window information. + */ +QCapturableWindow::~QCapturableWindow() = default; + +/*! + Construct a new window information using \a other QCapturableWindow. +*/ +QCapturableWindow::QCapturableWindow(const QCapturableWindow &other) = default; + +/*! + Assigns the \a other window information to this QCapturableWindow. +*/ +QCapturableWindow& QCapturableWindow::operator=(const QCapturableWindow &other) = default; + +/*! + \fn bool QCapturableWindow::operator==(const QCapturableWindow &lhs, const QCapturableWindow &rhs) + + Returns \c true if window information \a lhs and \a rhs refer to the same window, + otherwise returns \c false. +*/ + +/*! + \fn bool QCapturableWindow::operator!=(const QCapturableWindow &lhs, const QCapturableWindow &rhs) + + Returns \c true if window information \a lhs and \a rhs refer to different windows, + otherwise returns \c false. +*/ +bool operator==(const QCapturableWindow &lhs, const QCapturableWindow &rhs) noexcept +{ + return lhs.d == rhs.d || (lhs.d && rhs.d && lhs.d->id == rhs.d->id); +} + +/*! + \qmlproperty string QtMultimedia::CapturableWindow::isValid + + This property identifies whether a window information is valid. + + An invalid window information refers to non-existing window or doesn't refer to any one. +*/ + +/*! + Identifies whether a window information is valid. + + An invalid window information refers to non-existing window or doesn't refer to any one. + + Returns true if the window is valid, and false if it is not. +*/ +bool QCapturableWindow::isValid() const +{ + return d && QPlatformMediaIntegration::instance()->isCapturableWindowValid(*d); +} + +/*! + \qmlproperty string QtMultimedia::CapturableWindow::description + + This property holds the description of the reffered window. +*/ + +/*! + Returns a description of the window. In most cases it represents the window title. +*/ +QString QCapturableWindow::description() const +{ + if (!d) + return {}; + + if (d->description.isEmpty() && d->id) + return QLatin1String("Window 0x") + QString::number(d->id, 16); + + return d->description; +} + +QCapturableWindow::QCapturableWindow(QCapturableWindowPrivate *capturablePrivate) + : d(capturablePrivate) +{ +} + +#ifndef QT_NO_DEBUG_STREAM +QDebug operator<<(QDebug dbg, const QCapturableWindow &window) +{ + dbg << QStringLiteral("Capturable window '%1'").arg(window.description()); + return dbg; +} +#endif + + +QT_END_NAMESPACE + +#include "moc_qcapturablewindow.cpp" diff --git a/src/multimedia/recording/qcapturablewindow.h b/src/multimedia/recording/qcapturablewindow.h new file mode 100644 index 000000000..f18dbf72d --- /dev/null +++ b/src/multimedia/recording/qcapturablewindow.h @@ -0,0 +1,66 @@ +// Copyright (C) 2023 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 QCAPTURABLEWINDOW_H +#define QCAPTURABLEWINDOW_H + +#include <QtMultimedia/qtmultimediaglobal.h> +#include <QtCore/qmetatype.h> +#include <QtCore/qshareddata.h> + +QT_BEGIN_NAMESPACE + +class QCapturableWindowPrivate; +QT_DECLARE_QESDP_SPECIALIZATION_DTOR_WITH_EXPORT(QCapturableWindowPrivate, Q_MULTIMEDIA_EXPORT) + +class QMediaCaptureSession; +class QWindowCapturePrivate; + +class QCapturableWindow +{ + Q_GADGET_EXPORT(Q_MULTIMEDIA_EXPORT) + Q_PROPERTY(QString description READ description CONSTANT) + Q_PROPERTY(bool isValid READ isValid CONSTANT) +public: + Q_MULTIMEDIA_EXPORT QCapturableWindow(); + + Q_MULTIMEDIA_EXPORT ~QCapturableWindow(); + + Q_MULTIMEDIA_EXPORT QCapturableWindow(const QCapturableWindow &other); + + QCapturableWindow(QCapturableWindow &&other) noexcept = default; + + Q_MULTIMEDIA_EXPORT QCapturableWindow& operator=(const QCapturableWindow &other); + + QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QCapturableWindow); + + void swap(QCapturableWindow &other) noexcept + { d.swap(other.d); } + + Q_MULTIMEDIA_EXPORT friend bool operator==(const QCapturableWindow &lhs, const QCapturableWindow &rhs) noexcept; + + friend bool operator!=(const QCapturableWindow &lhs, const QCapturableWindow &rhs) noexcept + { return !(lhs == rhs); } + + Q_MULTIMEDIA_EXPORT bool isValid() const; + + Q_MULTIMEDIA_EXPORT QString description() const; + +#ifndef QT_NO_DEBUG_STREAM + Q_MULTIMEDIA_EXPORT friend QDebug operator<<(QDebug, const QCapturableWindow &); +#endif + +private: + Q_MULTIMEDIA_EXPORT QCapturableWindow(QCapturableWindowPrivate *capturablePrivate); + friend class QCapturableWindowPrivate; + + QExplicitlySharedDataPointer<QCapturableWindowPrivate> d; +}; + +Q_DECLARE_SHARED(QCapturableWindow) + +QT_END_NAMESPACE + +Q_DECLARE_METATYPE(QCapturableWindow) + +#endif // QCAPTURABLEWINDOW_H diff --git a/src/multimedia/recording/qcapturablewindow_p.h b/src/multimedia/recording/qcapturablewindow_p.h new file mode 100644 index 000000000..9cb186a77 --- /dev/null +++ b/src/multimedia/recording/qcapturablewindow_p.h @@ -0,0 +1,41 @@ +// Copyright (C) 2023 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 QCAPTURABLEWINDOW_P_H +#define QCAPTURABLEWINDOW_P_H + +#include <QtGui/qwindowdefs.h> +#include <QtCore/QSharedData> +#include <QtMultimedia/qcapturablewindow.h> + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +QT_BEGIN_NAMESPACE + +class QCapturableWindowPrivate : public QSharedData { +public: + using Id = size_t; + + QString description; + Id id = 0; + + static const QCapturableWindowPrivate *handle(const QCapturableWindow &window) + { + return window.d.get(); + } + + QCapturableWindow create() { return QCapturableWindow(this); } +}; + +QT_END_NAMESPACE + +#endif // QCAPTURABLEWINDOW_P_H diff --git a/src/multimedia/recording/qmediacapturesession.cpp b/src/multimedia/recording/qmediacapturesession.cpp index 9860ea65b..9df09acef 100644 --- a/src/multimedia/recording/qmediacapturesession.cpp +++ b/src/multimedia/recording/qmediacapturesession.cpp @@ -1,85 +1,40 @@ -/**************************************************************************** -** -** 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) 2022 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 "qmediacapturesession.h" +#include "qmediacapturesession_p.h" #include "qaudiodevice.h" #include "qcamera.h" #include "qmediarecorder.h" #include "qimagecapture.h" #include "qvideosink.h" - -#include <qpointer.h> +#include "qscreencapture.h" +#include "qwindowcapture.h" +#include "qvideoframeinput.h" #include "qplatformmediaintegration_p.h" #include "qplatformmediacapture_p.h" #include "qaudioinput.h" +#include "qaudiobufferinput.h" #include "qaudiooutput.h" QT_BEGIN_NAMESPACE -class QMediaCaptureSessionPrivate +void QMediaCaptureSessionPrivate::setVideoSink(QVideoSink *sink) { -public: - QMediaCaptureSession *q = nullptr; - QPlatformMediaCaptureSession *captureSession; - QAudioInput *audioInput = nullptr; - QAudioOutput *audioOutput = nullptr; - QCamera *camera = nullptr; - QImageCapture *imageCapture = nullptr; - QMediaRecorder *recorder = nullptr; - QVideoSink *videoSink = nullptr; - QPointer<QObject> videoOutput; - - void setVideoSink(QVideoSink *sink) - { - if (sink == videoSink) - return; - if (videoSink) - videoSink->setSource(nullptr); - videoSink = sink; - if (sink) - sink->setSource(q); - captureSession->setVideoPreview(sink); - emit q->videoOutputChanged(); - } + Q_Q(QMediaCaptureSession); -}; + if (sink == videoSink) + return; + if (videoSink) + videoSink->setSource(nullptr); + videoSink = sink; + if (sink) + sink->setSource(q); + if (captureSession) + captureSession->setVideoPreview(sink); + emit q->videoOutputChanged(); +} /*! \class QMediaCaptureSession @@ -90,16 +45,23 @@ public: \ingroup multimedia_video \ingroup multimedia_audio - The QMediaCaptureSession is the central class that manages capturing of media on the local device. + The QMediaCaptureSession is the central class that manages capturing of media on the local + device. - You can connect a camera and a microphone to QMediaCaptureSession using setCamera() and setAudioInput(). - A preview of the captured media can be seen by setting a QVideoSink of QVideoWidget using setVideoOutput() - and heard by routing the audio to an output device using setAudioOutput(). + You can connect a video input to QMediaCaptureSession using setCamera(), + setScreenCapture(), setWindowCapture() or setVideoFrameInput(). + A preview of the captured media can be seen by setting a QVideoWidget or QGraphicsVideoItem + using setVideoOutput(). - You can capture still images from a camera by setting a QImageCapture object on the capture session, - and record audio/video using a QMediaRecorder. + You can connect a microphone to QMediaCaptureSession using setAudioInput(), or set your + custom audio input using setAudioBufferInput(). + The captured sound can be heard by routing the audio to an output device using setAudioOutput(). - \sa QCamera, QAudioDevice, QMediaRecorder, QImageCapture, QMediaRecorder + You can capture still images from a camera by setting a QImageCapture object on the capture + session, and record audio/video using a QMediaRecorder. + + \sa QCamera, QAudioDevice, QMediaRecorder, QImageCapture, QScreenCapture, QWindowCapture, + QVideoFrameInput, QMediaRecorder, QGraphicsVideoItem */ /*! @@ -118,6 +80,12 @@ public: Connect a camera and a microphone to a CaptureSession by assigning Camera and AudioInput objects to the relevant properties. + Capture a screen by connecting a ScreenCapture object to + the screenCapture property. + + Capture a window by connecting a WindowCapture object to + the windowCapture property. + Enable a preview of the captured media by assigning a VideoOutput element to the videoOutput property. @@ -146,20 +114,26 @@ public: } \endqml - \sa Camera, MediaDevices, MediaRecorder, ImageCapture, AudioInput, VideoOutput + \sa Camera, MediaDevices, MediaRecorder, ImageCapture, ScreenCapture, WindowCapture, AudioInput, VideoOutput */ /*! Creates a session for media capture from the \a parent object. */ QMediaCaptureSession::QMediaCaptureSession(QObject *parent) - : QObject(parent), - d_ptr(new QMediaCaptureSessionPrivate) + : QObject{ *new QMediaCaptureSessionPrivate, parent } { - d_ptr->q = this; - d_ptr->captureSession = QPlatformMediaIntegration::instance()->createCaptureSession(); - d_ptr->captureSession->setCaptureSession(this); - Q_ASSERT(d_ptr->captureSession); + QT6_ONLY(Q_UNUSED(unused)) + + Q_D(QMediaCaptureSession); + + auto maybeCaptureSession = QPlatformMediaIntegration::instance()->createCaptureSession(); + if (maybeCaptureSession) { + d->captureSession.reset(maybeCaptureSession.value()); + d->captureSession->setCaptureSession(this); + } else { + qWarning() << "Failed to initialize QMediaCaptureSession" << maybeCaptureSession.error(); + } } /*! @@ -167,14 +141,19 @@ QMediaCaptureSession::QMediaCaptureSession(QObject *parent) */ QMediaCaptureSession::~QMediaCaptureSession() { + Q_D(QMediaCaptureSession); + setCamera(nullptr); setRecorder(nullptr); setImageCapture(nullptr); + setScreenCapture(nullptr); + setWindowCapture(nullptr); + setVideoFrameInput(nullptr); + setAudioBufferInput(nullptr); setAudioInput(nullptr); setAudioOutput(nullptr); - d_ptr->setVideoSink(nullptr); - delete d_ptr->captureSession; - delete d_ptr; + d->setVideoSink(nullptr); + d->captureSession.reset(); } /*! \qmlproperty AudioInput QtMultimedia::CaptureSession::audioInput @@ -183,11 +162,14 @@ QMediaCaptureSession::~QMediaCaptureSession() */ /*! + \property QMediaCaptureSession::audioInput + Returns the device that is being used to capture audio. */ QAudioInput *QMediaCaptureSession::audioInput() const { - return d_ptr->audioInput; + Q_D(const QMediaCaptureSession); + return d->audioInput; } /*! @@ -197,21 +179,69 @@ QAudioInput *QMediaCaptureSession::audioInput() const */ void QMediaCaptureSession::setAudioInput(QAudioInput *input) { - QAudioInput *oldInput = d_ptr->audioInput; + Q_D(QMediaCaptureSession); + + QAudioInput *oldInput = d->audioInput; if (oldInput == input) return; - d_ptr->audioInput = input; - d_ptr->captureSession->setAudioInput(nullptr); + + // To avoid double emit of audioInputChanged + // from recursive setAudioInput(nullptr) call. + d->audioInput = nullptr; + + if (d->captureSession) + d->captureSession->setAudioInput(nullptr); if (oldInput) oldInput->setDisconnectFunction({}); if (input) { input->setDisconnectFunction([this](){ setAudioInput(nullptr); }); - d_ptr->captureSession->setAudioInput(input->handle()); + if (d->captureSession) + d->captureSession->setAudioInput(input->handle()); } + d->audioInput = input; emit audioInputChanged(); } /*! + \property QMediaCaptureSession::audioBufferInput + \since 6.8 + + \brief The object used to send custom audio buffers to \l QMediaRecorder. +*/ +QAudioBufferInput *QMediaCaptureSession::audioBufferInput() const +{ + Q_D(const QMediaCaptureSession); + + return d->audioBufferInput; +} + +void QMediaCaptureSession::setAudioBufferInput(QAudioBufferInput *input) +{ + Q_D(QMediaCaptureSession); + + // TODO: come up with an unification of the captures setup + QAudioBufferInput *oldInput = d->audioBufferInput; + if (oldInput == input) + return; + d->audioBufferInput = input; + if (d->captureSession) + d->captureSession->setAudioBufferInput(nullptr); + if (oldInput) { + if (oldInput->captureSession() && oldInput->captureSession() != this) + oldInput->captureSession()->setAudioBufferInput(nullptr); + oldInput->setCaptureSession(nullptr); + } + if (input) { + if (input->captureSession()) + input->captureSession()->setAudioBufferInput(nullptr); + if (d->captureSession) + d->captureSession->setAudioBufferInput(input->platformAudioBufferInput()); + input->setCaptureSession(this); + } + emit audioBufferInputChanged(); +} + +/*! \qmlproperty Camera QtMultimedia::CaptureSession::camera \brief The camera used to capture video. @@ -226,20 +256,26 @@ void QMediaCaptureSession::setAudioInput(QAudioInput *input) \brief The camera used to capture video. Record video or take images by adding a camera to the capture session - using this property, + using this property. */ QCamera *QMediaCaptureSession::camera() const { - return d_ptr->camera; + Q_D(const QMediaCaptureSession); + + return d->camera; } void QMediaCaptureSession::setCamera(QCamera *camera) { - QCamera *oldCamera = d_ptr->camera; + Q_D(QMediaCaptureSession); + + // TODO: come up with an unification of the captures setup + QCamera *oldCamera = d->camera; if (oldCamera == camera) return; - d_ptr->camera = camera; - d_ptr->captureSession->setCamera(nullptr); + d->camera = camera; + if (d->captureSession) + d->captureSession->setCamera(nullptr); if (oldCamera) { if (oldCamera->captureSession() && oldCamera->captureSession() != this) oldCamera->captureSession()->setCamera(nullptr); @@ -248,11 +284,154 @@ void QMediaCaptureSession::setCamera(QCamera *camera) if (camera) { if (camera->captureSession()) camera->captureSession()->setCamera(nullptr); - d_ptr->captureSession->setCamera(camera->platformCamera()); + if (d->captureSession) + d->captureSession->setCamera(camera->platformCamera()); camera->setCaptureSession(this); } emit cameraChanged(); } + +/*! + \qmlproperty ScreenCapture QtMultimedia::CaptureSession::screenCapture + \since 6.5 + + \brief The object used to capture a screen. + + Record a screen by adding a screen capture objet + to the capture session using this property. +*/ + +/*! + \property QMediaCaptureSession::screenCapture + \since 6.5 + + \brief The object used to capture a screen. + + Record a screen by adding a screen capture object + to the capture session using this property. +*/ +QScreenCapture *QMediaCaptureSession::screenCapture() +{ + Q_D(QMediaCaptureSession); + + return d->screenCapture; +} + +void QMediaCaptureSession::setScreenCapture(QScreenCapture *screenCapture) +{ + Q_D(QMediaCaptureSession); + + // TODO: come up with an unification of the captures setup + QScreenCapture *oldScreenCapture = d->screenCapture; + if (oldScreenCapture == screenCapture) + return; + d->screenCapture = screenCapture; + if (d->captureSession) + d->captureSession->setScreenCapture(nullptr); + if (oldScreenCapture) { + if (oldScreenCapture->captureSession() && oldScreenCapture->captureSession() != this) + oldScreenCapture->captureSession()->setScreenCapture(nullptr); + oldScreenCapture->setCaptureSession(nullptr); + } + if (screenCapture) { + if (screenCapture->captureSession()) + screenCapture->captureSession()->setScreenCapture(nullptr); + if (d->captureSession) + d->captureSession->setScreenCapture(screenCapture->platformScreenCapture()); + screenCapture->setCaptureSession(this); + } + emit screenCaptureChanged(); +} + +/*! + \qmlproperty WindowCapture QtMultimedia::CaptureSession::windowCapture + \since 6.6 + + \brief The object used to capture a window. + + Record a window by adding a window capture object + to the capture session using this property. +*/ + +/*! + \property QMediaCaptureSession::windowCapture + \since 6.6 + + \brief The object used to capture a window. + + Record a window by adding a window capture objet + to the capture session using this property. +*/ +QWindowCapture *QMediaCaptureSession::windowCapture() +{ + Q_D(QMediaCaptureSession); + return d->windowCapture; +} + +void QMediaCaptureSession::setWindowCapture(QWindowCapture *windowCapture) +{ + Q_D(QMediaCaptureSession); + + // TODO: come up with an unification of the captures setup + QWindowCapture *oldCapture = d->windowCapture; + if (oldCapture == windowCapture) + return; + d->windowCapture = windowCapture; + if (d->captureSession) + d->captureSession->setWindowCapture(nullptr); + if (oldCapture) { + if (oldCapture->captureSession() && oldCapture->captureSession() != this) + oldCapture->captureSession()->setWindowCapture(nullptr); + oldCapture->setCaptureSession(nullptr); + } + if (windowCapture) { + if (windowCapture->captureSession()) + windowCapture->captureSession()->setWindowCapture(nullptr); + if (d->captureSession) + d->captureSession->setWindowCapture(windowCapture->platformWindowCapture()); + windowCapture->setCaptureSession(this); + } + emit windowCaptureChanged(); +} + +/*! + \property QMediaCaptureSession::videoFrameInput + \since 6.8 + + \brief The object used to send custom video frames to + \l QMediaRecorder or a video output. +*/ +QVideoFrameInput *QMediaCaptureSession::videoFrameInput() const +{ + Q_D(const QMediaCaptureSession); + return d->videoFrameInput; +} + +void QMediaCaptureSession::setVideoFrameInput(QVideoFrameInput *input) +{ + Q_D(QMediaCaptureSession); + // TODO: come up with an unification of the captures setup + QVideoFrameInput *oldInput = d->videoFrameInput; + if (oldInput == input) + return; + d->videoFrameInput = input; + if (d->captureSession) + d->captureSession->setVideoFrameInput(nullptr); + if (oldInput) { + if (oldInput->captureSession() && oldInput->captureSession() != this) + oldInput->captureSession()->setVideoFrameInput(nullptr); + oldInput->setCaptureSession(nullptr); + } + if (input) { + if (input->captureSession()) + input->captureSession()->setVideoFrameInput(nullptr); + if (d->captureSession) + d->captureSession->setVideoFrameInput(input->platformVideoFrameInput()); + input->setCaptureSession(this); + } + emit videoFrameInputChanged(); +} + /*! \qmlproperty ImageCapture QtMultimedia::CaptureSession::imageCapture @@ -271,16 +450,22 @@ void QMediaCaptureSession::setCamera(QCamera *camera) */ QImageCapture *QMediaCaptureSession::imageCapture() { - return d_ptr->imageCapture; + Q_D(QMediaCaptureSession); + + return d->imageCapture; } void QMediaCaptureSession::setImageCapture(QImageCapture *imageCapture) { - QImageCapture *oldImageCapture = d_ptr->imageCapture; + Q_D(QMediaCaptureSession); + + // TODO: come up with an unification of the captures setup + QImageCapture *oldImageCapture = d->imageCapture; if (oldImageCapture == imageCapture) return; - d_ptr->imageCapture = imageCapture; - d_ptr->captureSession->setImageCapture(nullptr); + d->imageCapture = imageCapture; + if (d->captureSession) + d->captureSession->setImageCapture(nullptr); if (oldImageCapture) { if (oldImageCapture->captureSession() && oldImageCapture->captureSession() != this) oldImageCapture->captureSession()->setImageCapture(nullptr); @@ -289,7 +474,8 @@ void QMediaCaptureSession::setImageCapture(QImageCapture *imageCapture) if (imageCapture) { if (imageCapture->captureSession()) imageCapture->captureSession()->setImageCapture(nullptr); - d_ptr->captureSession->setImageCapture(imageCapture->platformImageCapture()); + if (d->captureSession) + d->captureSession->setImageCapture(imageCapture->platformImageCapture()); imageCapture->setCaptureSession(this); } emit imageCaptureChanged(); @@ -313,16 +499,19 @@ void QMediaCaptureSession::setImageCapture(QImageCapture *imageCapture) QMediaRecorder *QMediaCaptureSession::recorder() { - return d_ptr->recorder; + Q_D(QMediaCaptureSession); + return d->recorder; } void QMediaCaptureSession::setRecorder(QMediaRecorder *recorder) { - QMediaRecorder *oldRecorder = d_ptr->recorder; + Q_D(QMediaCaptureSession); + QMediaRecorder *oldRecorder = d->recorder; if (oldRecorder == recorder) return; - d_ptr->recorder = recorder; - d_ptr->captureSession->setMediaRecorder(nullptr); + d->recorder = recorder; + if (d->captureSession) + d->captureSession->setMediaRecorder(nullptr); if (oldRecorder) { if (oldRecorder->captureSession() && oldRecorder->captureSession() != this) oldRecorder->captureSession()->setRecorder(nullptr); @@ -331,7 +520,8 @@ void QMediaCaptureSession::setRecorder(QMediaRecorder *recorder) if (recorder) { if (recorder->captureSession()) recorder->captureSession()->setRecorder(nullptr); - d_ptr->captureSession->setMediaRecorder(recorder->platformRecoder()); + if (d->captureSession) + d->captureSession->setMediaRecorder(recorder->platformRecoder()); recorder->setCaptureSession(this); } emit recorderChanged(); @@ -347,6 +537,11 @@ void QMediaCaptureSession::setRecorder(QMediaRecorder *recorder) The previously set preview is detached. */ +/*! + \property QMediaCaptureSession::videoOutput + + Returns the video output for the session. +*/ QObject *QMediaCaptureSession::videoOutput() const { Q_D(const QMediaCaptureSession); @@ -388,6 +583,10 @@ void QMediaCaptureSession::setVideoSink(QVideoSink *sink) d->videoOutput = nullptr; d->setVideoSink(sink); } + +/*! + Returns the QVideoSink for the session. +*/ QVideoSink *QMediaCaptureSession::videoSink() const { Q_D(const QMediaCaptureSession); @@ -395,25 +594,45 @@ QVideoSink *QMediaCaptureSession::videoSink() const } /*! Sets the audio output device to \a{output}. + + Setting an audio output device enables audio routing from an audio input device. */ void QMediaCaptureSession::setAudioOutput(QAudioOutput *output) { - QAudioOutput *oldOutput = d_ptr->audioOutput; + Q_D(QMediaCaptureSession); + + QAudioOutput *oldOutput = d->audioOutput; if (oldOutput == output) return; - d_ptr->audioOutput = output; - d_ptr->captureSession->setAudioOutput(nullptr); + + // We don't want to end up with signal emitted + // twice (from recursive call setAudioInput(nullptr) + // from oldOutput->setDisconnectFunction(): + d->audioOutput = nullptr; + + if (d->captureSession) + d->captureSession->setAudioOutput(nullptr); if (oldOutput) oldOutput->setDisconnectFunction({}); if (output) { output->setDisconnectFunction([this](){ setAudioOutput(nullptr); }); - d_ptr->captureSession->setAudioOutput(output->handle()); + if (d->captureSession) + d->captureSession->setAudioOutput(output->handle()); } + d->audioOutput = output; emit audioOutputChanged(); } /*! \qmlproperty AudioOutput QtMultimedia::CaptureSession::audioOutput \brief The audio output device for the capture session. + + Add an AudioOutput device to the capture session to enable + audio routing from an AudioInput device. +*/ +/*! + \property QMediaCaptureSession::audioOutput + + Returns the audio output for the session. */ QAudioOutput *QMediaCaptureSession::audioOutput() const { @@ -426,7 +645,8 @@ QAudioOutput *QMediaCaptureSession::audioOutput() const */ QPlatformMediaCaptureSession *QMediaCaptureSession::platformSession() const { - return d_ptr->captureSession; + Q_D(const QMediaCaptureSession); + return d->captureSession.get(); } /*! \qmlsignal QtMultimedia::CaptureSession::audioInputChanged() diff --git a/src/multimedia/recording/qmediacapturesession.h b/src/multimedia/recording/qmediacapturesession.h index 77a16395d..219c382d1 100644 --- a/src/multimedia/recording/qmediacapturesession.h +++ b/src/multimedia/recording/qmediacapturesession.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 QMEDIACAPTURESESSION_H #define QMEDIACAPTURESESSION_H @@ -47,20 +11,32 @@ QT_BEGIN_NAMESPACE class QCamera; class QAudioInput; +class QAudioBufferInput; class QAudioOutput; class QCameraDevice; class QImageCapture; class QMediaRecorder; class QPlatformMediaCaptureSession; class QVideoSink; +class QScreenCapture; +class QWindowCapture; +class QVideoFrameInput; class QMediaCaptureSessionPrivate; class Q_MULTIMEDIA_EXPORT QMediaCaptureSession : public QObject { Q_OBJECT Q_PROPERTY(QAudioInput *audioInput READ audioInput WRITE setAudioInput NOTIFY audioInputChanged) + Q_PROPERTY(QAudioBufferInput *audioBufferInput READ audioBufferInput WRITE setAudioBufferInput + NOTIFY audioBufferInputChanged) Q_PROPERTY(QAudioOutput *audioOutput READ audioOutput WRITE setAudioOutput NOTIFY audioOutputChanged) Q_PROPERTY(QCamera *camera READ camera WRITE setCamera NOTIFY cameraChanged) + Q_PROPERTY( + QScreenCapture *screenCapture READ screenCapture WRITE setScreenCapture NOTIFY screenCaptureChanged) + Q_PROPERTY( + QWindowCapture *windowCapture READ windowCapture WRITE setWindowCapture NOTIFY windowCaptureChanged) + Q_PROPERTY(QVideoFrameInput *videoFrameInput READ videoFrameInput WRITE setVideoFrameInput + NOTIFY videoFrameInputChanged) Q_PROPERTY(QImageCapture *imageCapture READ imageCapture WRITE setImageCapture NOTIFY imageCaptureChanged) Q_PROPERTY(QMediaRecorder *recorder READ recorder WRITE setRecorder NOTIFY recorderChanged) Q_PROPERTY(QObject *videoOutput READ videoOutput WRITE setVideoOutput NOTIFY videoOutputChanged) @@ -71,12 +47,24 @@ public: QAudioInput *audioInput() const; void setAudioInput(QAudioInput *input); + QAudioBufferInput *audioBufferInput() const; + void setAudioBufferInput(QAudioBufferInput *input); + QCamera *camera() const; void setCamera(QCamera *camera); QImageCapture *imageCapture(); void setImageCapture(QImageCapture *imageCapture); + QScreenCapture *screenCapture(); + void setScreenCapture(QScreenCapture *screenCapture); + + QWindowCapture *windowCapture(); + void setWindowCapture(QWindowCapture *windowCapture); + + QVideoFrameInput *videoFrameInput() const; + void setVideoFrameInput(QVideoFrameInput *input); + QMediaRecorder *recorder(); void setRecorder(QMediaRecorder *recorder); @@ -93,14 +81,22 @@ public: Q_SIGNALS: void audioInputChanged(); + void audioBufferInputChanged(); void cameraChanged(); + void screenCaptureChanged(); + void windowCaptureChanged(); + void videoFrameInputChanged(); void imageCaptureChanged(); void recorderChanged(); void videoOutputChanged(); void audioOutputChanged(); private: - QMediaCaptureSessionPrivate *d_ptr; + friend class QPlatformMediaCaptureSession; + + // ### Qt7: remove unused member + QT6_ONLY(void *unused = nullptr;) // for ABI compatibility + Q_DISABLE_COPY(QMediaCaptureSession) Q_DECLARE_PRIVATE(QMediaCaptureSession) }; diff --git a/src/multimedia/recording/qmediacapturesession_p.h b/src/multimedia/recording/qmediacapturesession_p.h new file mode 100644 index 000000000..cba222993 --- /dev/null +++ b/src/multimedia/recording/qmediacapturesession_p.h @@ -0,0 +1,53 @@ +// Copyright (C) 2024 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 QMEDIACAPTURESESSION_P_H +#define QMEDIACAPTURESESSION_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtMultimedia/qmediacapturesession.h> + +#include <QtCore/qpointer.h> +#include <QtCore/private/qobject_p.h> + +QT_BEGIN_NAMESPACE + +class QMediaCaptureSessionPrivate : public QObjectPrivate +{ +public: + static QMediaCaptureSessionPrivate *get(QMediaCaptureSession *session) + { + return reinterpret_cast<QMediaCaptureSessionPrivate *>(QObjectPrivate::get(session)); + } + + Q_DECLARE_PUBLIC(QMediaCaptureSession) + + std::unique_ptr<QPlatformMediaCaptureSession> captureSession; + QAudioInput *audioInput = nullptr; + QPointer<QAudioBufferInput> audioBufferInput; + QAudioOutput *audioOutput = nullptr; + QPointer<QCamera> camera; + QPointer<QScreenCapture> screenCapture; + QPointer<QWindowCapture> windowCapture; + QPointer<QVideoFrameInput> videoFrameInput; + QPointer<QImageCapture> imageCapture; + QPointer<QMediaRecorder> recorder; + QPointer<QVideoSink> videoSink; + QPointer<QObject> videoOutput; + + void setVideoSink(QVideoSink *sink); +}; + +QT_END_NAMESPACE + +#endif // QMEDIACAPTURESESSION_P_H diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp index 2921d7f4f..ea38b231a 100644 --- a/src/multimedia/recording/qmediarecorder.cpp +++ b/src/multimedia/recording/qmediarecorder.cpp @@ -1,49 +1,16 @@ -/**************************************************************************** -** -** 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 #include "qmediarecorder_p.h" #include <private/qplatformmediarecorder_p.h> #include <qaudiodevice.h> #include <qcamera.h> +#include <qscreencapture.h> +#include <qwindowcapture.h> #include <qmediacapturesession.h> #include <private/qplatformcamera_p.h> +#include <private/qplatformsurfacecapture_p.h> #include <private/qplatformmediaintegration_p.h> #include <private/qplatformmediacapture_p.h> @@ -94,6 +61,7 @@ QT_BEGIN_NAMESPACE id: captureSession camera: Camera { id: camera + active: true } audioInput: AudioInput {} recorder: MediaRecorder { @@ -106,14 +74,14 @@ QT_BEGIN_NAMESPACE \qml CameraButton { text: "Record" - visible: recorder.status !== MediaRecorder.RecordingStatus + visible: recorder.recorderState !== MediaRecorder.RecordingState onClicked: recorder.record() } CameraButton { id: stopButton text: "Stop" - visible: recorder.status === MediaRecorder.RecordingStatus + visible: recorder.recorderState === MediaRecorder.RecordingState onClicked: recorder.stop() } \endqml @@ -142,8 +110,22 @@ QMediaRecorder::QMediaRecorder(QObject *parent) d_ptr(new QMediaRecorderPrivate) { Q_D(QMediaRecorder); + + auto &mediaIntegration = *QPlatformMediaIntegration::instance(); + d->q_ptr = this; - d->control = QPlatformMediaIntegration::instance()->createRecorder(this); + auto maybeControl = mediaIntegration.createRecorder(this); + if (maybeControl) { + // The first format info initialization may take some time, + // for users it seems to be more suitable to have a delay on the object construction + // rather than on QMediaRecorder::record + mediaIntegration.formatInfo(); + + d->control = maybeControl.value(); + } else { + d->initErrorMessage = maybeControl.error(); + qWarning() << "Failed to initialize QMediaRecorder" << maybeControl.error(); + } } /*! @@ -217,17 +199,11 @@ void QMediaRecorder::setCaptureSession(QMediaCaptureSession *session) */ /*! - \qmlproperty bool QtMultimedia::MediaRecorder::isAvailable - \brief This property holds whether the recorder service is ready to use. - - Returns \c true if media recorder service ready to use. -*/ -/*! Returns \c true if media recorder service ready to use. */ bool QMediaRecorder::isAvailable() const { - return d_func()->control != nullptr && d_func()->captureSession; + return d_func()->control && d_func()->captureSession; } QUrl QMediaRecorder::outputLocation() const @@ -239,7 +215,7 @@ void QMediaRecorder::setOutputLocation(const QUrl &location) { Q_D(QMediaRecorder); if (!d->control) { - emit errorOccurred(QMediaRecorder::ResourceError, tr("Not available")); + emit errorOccurred(QMediaRecorder::ResourceError, d->initErrorMessage); return; } d->control->setOutputLocation(location); @@ -248,6 +224,35 @@ void QMediaRecorder::setOutputLocation(const QUrl &location) emit errorOccurred(QMediaRecorder::LocationNotWritable, tr("Output location not writable")); } +/*! + Set the output IO device for media content. + + The \a device must have been opened in the \l{QIODevice::WriteOnly}{WriteOnly} or + \l{QIODevice::ReadWrite}{ReadWrite} modes before the recording starts. + + The media recorder doesn't take ownership of the specified \a device. + If the recording has been started, the device must be kept alive and open until + the signal \c recorderStateChanged(StoppedState) is emitted. + + \sa outputDevice() +*/ +void QMediaRecorder::setOutputDevice(QIODevice *device) +{ + Q_D(QMediaRecorder); + d->control->setOutputDevice(device); +} + +/*! + Returns the output IO device for media content. + + \sa setOutputDevice() +*/ +QIODevice *QMediaRecorder::outputDevice() const +{ + Q_D(const QMediaRecorder); + return d->control->outputDevice(); +} + QUrl QMediaRecorder::actualLocation() const { Q_D(const QMediaRecorder); @@ -266,6 +271,8 @@ QMediaRecorder::RecorderState QMediaRecorder::recorderState() const } /*! + \property QMediaRecorder::error + Returns the current error state. \sa errorString() @@ -284,6 +291,8 @@ QMediaRecorder::Error QMediaRecorder::error() const \sa error */ /*! + \property QMediaRecorder::errorString + Returns a string describing the current error state. \sa error() @@ -293,7 +302,7 @@ QString QMediaRecorder::errorString() const { Q_D(const QMediaRecorder); - return d->control ? d->control->errorString() : tr("QMediaRecorder not supported on this platform"); + return d->control ? d->control->errorString() : d->initErrorMessage; } /*! \qmlproperty qint64 QtMultimedia::MediaRecorder::duration @@ -312,6 +321,11 @@ qint64 QMediaRecorder::duration() const return d_func()->control ? d_func()->control->duration() : 0; } /*! + \fn void QMediaRecorder::encoderSettingsChanged() + + Signals when the encoder settings change. +*/ +/*! \qmlmethod QtMultimedia::MediaRecorder::record() \brief Starts recording. @@ -349,17 +363,18 @@ void QMediaRecorder::record() { Q_D(QMediaRecorder); - if (!d->control || ! d->captureSession) + if (!d->control || !d->captureSession) return; if (d->control->state() == QMediaRecorder::PausedState) { d->control->resume(); } else { auto oldMediaFormat = d->encoderSettings.mediaFormat(); - auto camera = d->captureSession->camera(); - auto flags = camera && camera->isActive() ? QMediaFormat::RequiresVideo - : QMediaFormat::NoFlags; - d->encoderSettings.resolveFormat(flags); + + auto platformSession = d->captureSession->platformSession(); + const bool hasVideo = platformSession && !platformSession->activeVideoSources().empty(); + + d->encoderSettings.resolveFormat(hasVideo ? QMediaFormat::RequiresVideo : QMediaFormat::NoFlags); d->control->clearActualLocation(); d->control->clearError(); @@ -526,6 +541,8 @@ void QMediaRecorder::stop() */ /*! + \property QMediaRecorder::metaData + Returns the metaData associated with the recording. */ QMediaMetaData QMediaRecorder::metaData() const @@ -549,14 +566,54 @@ void QMediaRecorder::setMetaData(const QMediaMetaData &metaData) d->control->setMetaData(metaData); } +/*! + Adds \a metaData to the recorded media. +*/ void QMediaRecorder::addMetaData(const QMediaMetaData &metaData) { auto data = this->metaData(); // merge data - for (const auto &k : metaData.keys()) - data.insert(k, metaData.value(k)); + for (auto &&[key, value] : metaData.asKeyValueRange()) + data.insert(key, value); setMetaData(data); } + +/*! + \property QMediaRecorder::autoStop + + This property controls whether the media recorder stops automatically when + all media inputs have reported the end of the stream or have been deactivated. + + The end of the stream is reported by sending an empty media frame, + which you can send explicitly via \l QVideoFrameInput or \l QAudioBufferInput. + + Video inputs, specificly, \l QCamera, \l QScreenCapture and \l QWindowCapture, + can be deactivated via the function \c setActive. + + Defaults to \c false. + + \sa QCamera, QScreenCapture, QWindowCapture +*/ + +bool QMediaRecorder::autoStop() const +{ + Q_D(const QMediaRecorder); + + return d->autoStop; +} + +void QMediaRecorder::setAutoStop(bool autoStop) +{ + Q_D(QMediaRecorder); + + if (d->autoStop == autoStop) + return; + + d->autoStop = autoStop; + d->control->updateAutoStop(); + emit autoStopChanged(); +} + /*! \qmlsignal QtMultimedia::MediaRecorder::metaDataChanged() @@ -574,6 +631,9 @@ void QMediaRecorder::addMetaData(const QMediaMetaData &metaData) once. */ +/*! + Returns the media capture session. +*/ QMediaCaptureSession *QMediaRecorder::captureSession() const { Q_D(const QMediaRecorder); @@ -622,7 +682,11 @@ QMediaCaptureSession *QMediaRecorder::captureSession() const \brief This property holds the current MediaFormat of the recorder. */ +/*! + \property QMediaRecorder::mediaFormat + Returns the recording media format. +*/ QMediaFormat QMediaRecorder::mediaFormat() const { Q_D(const QMediaRecorder); @@ -639,6 +703,14 @@ void QMediaRecorder::setMediaFormat(const QMediaFormat &format) } /*! + + \qmlproperty enumeration QtMultimedia::MediaRecorder::encodingMode + \since 6.6 + \brief This property holds the encoding mode. + \sa QMediaRecorder::EncodingMode +*/ + +/*! Returns the encoding mode. \sa EncodingMode @@ -650,6 +722,11 @@ QMediaRecorder::EncodingMode QMediaRecorder::encodingMode() const } /*! + \fn void QMediaRecorder::encodingModeChanged() + + Signals when the encoding mode changes. +*/ +/*! Sets the encoding \a mode setting. If ConstantQualityEncoding is set, the quality @@ -667,12 +744,22 @@ void QMediaRecorder::setEncodingMode(EncodingMode mode) emit encodingModeChanged(); } +/*! + \property QMediaRecorder::quality + + Returns the recording quality. +*/ QMediaRecorder::Quality QMediaRecorder::quality() const { Q_D(const QMediaRecorder); return d->encoderSettings.quality(); } +/*! + \fn void QMediaRecorder::qualityChanged() + + Signals when the recording quality changes. +*/ void QMediaRecorder::setQuality(Quality quality) { Q_D(QMediaRecorder); @@ -682,6 +769,15 @@ void QMediaRecorder::setQuality(Quality quality) emit qualityChanged(); } +/*! + \qmlproperty Size QtMultimedia::MediaRecorder::videoResolution + \since 6.6 + \brief This property holds the resolution of the encoded video. + + Set an empty Size to make the recorder choose an optimal resolution based + on what is available from the video source and the limitations of the codec. +*/ + /*! Returns the resolution of the encoded video. @@ -693,6 +789,11 @@ QSize QMediaRecorder::videoResolution() const } /*! + \fn void QMediaRecorder::videoResolutionChanged() + + Signals when the video recording resolution changes. +*/ +/*! Sets the resolution of the encoded video to \a{size}. Pass an empty QSize to make the recorder choose an optimal resolution based @@ -715,6 +816,15 @@ void QMediaRecorder::setVideoResolution(const QSize &size) */ /*! + \qmlproperty real QtMultimedia::MediaRecorder::videoFrameRate + \since 6.6 + \brief This property holds the video frame rate. + + A value of 0 indicates the recorder should make an optimal choice based on what is available + from the video source and the limitations of the codec. +*/ + +/*! Returns the video frame rate. */ qreal QMediaRecorder::videoFrameRate() const @@ -724,6 +834,11 @@ qreal QMediaRecorder::videoFrameRate() const } /*! + \fn void QMediaRecorder::videoFrameRateChanged() + + Signals when the recording video frame rate changes. +*/ +/*! Sets the video \a frameRate. A value of 0 indicates the recorder should make an optimal choice based on what is available @@ -739,6 +854,12 @@ void QMediaRecorder::setVideoFrameRate(qreal frameRate) } /*! + \qmlproperty int QtMultimedia::MediaRecorder::videoBitRate + \since 6.6 + \brief This property holds the bit rate of the compressed video stream in bits per second. +*/ + +/*! Returns the bit rate of the compressed video stream in bits per second. */ int QMediaRecorder::videoBitRate() const @@ -748,6 +869,11 @@ int QMediaRecorder::videoBitRate() const } /*! + \fn void QMediaRecorder::videoBitRateChanged() + + Signals when the recording video bit rate changes. +*/ +/*! Sets the video \a bitRate in bits per second. */ void QMediaRecorder::setVideoBitRate(int bitRate) @@ -760,6 +886,12 @@ void QMediaRecorder::setVideoBitRate(int bitRate) } /*! + \qmlproperty int QtMultimedia::MediaRecorder::audioBitRate + \since 6.6 + \brief This property holds the bit rate of the compressed audio stream in bits per second. +*/ + +/*! Returns the bit rate of the compressed audio stream in bits per second. */ int QMediaRecorder::audioBitRate() const @@ -769,6 +901,11 @@ int QMediaRecorder::audioBitRate() const } /*! + \fn void QMediaRecorder::audioBitRateChanged() + + Signals when the recording audio bit rate changes. +*/ +/*! Sets the audio \a bitRate in bits per second. */ void QMediaRecorder::setAudioBitRate(int bitRate) @@ -781,6 +918,12 @@ void QMediaRecorder::setAudioBitRate(int bitRate) } /*! + \qmlproperty int QtMultimedia::MediaRecorder::audioChannelCount + \since 6.6 + \brief This property holds the number of audio channels. +*/ + +/*! Returns the number of audio channels. */ int QMediaRecorder::audioChannelCount() const @@ -790,6 +933,11 @@ int QMediaRecorder::audioChannelCount() const } /*! + \fn void QMediaRecorder::audioChannelCountChanged() + + Signals when the recording audio channel count changes. +*/ +/*! Sets the number of audio \a channels. A value of -1 indicates the recorder should make an optimal choice based on @@ -805,6 +953,12 @@ void QMediaRecorder::setAudioChannelCount(int channels) } /*! + \qmlproperty int QtMultimedia::MediaRecorder::audioSampleRate + \since 6.6 + \brief This property holds the audio sample rate in Hz. +*/ + +/*! Returns the audio sample rate in Hz. */ int QMediaRecorder::audioSampleRate() const @@ -812,7 +966,11 @@ int QMediaRecorder::audioSampleRate() const Q_D(const QMediaRecorder); return d->encoderSettings.audioSampleRate(); } +/*! + \fn void QMediaRecorder::audioSampleRateChanged() + Signals when the recording audio sample rate changes. +*/ /*! Sets the audio \a sampleRate in Hz. diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h index baabb35e2..a73d9f8af 100644 --- a/src/multimedia/recording/qmediarecorder.h +++ b/src/multimedia/recording/qmediarecorder.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 QMediaRecorder_H #define QMediaRecorder_H @@ -72,7 +36,15 @@ class Q_MULTIMEDIA_EXPORT QMediaRecorder : public QObject Q_PROPERTY(QMediaRecorder::Error error READ error NOTIFY errorChanged) Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged) Q_PROPERTY(QMediaFormat mediaFormat READ mediaFormat WRITE setMediaFormat NOTIFY mediaFormatChanged) - Q_PROPERTY(Quality quality READ quality WRITE setQuality) + Q_PROPERTY(Quality quality READ quality WRITE setQuality NOTIFY qualityChanged) + Q_PROPERTY(QMediaRecorder::EncodingMode encodingMode READ encodingMode WRITE setEncodingMode NOTIFY encodingModeChanged) + Q_PROPERTY(QSize videoResolution READ videoResolution WRITE setVideoResolution NOTIFY videoResolutionChanged) + Q_PROPERTY(qreal videoFrameRate READ videoFrameRate WRITE setVideoFrameRate NOTIFY videoFrameRateChanged) + Q_PROPERTY(int videoBitRate READ videoBitRate WRITE setVideoBitRate NOTIFY videoBitRateChanged) + Q_PROPERTY(int audioBitRate READ audioBitRate WRITE setAudioBitRate NOTIFY audioBitRateChanged) + Q_PROPERTY(int audioChannelCount READ audioChannelCount WRITE setAudioChannelCount NOTIFY audioChannelCountChanged) + Q_PROPERTY(int audioSampleRate READ audioSampleRate WRITE setAudioSampleRate NOTIFY audioSampleRateChanged) + Q_PROPERTY(bool autoStop READ autoStop WRITE setAutoStop NOTIFY autoStopChanged) public: enum Quality { @@ -119,6 +91,9 @@ public: QUrl outputLocation() const; void setOutputLocation(const QUrl &location); + void setOutputDevice(QIODevice *device); + QIODevice *outputDevice() const; + QUrl actualLocation() const; RecorderState recorderState() const; @@ -160,6 +135,9 @@ public: void setMetaData(const QMediaMetaData &metaData); void addMetaData(const QMediaMetaData &metaData); + bool autoStop() const; + void setAutoStop(bool autoStop); + QMediaCaptureSession *captureSession() const; QPlatformMediaRecorder *platformRecoder() const; @@ -188,6 +166,7 @@ Q_SIGNALS: void audioBitRateChanged(); void audioChannelCountChanged(); void audioSampleRateChanged(); + void autoStopChanged(); private: QMediaRecorderPrivate *d_ptr; diff --git a/src/multimedia/recording/qmediarecorder_p.h b/src/multimedia/recording/qmediarecorder_p.h index ed46c5cba..896f6c368 100644 --- a/src/multimedia/recording/qmediarecorder_p.h +++ b/src/multimedia/recording/qmediarecorder_p.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 QMediaRecorder_P_H #define QMediaRecorder_P_H @@ -73,6 +37,8 @@ public: QMediaCaptureSession *captureSession = nullptr; QPlatformMediaRecorder *control = nullptr; + QString initErrorMessage; + bool autoStop = false; bool settingsChanged = false; diff --git a/src/multimedia/recording/qscreencapture-limitations.qdocinc b/src/multimedia/recording/qscreencapture-limitations.qdocinc new file mode 100644 index 000000000..240a1a389 --- /dev/null +++ b/src/multimedia/recording/qscreencapture-limitations.qdocinc @@ -0,0 +1,25 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only + +/*! + //! [content] + \section1 Screen Capture Limitations + On Qt 6.5.2 and above, the following limitations apply to using \1ScreenCapture: + \list + \li It is only supported with the FFmpeg backend. + \li It is unsupported on Linux with Wayland compositor, due to Wayland + protocol restrictions and limitations. + \li It is not supported on mobile operating systems, except on Android. + There, you might run into performance issues as the class is currently + implemented via QScreen::grabWindow, which is not optimal for the use case. + \li On embedded with EGLFS, it has limited functionality. For Qt Quick + applications, the class is currently implemented via + QQuickWindow::grabWindow, which can cause performance issues. + \li In most cases, we set a screen capture frame rate that equals the screen + refresh rate, except on Windows, where the rate might be flexible. + Such a frame rate (75/120 FPS) might cause performance issues on weak + CPUs if the captured screen is of 4K resolution. On EGLFS, the capture + frame rate is currently locked to 30 FPS. + \endlist + //! [content] +*/ diff --git a/src/multimedia/recording/qscreencapture.cpp b/src/multimedia/recording/qscreencapture.cpp new file mode 100644 index 000000000..c178af1c1 --- /dev/null +++ b/src/multimedia/recording/qscreencapture.cpp @@ -0,0 +1,261 @@ +// Copyright (C) 2022 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 "qscreencapture.h" +#include "qmediacapturesession.h" +#include <private/qplatformmediaintegration_p.h> +#include <private/qplatformsurfacecapture_p.h> +#include <private/qobject_p.h> + +QT_BEGIN_NAMESPACE + +static QScreenCapture::Error toScreenCaptureError(QPlatformSurfaceCapture::Error error) +{ + return static_cast<QScreenCapture::Error>(error); +} + +class QScreenCapturePrivate : public QObjectPrivate +{ +public: + QMediaCaptureSession *captureSession = nullptr; + std::unique_ptr<QPlatformSurfaceCapture> platformScreenCapture; +}; + +/*! + \class QScreenCapture + \inmodule QtMultimedia + \ingroup multimedia + \ingroup multimedia_video + \since 6.5 + + \brief This class is used for capturing a screen. + + The class captures a screen. It is managed by + the QMediaCaptureSession class where the captured screen can be displayed + in a video preview object or recorded to a file. + + \snippet multimedia-snippets/media.cpp Media recorder + + \include qscreencapture-limitations.qdocinc {content} {Q} + + \sa QWindowCapture, QMediaCaptureSession +*/ +/*! + \qmltype ScreenCapture + \instantiates QScreenCapture + \brief This type is used for capturing a screen. + + \inqmlmodule QtMultimedia + \ingroup multimedia_qml + \ingroup multimedia_video_qml + + ScreenCapture captures a screen. It is managed by + MediaCaptureSession where the captured screen can be displayed + in a video preview object or recorded to a file. + + \since 6.5 + The code below shows a simple capture session with ScreenCapture playing + back the captured primary screen view in VideoOutput. + +\qml + CaptureSession { + id: captureSession + screenCapture: ScreenCapture { + id: screenCapture + active: true + } + videoOutput: VideoOutput { + id: videoOutput + } + } +\endqml + + \include qscreencapture-limitations.qdocinc {content} {} + + \sa WindowCapture, CaptureSession +*/ + +QScreenCapture::QScreenCapture(QObject *parent) + : QObject(*new QScreenCapturePrivate, parent) +{ + Q_D(QScreenCapture); + + auto platformCapture = QPlatformMediaIntegration::instance()->createScreenCapture(this); + if (platformCapture) { + connect(platformCapture, &QPlatformSurfaceCapture::activeChanged, this, + &QScreenCapture::activeChanged); + connect(platformCapture, &QPlatformSurfaceCapture::errorChanged, this, + &QScreenCapture::errorChanged); + connect(platformCapture, &QPlatformSurfaceCapture::errorOccurred, this, + [this](QPlatformSurfaceCapture::Error error, QString errorString) { + emit errorOccurred(toScreenCaptureError(error), errorString); + }); + + connect(platformCapture, + qOverload<QPlatformSurfaceCapture::ScreenSource>( + &QPlatformSurfaceCapture::sourceChanged), + this, &QScreenCapture::screenChanged); + + d->platformScreenCapture.reset(platformCapture); + } +} + +QScreenCapture::~QScreenCapture() +{ + Q_D(QScreenCapture); + + // Reset platformScreenCapture in the destructor to avoid having broken ref in the object. + d->platformScreenCapture.reset(); + + if (d->captureSession) + d->captureSession->setScreenCapture(nullptr); +} + +/*! + \enum QScreenCapture::Error + + Enumerates error codes that can be signaled by the QScreenCapture class. + errorString() provides detailed information about the error cause. + + \value NoError No error + \value InternalError Internal screen capturing driver error + \value CapturingNotSupported Capturing is not supported + \value CaptureFailed Capturing screen failed + \value NotFound Selected screen not found +*/ + +/*! + Returns the capture session this QScreenCapture is connected to. + + Use QMediaCaptureSession::setScreenCapture() to connect the camera to + a session. +*/ +QMediaCaptureSession *QScreenCapture::captureSession() const +{ + Q_D(const QScreenCapture); + + return d->captureSession; +} + +/*! + \qmlproperty bool QtMultimedia::ScreenCapture::active + Describes whether the capturing is currently active. +*/ + +/*! + \property QScreenCapture::active + \brief whether the capturing is currently active. +*/ +void QScreenCapture::setActive(bool active) +{ + Q_D(QScreenCapture); + + if (d->platformScreenCapture) + d->platformScreenCapture->setActive(active); +} + +bool QScreenCapture::isActive() const +{ + Q_D(const QScreenCapture); + + return d->platformScreenCapture && d->platformScreenCapture->isActive(); +} + +/*! + \qmlproperty Screen QtMultimedia::ScreenCapture::screen + Describes the screen for capturing. +*/ + +/*! + \property QScreenCapture::screen + \brief the screen for capturing. +*/ + +void QScreenCapture::setScreen(QScreen *screen) +{ + Q_D(QScreenCapture); + + if (d->platformScreenCapture) + d->platformScreenCapture->setSource(QPlatformSurfaceCapture::ScreenSource(screen)); +} + +QScreen *QScreenCapture::screen() const +{ + Q_D(const QScreenCapture); + + return d->platformScreenCapture + ? d->platformScreenCapture->source<QPlatformSurfaceCapture::ScreenSource>() + : nullptr; +} + +/*! + \qmlproperty enumeration QtMultimedia::ScreenCapture::error + Returns a code of the last error. +*/ + +/*! + \property QScreenCapture::error + \brief the code of the last error. +*/ +QScreenCapture::Error QScreenCapture::error() const +{ + Q_D(const QScreenCapture); + + return d->platformScreenCapture ? toScreenCaptureError(d->platformScreenCapture->error()) + : CapturingNotSupported; +} + +/*! + \fn void QScreenCapture::errorOccurred(QScreenCapture::Error error, const QString &errorString) + + Signals when an \a error occurs, along with the \a errorString. +*/ +/*! + \qmlproperty string QtMultimedia::ScreenCapture::errorString + Returns a human readable string describing the cause of error. +*/ + +/*! + \property QScreenCapture::errorString + \brief a human readable string describing the cause of error. +*/ +QString QScreenCapture::errorString() const +{ + Q_D(const QScreenCapture); + + return d->platformScreenCapture ? d->platformScreenCapture->errorString() + : QLatin1StringView("Capturing is not support on this platform"); +} +/*! + \fn void QScreenCapture::start() + + Starts screen capture. +*/ +/*! + \fn void QScreenCapture::stop() + + Stops screen capture. +*/ +/*! + \internal +*/ +void QScreenCapture::setCaptureSession(QMediaCaptureSession *captureSession) +{ + Q_D(QScreenCapture); + + d->captureSession = captureSession; +} + +/*! + \internal +*/ +class QPlatformSurfaceCapture *QScreenCapture::platformScreenCapture() const +{ + Q_D(const QScreenCapture); + + return d->platformScreenCapture.get(); +} + +QT_END_NAMESPACE + +#include "moc_qscreencapture.cpp" diff --git a/src/multimedia/recording/qscreencapture.h b/src/multimedia/recording/qscreencapture.h new file mode 100644 index 000000000..b46925bc0 --- /dev/null +++ b/src/multimedia/recording/qscreencapture.h @@ -0,0 +1,72 @@ +// Copyright (C) 2022 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 QSCREENCAPTURE_H +#define QSCREENCAPTURE_H + +#include <QtCore/qobject.h> +#include <QtCore/qnamespace.h> +#include <QtGui/qscreen.h> +#include <QtGui/qwindow.h> +#include <QtGui/qwindowdefs.h> +#include <QtMultimedia/qtmultimediaglobal.h> + +QT_BEGIN_NAMESPACE + +class QMediaCaptureSession; +class QPlatformSurfaceCapture; +class QScreenCapturePrivate; + +class Q_MULTIMEDIA_EXPORT QScreenCapture : public QObject +{ + Q_OBJECT + Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged) + Q_PROPERTY(QScreen *screen READ screen WRITE setScreen NOTIFY screenChanged) + Q_PROPERTY(Error error READ error NOTIFY errorChanged) + Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged) + +public: + enum Error { + NoError = 0, + InternalError = 1, + CapturingNotSupported = 2, + CaptureFailed = 4, + NotFound = 5, + }; + Q_ENUM(Error) + + explicit QScreenCapture(QObject *parent = nullptr); + ~QScreenCapture() override; + + QMediaCaptureSession *captureSession() const; + + void setScreen(QScreen *screen); + QScreen *screen() const; + + bool isActive() const; + + Error error() const; + QString errorString() const; + +public Q_SLOTS: + void setActive(bool active); + void start() { setActive(true); } + void stop() { setActive(false); } + +Q_SIGNALS: + void activeChanged(bool); + void errorChanged(); + void screenChanged(QScreen *); + void errorOccurred(QScreenCapture::Error error, const QString &errorString); + +private: + void setCaptureSession(QMediaCaptureSession *captureSession); + QPlatformSurfaceCapture *platformScreenCapture() const; + friend class QMediaCaptureSession; + Q_DISABLE_COPY(QScreenCapture) + Q_DECLARE_PRIVATE(QScreenCapture) +}; + +QT_END_NAMESPACE + +#endif // QSCREENCAPTURE_H diff --git a/src/multimedia/recording/qvideoframeinput.cpp b/src/multimedia/recording/qvideoframeinput.cpp new file mode 100644 index 000000000..99500bb65 --- /dev/null +++ b/src/multimedia/recording/qvideoframeinput.cpp @@ -0,0 +1,181 @@ +// Copyright (C) 2024 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 "qvideoframeinput.h" +#include "qmediaframeinput_p.h" +#include "qmediainputencoderinterface_p.h" +#include "qplatformvideoframeinput_p.h" + +QT_BEGIN_NAMESPACE + +class QVideoFrameInputPrivate : public QMediaFrameInputPrivate +{ +public: + QVideoFrameInputPrivate(QVideoFrameInput *q) : q(q) { } + + bool sendVideoFrame(const QVideoFrame &frame) + { + return sendMediaFrame([&]() { emit m_platfromVideoFrameInput->newVideoFrame(frame); }); + } + + void initialize(QVideoFrameFormat format = {}) + { + m_platfromVideoFrameInput = std::make_unique<QPlatformVideoFrameInput>(std::move(format)); + addUpdateSignal(m_platfromVideoFrameInput.get(), &QPlatformVideoFrameInput::encoderUpdated); + } + + void uninitialize() + { + m_platfromVideoFrameInput.reset(); + + if (captureSession()) + captureSession()->setVideoFrameInput(nullptr); + } + + QPlatformVideoFrameInput *platfromVideoFrameInput() const + { + return m_platfromVideoFrameInput.get(); + } + +protected: + void updateCaptureSessionConnections(QMediaCaptureSession *prevSession, + QMediaCaptureSession *newSession) override + { + if (prevSession) + removeUpdateSignal(prevSession, &QMediaCaptureSession::videoOutputChanged); + + if (newSession) + addUpdateSignal(newSession, &QMediaCaptureSession::videoOutputChanged); + } + + bool checkIfCanSendMediaFrame() const override + { + if (auto encoderInterface = m_platfromVideoFrameInput->encoderInterface()) + return encoderInterface->canPushFrame(); + + return captureSession()->videoOutput() || captureSession()->videoSink(); + } + + void emitReadyToSendMediaFrame() override { emit q->readyToSendVideoFrame(); } + +private: + QVideoFrameInput *q = nullptr; + std::unique_ptr<QPlatformVideoFrameInput> m_platfromVideoFrameInput; +}; + +/*! + \class QVideoFrameInput + \inmodule QtMultimedia + \ingroup multimedia + \ingroup multimedia_video + \since 6.8 + + \brief The QVideoFrameInput class is used for providing custom video frames + to \l QMediaRecorder or a video output through \l QMediaCaptureSession. + + \sa QMediaRecorder, QMediaCaptureSession, QVideoSink +*/ + +/*! + Constructs a new QVideoFrameInput object with \a parent. +*/ +QVideoFrameInput::QVideoFrameInput(QObject *parent) : QVideoFrameInput({}, parent) { } + +/*! + Constructs a new QVideoFrameInput object with video frame \a format and \a parent. + + The specified \a format will work as a hint for the initialization of the matching + video encoder upon invoking \l QMediaRecorder::record(). + If the format is not specified or not valid, the video encoder will be initialized + upon sending the first frame. + Sending of video frames with another pixel format and size after initialization + of the matching video encoder might cause a performance penalty during recording. + + We recommend specifying the format if you know in advance what kind of frames you're + going to send. +*/ +QVideoFrameInput::QVideoFrameInput(const QVideoFrameFormat &format, QObject *parent) + : QObject(*new QVideoFrameInputPrivate(this), parent) +{ + Q_D(QVideoFrameInput); + d->initialize(format); +} + +/*! + Destroys the object. + */ +QVideoFrameInput::~QVideoFrameInput() +{ + Q_D(QVideoFrameInput); + d->uninitialize(); +} + +/*! + Sends \l QVideoFrame to \l QMediaRecorder or a video output + through \l QMediaCaptureSession. + + Returns \c true if the specified \a frame has been sent successfully + to the destination. Returns \c false, if the frame hasn't been sent, + which can happen if the instance is not assigned to + \l QMediaCaptureSession, the session doesn't have video outputs or + a media recorder, the media recorder is not started or its queue is full. + The signal \l readyToSendVideoFrame will be sent as soon as + the destination is able to handle a new frame. + + Sending of an empty video frame is treated by \l QMediaRecorder + as an end of the input stream. QMediaRecorder stops the recording + automatically if \l QMediaRecorder::autoStop is \c true and + all the inputs have reported the end of the stream. +*/ +bool QVideoFrameInput::sendVideoFrame(const QVideoFrame &frame) +{ + Q_D(QVideoFrameInput); + return d->sendVideoFrame(frame); +} + +/*! + Returns the video frame format that was specified + upon construction of the video frame input. +*/ +QVideoFrameFormat QVideoFrameInput::format() const +{ + Q_D(const QVideoFrameInput); + return d->platfromVideoFrameInput()->frameFormat(); +} + +/*! + Returns the capture session this video frame input is connected to, or + a \c nullptr if the video frame input is not connected to a capture session. + + Use QMediaCaptureSession::setVideoFrameInput() to connect + the video frame input to a session. +*/ +QMediaCaptureSession *QVideoFrameInput::captureSession() const +{ + Q_D(const QVideoFrameInput); + return d->captureSession(); +} + +void QVideoFrameInput::setCaptureSession(QMediaCaptureSession *captureSession) +{ + Q_D(QVideoFrameInput); + d->setCaptureSession(captureSession); +} + +QPlatformVideoFrameInput *QVideoFrameInput::platformVideoFrameInput() const +{ + Q_D(const QVideoFrameInput); + return d->platfromVideoFrameInput(); +} + +/*! + \fn void QVideoFrameInput::readyToSendVideoFrame() + + Signals that a new frame can be sent to the video frame input. + After receiving the signal, if you have frames to be sent, invoke \l sendVideoFrame + once or in a loop until it returns \c false. + + \sa sendVideoFrame() +*/ + +QT_END_NAMESPACE diff --git a/src/multimedia/recording/qvideoframeinput.h b/src/multimedia/recording/qvideoframeinput.h new file mode 100644 index 000000000..fbe56b7db --- /dev/null +++ b/src/multimedia/recording/qvideoframeinput.h @@ -0,0 +1,48 @@ +// Copyright (C) 2024 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 QVIDEOFRAMEINPUT_H +#define QVIDEOFRAMEINPUT_H + +#include <QtMultimedia/qtmultimediaexports.h> +#include <QtMultimedia/qvideoframe.h> +#include <QtCore/qobject.h> + +QT_BEGIN_NAMESPACE + +class QPlatformVideoFrameInput; +class QVideoFrameInputPrivate; +class QMediaCaptureSession; + +class Q_MULTIMEDIA_EXPORT QVideoFrameInput : public QObject +{ + Q_OBJECT +public: + explicit QVideoFrameInput(QObject *parent = nullptr); + + explicit QVideoFrameInput(const QVideoFrameFormat &format, QObject *parent = nullptr); + + ~QVideoFrameInput() override; + + bool sendVideoFrame(const QVideoFrame &frame); + + QVideoFrameFormat format() const; + + QMediaCaptureSession *captureSession() const; + +Q_SIGNALS: + void readyToSendVideoFrame(); + +private: + void setCaptureSession(QMediaCaptureSession *captureSession); + + QPlatformVideoFrameInput *platformVideoFrameInput() const; + + friend class QMediaCaptureSession; + Q_DISABLE_COPY(QVideoFrameInput) + Q_DECLARE_PRIVATE(QVideoFrameInput) +}; + +QT_END_NAMESPACE + +#endif // QVIDEOFRAMEINPUT_H diff --git a/src/multimedia/recording/qwindowcapture.cpp b/src/multimedia/recording/qwindowcapture.cpp new file mode 100644 index 000000000..69ad60100 --- /dev/null +++ b/src/multimedia/recording/qwindowcapture.cpp @@ -0,0 +1,268 @@ +// Copyright (C) 2023 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 "qwindowcapture.h" +#include "qplatformmediaintegration_p.h" +#include "qmediacapturesession.h" +#include "private/qobject_p.h" +#include "private/qplatformsurfacecapture_p.h" + +QT_BEGIN_NAMESPACE + +static QWindowCapture::Error toWindowCaptureError(QPlatformSurfaceCapture::Error error) +{ + return static_cast<QWindowCapture::Error>(error); +} + +class QWindowCapturePrivate : public QObjectPrivate +{ +public: + QMediaCaptureSession *captureSession = nullptr; + std::unique_ptr<QPlatformSurfaceCapture> platformWindowCapture; +}; + +/*! + \class QWindowCapture + \inmodule QtMultimedia + \ingroup multimedia + \ingroup multimedia_video + \since 6.6 + + \brief This class is used for capturing a window. + + The class captures a window. It is managed by + the QMediaCaptureSession class where the captured window can be displayed + in a video preview object or recorded to a file. + + \sa QMediaCaptureSession, QCapturableWindow +*/ +/*! + \qmltype WindowCapture + \instantiates QWindowCapture + \inqmlmodule QtMultimedia + \ingroup multimedia_qml + \ingroup multimedia_video_qml + \since 6.6 + + \brief This type is used for capturing a window. + + WindowCapture captures a window. It is managed by + MediaCaptureSession where the captured window can be displayed + in a video preview object or recorded to a file. + + \sa CaptureSession, CapturableWindow +*/ + +/*! + \enum QWindowCapture::Error + + Enumerates error codes that can be signaled by the QWindowCapture class. + errorString() provides detailed information about the error cause. + + \value NoError No error + \value InternalError Internal window capturing driver error + \value CapturingNotSupported Window capturing is not supported + \value CaptureFailed Capturing window failed + \value NotFound Selected window not found +*/ + +/*! + Constructs a new QWindowCapture object with \a parent. +*/ +QWindowCapture::QWindowCapture(QObject *parent) : QObject(*new QWindowCapturePrivate, parent) +{ + Q_D(QWindowCapture); + + qRegisterMetaType<QCapturableWindow>(); + + auto platformCapture = QPlatformMediaIntegration::instance()->createWindowCapture(this); + + if (platformCapture) { + connect(platformCapture, &QPlatformSurfaceCapture::activeChanged, this, + &QWindowCapture::activeChanged); + connect(platformCapture, &QPlatformSurfaceCapture::errorChanged, this, + &QWindowCapture::errorChanged); + connect(platformCapture, &QPlatformSurfaceCapture::errorOccurred, this, + [this](QPlatformSurfaceCapture::Error error, QString errorString) { + emit errorOccurred(toWindowCaptureError(error), errorString); + }); + connect(platformCapture, + qOverload<QCapturableWindow>(&QPlatformSurfaceCapture::sourceChanged), this, + &QWindowCapture::windowChanged); + + d->platformWindowCapture.reset(platformCapture); + } +} + +/*! + Destroys the object. + */ +QWindowCapture::~QWindowCapture() +{ + Q_D(QWindowCapture); + + d->platformWindowCapture.reset(); + + if (d->captureSession) + d->captureSession->setWindowCapture(nullptr); +} + +/*! + \qmlmethod list<CapturableWindow> QtMultimedia::WindowCapture::capturableWindows() + + Returns a list of CapturableWindow objects that is available for capturing. +*/ +/*! + \fn QList<QCapturableWindow> QWindowCapture::capturableWindows() + + Returns a list of QCapturableWindow objects that is available for capturing. + */ +QList<QCapturableWindow> QWindowCapture::capturableWindows() +{ + return QPlatformMediaIntegration::instance()->capturableWindowsList(); +} + +QMediaCaptureSession *QWindowCapture::captureSession() const +{ + Q_D(const QWindowCapture); + + return d->captureSession; +} + +/*! + \qmlproperty Window QtMultimedia::WindowCapture::window + Describes the window for capturing. + + \sa QtMultimedia::WindowCapture::capturableWindows +*/ + +/*! + \property QWindowCapture::window + \brief the window for capturing. + + \sa QWindowCapture::capturableWindows +*/ +QCapturableWindow QWindowCapture::window() const +{ + Q_D(const QWindowCapture); + + return d->platformWindowCapture ? d->platformWindowCapture->source<QCapturableWindow>() + : QCapturableWindow(); +} + +void QWindowCapture::setWindow(QCapturableWindow window) +{ + Q_D(QWindowCapture); + + if (d->platformWindowCapture) + d->platformWindowCapture->setSource(window); +} + +/*! + \qmlproperty bool QtMultimedia::WindowCapture::active + Describes whether the capturing is currently active. +*/ + +/*! + \property QWindowCapture::active + \brief whether the capturing is currently active. + + \sa start(), stop() +*/ +bool QWindowCapture::isActive() const +{ + Q_D(const QWindowCapture); + + return d->platformWindowCapture && d->platformWindowCapture->isActive(); +} + +void QWindowCapture::setActive(bool active) +{ + Q_D(QWindowCapture); + + if (d->platformWindowCapture) + d->platformWindowCapture->setActive(active); +} + +/*! + \qmlmethod QtMultimedia::WindowCapture::start +*/ + +/*! + \fn void QWindowCapture::start() + + Starts capturing the \l window. + + This is equivalent to setting the \l active property to true. +*/ + +/*! + \qmlmethod QtMultimedia::WindowCapture::stop +*/ + +/*! + \fn void QWindowCapture::stop() + + Stops capturing. + + This is equivalent to setting the \l active property to false. +*/ + + +/*! + \qmlproperty enumeration QtMultimedia::WindowCapture::error + Returns a code of the last error. +*/ + +/*! + \property QWindowCapture::error + \brief the code of the last error. +*/ +QWindowCapture::Error QWindowCapture::error() const +{ + Q_D(const QWindowCapture); + + return d->platformWindowCapture ? toWindowCaptureError(d->platformWindowCapture->error()) + : CapturingNotSupported; +} + +/*! + \fn void QWindowCapture::errorOccurred(QWindowCapture::Error error, const QString &errorString) + + Signals when an \a error occurs, along with the \a errorString. +*/ +/*! + \qmlproperty string QtMultimedia::WindowCapture::errorString + Returns a human readable string describing the cause of error. +*/ + +/*! + \property QWindowCapture::errorString + \brief a human readable string describing the cause of error. +*/ +QString QWindowCapture::errorString() const +{ + Q_D(const QWindowCapture); + + return d->platformWindowCapture + ? d->platformWindowCapture->errorString() + : QLatin1StringView("Capturing is not support on this platform"); +} + +void QWindowCapture::setCaptureSession(QMediaCaptureSession *captureSession) +{ + Q_D(QWindowCapture); + + d->captureSession = captureSession; +} + +QPlatformSurfaceCapture *QWindowCapture::platformWindowCapture() const +{ + Q_D(const QWindowCapture); + + return d->platformWindowCapture.get(); +} + +QT_END_NAMESPACE + +#include "moc_qwindowcapture.cpp" diff --git a/src/multimedia/recording/qwindowcapture.h b/src/multimedia/recording/qwindowcapture.h new file mode 100644 index 000000000..4c8b2eac3 --- /dev/null +++ b/src/multimedia/recording/qwindowcapture.h @@ -0,0 +1,71 @@ +// Copyright (C) 2023 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 QWINDOWCAPTURE_H +#define QWINDOWCAPTURE_H + +#include <QtMultimedia/qtmultimediaexports.h> +#include <QtMultimedia/qcapturablewindow.h> +#include <QtCore/qobject.h> +#include <QtCore/qlist.h> + +QT_BEGIN_NAMESPACE + +class QPlatformSurfaceCapture; + +class Q_MULTIMEDIA_EXPORT QWindowCapture : public QObject +{ + Q_OBJECT + Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged) + Q_PROPERTY(QCapturableWindow window READ window WRITE setWindow NOTIFY windowChanged) + Q_PROPERTY(Error error READ error NOTIFY errorChanged) + Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged) +public: + enum Error { + NoError = 0, + InternalError = 1, + CapturingNotSupported = 2, + CaptureFailed = 4, + NotFound = 5, + }; + Q_ENUM(Error) + + explicit QWindowCapture(QObject *parent = nullptr); + ~QWindowCapture() override; + + Q_INVOKABLE static QList<QCapturableWindow> capturableWindows(); + + QMediaCaptureSession *captureSession() const; + + void setWindow(QCapturableWindow window); + + QCapturableWindow window() const; + + bool isActive() const; + + Error error() const; + QString errorString() const; + +public Q_SLOTS: + void setActive(bool active); + void start() { setActive(true); } + void stop() { setActive(false); } + +Q_SIGNALS: + void activeChanged(bool); + void windowChanged(QCapturableWindow window); + void errorChanged(); + void errorOccurred(QWindowCapture::Error error, const QString &errorString); + +private: + void setCaptureSession(QMediaCaptureSession *captureSession); + QPlatformSurfaceCapture *platformWindowCapture() const; + + friend class QMediaCaptureSession; + Q_DISABLE_COPY(QWindowCapture) + Q_DECLARE_PRIVATE(QWindowCapture) +}; + +QT_END_NAMESPACE + +#endif // QWINDOWCAPTURE_H diff --git a/src/multimedia/shaders/ayuv.frag b/src/multimedia/shaders/ayuv.frag index 137933cd2..92c3f71fe 100644 --- a/src/multimedia/shaders/ayuv.frag +++ b/src/multimedia/shaders/ayuv.frag @@ -18,4 +18,8 @@ void main() #ifdef QMM_OUTPUTSURFACE_LINEAR fragColor = convertSRGBToLinear(fragColor); #endif + + // Clamp output to valid range to account for out-of-range + // input values and numerical inaccuracies in YUV->RGB conversion + fragColor = clamp(fragColor, 0.0, 1.0); } diff --git a/src/multimedia/shaders/colortransfer.glsl b/src/multimedia/shaders/colortransfer.glsl index 76af51b6b..1d70ae9eb 100644 --- a/src/multimedia/shaders/colortransfer.glsl +++ b/src/multimedia/shaders/colortransfer.glsl @@ -12,14 +12,24 @@ vec4 convertRec709ToLinear(vec4 rgba) return mix(high, low, cutoff); } -vec4 convertSRGBToLinear(vec4 rgba) +vec4 convertSRGBToLinear(vec4 sRGB) { - return pow(rgba, vec4(2.2)); + // https://en.wikipedia.org/wiki/SRGB + const bvec3 cutoff = lessThanEqual(sRGB.rgb, vec3(0.04045)); + const vec3 low = sRGB.rgb / 12.92; + const vec3 high = pow((sRGB.rgb + 0.055) / 1.055, vec3(2.4)); + vec3 linear = mix(high, low, cutoff); + return vec4(linear, sRGB.a); } -vec4 convertSRGBFromLinear(vec4 rgba) +vec4 convertSRGBFromLinear(vec4 linear) { - return pow(rgba, vec4(1./2.2)); + // https://en.wikipedia.org/wiki/SRGB + const bvec3 cutoff = lessThanEqual(linear.rgb, vec3(0.0031308)); + const vec3 low = linear.rgb * 12.92; + const vec3 high = 1.055 * pow(linear.rgb, vec3(1.0 / 2.4f)) - 0.055; + vec3 sRGB = mix(high, low, cutoff); + return vec4(sRGB, linear.a); } // This uses the PQ transfer function, see also https://en.wikipedia.org/wiki/Perceptual_quantizer diff --git a/src/multimedia/shaders/compile.bat b/src/multimedia/shaders/compile.bat index f8f3f194b..8a012d265 100755 --- a/src/multimedia/shaders/compile.bat +++ b/src/multimedia/shaders/compile.bat @@ -1,41 +1,5 @@ -::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: :: Copyright (C) 2019 The Qt Company Ltd. -:: Contact: https://www.qt.io/licensing/ -:: -:: This file is part of the QtQuick module 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$ -:: -::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:: SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -o rgba.vert.qsb rgba.vert qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o rgba.frag.qsb rgba.frag diff --git a/src/multimedia/shaders/imc2.frag b/src/multimedia/shaders/imc2.frag index b6b9e7360..18401d420 100644 --- a/src/multimedia/shaders/imc2.frag +++ b/src/multimedia/shaders/imc2.frag @@ -14,12 +14,16 @@ void main() { float Y = texture(plane1Texture, texCoord).r; float x = texCoord.x/2.; - float U = texture(plane2Texture, vec2(x, texCoord.y)).r; - float V = texture(plane2Texture, vec2(x + .5, texCoord.y)).r; + float U = texture(plane2Texture, vec2(x + .5, texCoord.y)).r; + float V = texture(plane2Texture, vec2(x, texCoord.y)).r; vec4 color = vec4(Y, U, V, 1.); fragColor = ubuf.colorMatrix * color * ubuf.opacity; #ifdef QMM_OUTPUTSURFACE_LINEAR fragColor = convertSRGBToLinear(fragColor); #endif + + // Clamp output to valid range to account for out-of-range + // input values and numerical inaccuracies in YUV->RGB conversion + fragColor = clamp(fragColor, 0.0, 1.0); } diff --git a/src/multimedia/shaders/imc4.frag b/src/multimedia/shaders/imc4.frag index b6b9e7360..574a5f49b 100644 --- a/src/multimedia/shaders/imc4.frag +++ b/src/multimedia/shaders/imc4.frag @@ -22,4 +22,8 @@ void main() #ifdef QMM_OUTPUTSURFACE_LINEAR fragColor = convertSRGBToLinear(fragColor); #endif + + // Clamp output to valid range to account for out-of-range + // input values and numerical inaccuracies in YUV->RGB conversion + fragColor = clamp(fragColor, 0.0, 1.0); } diff --git a/src/multimedia/shaders/nv12.frag b/src/multimedia/shaders/nv12.frag index 2e36882be..20399d9f0 100644 --- a/src/multimedia/shaders/nv12.frag +++ b/src/multimedia/shaders/nv12.frag @@ -20,4 +20,8 @@ void main() #ifdef QMM_OUTPUTSURFACE_LINEAR fragColor = convertSRGBToLinear(fragColor); #endif + + // Clamp output to valid range to account for out-of-range + // input values and numerical inaccuracies in YUV->RGB conversion + fragColor = clamp(fragColor, 0.0, 1.0); } diff --git a/src/multimedia/shaders/nv21.frag b/src/multimedia/shaders/nv21.frag index a8f94c8fc..c3f641be5 100644 --- a/src/multimedia/shaders/nv21.frag +++ b/src/multimedia/shaders/nv21.frag @@ -20,4 +20,8 @@ void main() #ifdef QMM_OUTPUTSURFACE_LINEAR fragColor = convertSRGBToLinear(fragColor); #endif + + // Clamp output to valid range to account for out-of-range + // input values and numerical inaccuracies in YUV->RGB conversion + fragColor = clamp(fragColor, 0.0, 1.0); } diff --git a/src/multimedia/shaders/uyvy.frag b/src/multimedia/shaders/uyvy.frag index 003d1caba..26a83da3f 100644 --- a/src/multimedia/shaders/uyvy.frag +++ b/src/multimedia/shaders/uyvy.frag @@ -20,4 +20,8 @@ void main() #ifdef QMM_OUTPUTSURFACE_LINEAR fragColor = convertSRGBToLinear(fragColor); #endif + + // Clamp output to valid range to account for out-of-range + // input values and numerical inaccuracies in YUV->RGB conversion + fragColor = clamp(fragColor, 0.0, 1.0); } diff --git a/src/multimedia/shaders/y.frag b/src/multimedia/shaders/y.frag index bec20c788..8c25fc762 100644 --- a/src/multimedia/shaders/y.frag +++ b/src/multimedia/shaders/y.frag @@ -18,4 +18,8 @@ void main() #ifdef QMM_OUTPUTSURFACE_LINEAR fragColor = convertSRGBToLinear(fragColor); #endif + + // Clamp output to valid range to account for out-of-range + // input values and numerical inaccuracies in YUV->RGB conversion + fragColor = clamp(fragColor, 0.0, 1.0); } diff --git a/src/multimedia/shaders/yuv_triplanar.frag b/src/multimedia/shaders/yuv_triplanar.frag index 5b83b05b5..228147943 100644 --- a/src/multimedia/shaders/yuv_triplanar.frag +++ b/src/multimedia/shaders/yuv_triplanar.frag @@ -22,4 +22,8 @@ void main() #ifdef QMM_OUTPUTSURFACE_LINEAR fragColor = convertSRGBToLinear(fragColor); #endif + + // Clamp output to valid range to account for out-of-range + // input values and numerical inaccuracies in YUV->RGB conversion + fragColor = clamp(fragColor, 0.0, 1.0); } diff --git a/src/multimedia/shaders/yuv_triplanar_p10.frag b/src/multimedia/shaders/yuv_triplanar_p10.frag index bac34c72c..5da0ed339 100644 --- a/src/multimedia/shaders/yuv_triplanar_p10.frag +++ b/src/multimedia/shaders/yuv_triplanar_p10.frag @@ -22,4 +22,8 @@ void main() #ifdef QMM_OUTPUTSURFACE_LINEAR fragColor = convertSRGBToLinear(fragColor); #endif + + // Clamp output to valid range to account for out-of-range + // input values and numerical inaccuracies in YUV->RGB conversion + fragColor = clamp(fragColor, 0.0, 1.0); } diff --git a/src/multimedia/shaders/yuyv.frag b/src/multimedia/shaders/yuyv.frag index 8f1c31e64..0f6e65b6d 100644 --- a/src/multimedia/shaders/yuyv.frag +++ b/src/multimedia/shaders/yuyv.frag @@ -20,4 +20,8 @@ void main() #ifdef QMM_OUTPUTSURFACE_LINEAR fragColor = convertSRGBToLinear(fragColor); #endif + + // Clamp output to valid range to account for out-of-range + // input values and numerical inaccuracies in YUV->RGB conversion + fragColor = clamp(fragColor, 0.0, 1.0); } diff --git a/src/multimedia/shaders/yvu_triplanar.frag b/src/multimedia/shaders/yvu_triplanar.frag index 37fc3a18d..ac2cbdf63 100644 --- a/src/multimedia/shaders/yvu_triplanar.frag +++ b/src/multimedia/shaders/yvu_triplanar.frag @@ -22,4 +22,8 @@ void main() #ifdef QMM_OUTPUTSURFACE_LINEAR fragColor = convertSRGBToLinear(fragColor); #endif + + // Clamp output to valid range to account for out-of-range + // input values and numerical inaccuracies in YUV->RGB conversion + fragColor = clamp(fragColor, 0.0, 1.0); } diff --git a/src/multimedia/spatial/qambisonicdecoder.cpp b/src/multimedia/spatial/qambisonicdecoder.cpp deleted file mode 100644 index a25754ef0..000000000 --- a/src/multimedia/spatial/qambisonicdecoder.cpp +++ /dev/null @@ -1,229 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2022 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$ -** -****************************************************************************/ -#include "qambisonicdecoder_p.h" - -#include "qambisonicdecoderdata_p.h" -#include <cmath> - -QT_BEGIN_NAMESPACE - -// Ambisonic decoding is described in detail in https://ambisonics.dreamhosters.com/BLaH3.pdf. -// We're using a phase matched band splitting filter to split the ambisonic signal into a low -// and high frequency component and apply matrix conversions to those components individually -// as described in the document. -// -// We are currently not using a near field compensation filter, something that could potentially -// improve sound quality further. - - -struct QAmbisonicDecoderData -{ - QAudioFormat::ChannelConfig config; - const float *lf[3]; - const float *hf[3]; -}; - -static const QAmbisonicDecoderData decoderMap[] = -{ - { QAudioFormat::ChannelConfigMono, - { decoderMatrix_mono_1_lf, decoderMatrix_mono_2_lf, decoderMatrix_mono_3_lf }, - { decoderMatrix_mono_1_hf, decoderMatrix_mono_2_hf, decoderMatrix_mono_3_hf } - }, - { QAudioFormat::ChannelConfigStereo, - { decoderMatrix_stereo_1_lf, decoderMatrix_stereo_2_lf, decoderMatrix_stereo_3_lf }, - { decoderMatrix_stereo_1_hf, decoderMatrix_stereo_2_hf, decoderMatrix_stereo_3_hf } - }, - { QAudioFormat::ChannelConfig2Dot1, - { decoderMatrix_2dot1_1_lf, decoderMatrix_2dot1_2_lf, decoderMatrix_2dot1_3_lf }, - { decoderMatrix_2dot1_1_hf, decoderMatrix_2dot1_2_hf, decoderMatrix_2dot1_3_hf } - }, - { QAudioFormat::ChannelConfigSurround5Dot0, - { decoderMatrix_5dot0_1_lf, decoderMatrix_5dot0_2_lf, decoderMatrix_5dot0_3_lf }, - { decoderMatrix_5dot0_1_hf, decoderMatrix_5dot0_2_hf, decoderMatrix_5dot0_3_hf } - }, - { QAudioFormat::ChannelConfigSurround5Dot1, - { decoderMatrix_5dot1_1_lf, decoderMatrix_5dot1_2_lf, decoderMatrix_5dot1_3_lf }, - { decoderMatrix_5dot1_1_hf, decoderMatrix_5dot1_2_hf, decoderMatrix_5dot1_3_hf } - }, - { QAudioFormat::ChannelConfigSurround7Dot0, - { decoderMatrix_7dot0_1_lf, decoderMatrix_7dot0_2_lf, decoderMatrix_7dot0_3_lf }, - { decoderMatrix_7dot0_1_hf, decoderMatrix_7dot0_2_hf, decoderMatrix_7dot0_3_hf } - }, - { QAudioFormat::ChannelConfigSurround7Dot1, - { decoderMatrix_7dot1_1_lf, decoderMatrix_7dot1_2_lf, decoderMatrix_7dot1_3_lf }, - { decoderMatrix_7dot1_1_hf, decoderMatrix_7dot1_2_hf, decoderMatrix_7dot1_3_hf } - } -}; - - -// Implements a split second order IIR filter -// The audio data is split into a phase synced low and high frequency part -// This allows us to apply different factors to both parts for better sound -// localization when converting from ambisonic formats -// -// Details are described in https://ambisonics.dreamhosters.com/BLaH3.pdf, Appendix A.2. -class QAmbisonicDecoderFilter -{ -public: - QAmbisonicDecoderFilter() = default; - void configure(float sampleRate, float cutoffFrequency = 380) - { - double k = tan(M_PI*cutoffFrequency/sampleRate); - a1 = float(2.*(k*k - 1.)/(k*k + 2*k + 1.)); - a2 = float((k*k - 2*k + 1.)/(k*k + 2*k + 1.)); - - b0_lf = float(k*k/(k*k + 2*k + 1)); - b1_lf = 2.f*b0_lf; - - b0_hf = float(1./(k*k + 2*k + 1)); - b1_hf = -2.f*b0_hf; - } - - struct Output - { - float lf; - float hf; - }; - - Output next(float x) - { - float r_lf = x*b0_lf + - prevX[0]*b1_lf + - prevX[1]*b0_lf - - prevR_lf[0]*a1 - - prevR_lf[1]*a2; - float r_hf = x*b0_hf + - prevX[0]*b1_hf + - prevX[1]*b0_hf - - prevR_hf[0]*a1 - - prevR_hf[1]*a2; - prevX[1] = prevX[0]; - prevX[0] = x; - prevR_lf[1] = prevR_lf[0]; - prevR_lf[0] = r_lf; - prevR_hf[1] = prevR_hf[0]; - prevR_hf[0] = r_hf; - return { r_lf, r_hf }; - } - -private: - float a1 = 0.; - float a2 = 0.; - - float b0_hf = 0.; - float b1_hf = 0.; - - float b0_lf = 0.; - float b1_lf = 0.; - - float prevX[2] = {}; - float prevR_lf[2] = {}; - float prevR_hf[2] = {}; -}; - - -QAmbisonicDecoder::QAmbisonicDecoder(AmbisonicLevel ambisonicLevel, const QAudioFormat &format) - : level(ambisonicLevel) -{ - auto outputConfiguration = format.channelConfig(); - if (outputConfiguration == QAudioFormat::ChannelConfigUnknown) - outputConfiguration = format.defaultChannelConfigForChannelCount(format.channelCount()); - for (const auto &d : decoderMap) { - if (d.config == outputConfiguration) { - decoderData = &d; - break; - } - } - if (!decoderData) { - // ### FIXME: use a stereo config, fill other channels with 0 - } - - inputChannels = (level+1)*(level+1); - outputChannels = format.channelCount(); - - filters = new QAmbisonicDecoderFilter[inputChannels]; - for (int i = 0; i < inputChannels; ++i) - filters[i].configure(format.sampleRate()); -} - -void QAmbisonicDecoder::processBuffer(const float *input[], float *output, int nSamples) -{ - float *o = output; - memset(o, 0, nSamples*outputChannels*sizeof(float)); - - const float *matrix_hi = decoderData->hf[level]; - const float *matrix_lo = decoderData->hf[level]; - for (int i = 0; i < nSamples; ++i) { - QAmbisonicDecoderFilter::Output buf[maxAmbisonicChannels]; - for (int j = 0; j < inputChannels; ++j) - buf[j] = filters[j].next(input[j][i]); - for (int j = 0; j < inputChannels; ++j) { - for (int k = 0; k < outputChannels; ++k) - o[k] += matrix_lo[k*outputChannels + j]*buf[j].lf + matrix_hi[k*outputChannels + j]*buf[j].hf; - } - o += outputChannels; - } -} - -void QAmbisonicDecoder::processBuffer(const float *input[], short *output, int nSamples) -{ - if (level == 0) { - // ### copy W data - return; - } - const float *matrix_hi = decoderData->hf[level - 1]; - const float *matrix_lo = decoderData->hf[level - 1]; - for (int i = 0; i < nSamples; ++i) { - QAmbisonicDecoderFilter::Output buf[maxAmbisonicChannels]; - for (int j = 0; j < inputChannels; ++j) - buf[j] = filters[j].next(input[j][i]); - float o[32]; // we can't support more than 32 channels from our API - memset(o, 0, 32*sizeof(short)); - for (int j = 0; j < inputChannels; ++j) { - for (int k = 0; k < outputChannels; ++k) - o[k] += matrix_lo[k*outputChannels + j]*buf[j].lf + matrix_hi[k*outputChannels + j]*buf[j].hf; - } - for (int k = 0; k < outputChannels; ++k) - output[k] = static_cast<short>(o[k]*32768.); - output += outputChannels; - } -} - -QT_END_NAMESPACE - diff --git a/src/multimedia/spatial/qambisonicdecoder_p.h b/src/multimedia/spatial/qambisonicdecoder_p.h deleted file mode 100644 index 3c6d87b60..000000000 --- a/src/multimedia/spatial/qambisonicdecoder_p.h +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2022 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$ -** -****************************************************************************/ -#ifndef QAMBISONICDECODER_P_H -#define QAMBISONICDECODER_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <qtmultimediaglobal_p.h> -#include <qaudioformat.h> - -QT_BEGIN_NAMESPACE - -struct QAmbisonicDecoderData; -class QAmbisonicDecoderFilter; - -class QAmbisonicDecoder -{ -public: - enum AmbisonicLevel - { - AmbisonicLevel1 = 1, - LowQuality = AmbisonicLevel1, - AmbisonicLevel2 = 2, - MediumQuality = AmbisonicLevel2, - AmbisonicLevel3 = 3, - HighQuality = AmbisonicLevel3 - }; - QAmbisonicDecoder(AmbisonicLevel ambisonicLevel, const QAudioFormat &format); - - int nInputChannels() const { return inputChannels; } - int nOutputChannels() const { return outputChannels; } - - int outputSize(int nSamples) const { return outputChannels * nSamples; } - - // input is planar, output interleaved - void processBuffer(const float *input[], float *output, int nSamples); - void processBuffer(const float *input[], short *output, int nSamples); - - static constexpr int maxAmbisonicChannels = 16; - static constexpr int maxAmbisonicLevel = 3; -private: - QAudioFormat format; - AmbisonicLevel level = AmbisonicLevel1; - int inputChannels = 0; - int outputChannels = 0; - const QAmbisonicDecoderData *decoderData = nullptr; - QAmbisonicDecoderFilter *filters = nullptr; - -}; - - -QT_END_NAMESPACE - -#endif diff --git a/src/multimedia/spatial/qambisonicdecoderdata_p.h b/src/multimedia/spatial/qambisonicdecoderdata_p.h deleted file mode 100644 index fa7b462f4..000000000 --- a/src/multimedia/spatial/qambisonicdecoderdata_p.h +++ /dev/null @@ -1,423 +0,0 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ -#ifndef QAMBISONICDECODERDATA_P_H -#define QAMBISONICDECODERDATA_P_H - -#include <qtmultimediaglobal_p.h> - -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -// This file is generated by the matlab/octave file adt_generate_qt.m -// using the Ambisonic Decoder Toolbox (https://bitbucket.org/ambidecodertoolbox/adt/src/master/) - - -QT_BEGIN_NAMESPACE - -// Decoder matrix for mono, ambisonic level 1 -static constexpr float decoderMatrix_mono_1_lf[1*4] = { -0.471409f, 0.619827f, 0.000000f, 0.000000f, // C -}; - -// Decoder matrix for mono, ambisonic level 1 -static constexpr float decoderMatrix_mono_1_hf[1*4] = { -0.666673f, 0.506086f, 0.000000f, 0.000000f, // C -}; - -// Decoder matrix for mono, ambisonic level 2 -static constexpr float decoderMatrix_mono_2_lf[1*9] = { -0.471409f, 0.619827f, 0.000000f, 0.000000f, -0.138903f, 0.000000f, 0.000000f, 0.208318f, 0.000000f, // C -}; - -// Decoder matrix for mono, ambisonic level 2 -static constexpr float decoderMatrix_mono_2_hf[1*9] = { -0.745364f, 0.759129f, 0.000000f, 0.000000f, -0.087850f, 0.000000f, 0.000000f, 0.131752f, 0.000000f, // C -}; - -// Decoder matrix for mono, ambisonic level 3 -static constexpr float decoderMatrix_mono_3_lf[1*16] = { -0.471409f, 0.619827f, 0.000000f, 0.000000f, -0.138903f, 0.000000f, 0.000000f, 0.208318f, 0.000000f, 0.000000f, 0.080888f, 0.000000f, 0.000000f, 0.000000f, -0.097901f, 0.000000f, // C -}; - -// Decoder matrix for mono, ambisonic level 3 -static constexpr float decoderMatrix_mono_3_hf[1*16] = { -0.786398f, 0.890402f, 0.000000f, 0.000000f, -0.141888f, 0.000000f, 0.000000f, 0.212793f, 0.000000f, 0.000000f, 0.041121f, 0.000000f, 0.000000f, 0.000000f, -0.049771f, 0.000000f, // C -}; - -// Decoder matrix for stereo, ambisonic level 1 -static constexpr float decoderMatrix_stereo_1_lf[2*4] = { -0.280670f, 0.372187f, 0.240963f, 0.000000f, // L -0.280656f, 0.372181f, -0.240980f, 0.000000f, // R -}; - -// Decoder matrix for stereo, ambisonic level 1 -static constexpr float decoderMatrix_stereo_1_hf[2*4] = { -0.396928f, 0.303889f, 0.196746f, 0.000000f, // L -0.396908f, 0.303884f, -0.196759f, 0.000000f, // R -}; - -// Decoder matrix for stereo, ambisonic level 2 -static constexpr float decoderMatrix_stereo_2_lf[2*9] = { -0.280670f, 0.372187f, 0.240963f, 0.000000f, -0.085490f, 0.000000f, 0.000000f, 0.135154f, 0.311013f, // L -0.280656f, 0.372181f, -0.240980f, 0.000000f, -0.085579f, 0.000000f, 0.000000f, 0.135130f, -0.311015f, // R -}; - -// Decoder matrix for stereo, ambisonic level 2 -static constexpr float decoderMatrix_stereo_2_hf[2*9] = { -0.443779f, 0.455834f, 0.295119f, 0.000000f, -0.054068f, 0.000000f, 0.000000f, 0.085479f, 0.196702f, // L -0.443757f, 0.455826f, -0.295139f, 0.000000f, -0.054125f, 0.000000f, 0.000000f, 0.085464f, -0.196703f, // R -}; - -// Decoder matrix for stereo, ambisonic level 3 -static constexpr float decoderMatrix_stereo_3_lf[2*16] = { -0.280670f, 0.372187f, 0.240963f, 0.000000f, -0.085490f, 0.000000f, 0.000000f, 0.135154f, 0.311013f, 0.000000f, 0.045437f, 0.021103f, 0.000000f, 0.000000f, -0.035873f, 0.169918f, // L -0.280656f, 0.372181f, -0.240980f, 0.000000f, -0.085579f, 0.000000f, 0.000000f, 0.135130f, -0.311015f, 0.000000f, 0.045414f, -0.021065f, 0.000000f, 0.000000f, -0.035873f, -0.169892f, // R -}; - -// Decoder matrix for stereo, ambisonic level 3 -static constexpr float decoderMatrix_stereo_3_hf[2*16] = { -0.468210f, 0.534659f, 0.346152f, 0.000000f, -0.087326f, 0.000000f, 0.000000f, 0.138058f, 0.317696f, 0.000000f, 0.023099f, 0.010728f, 0.000000f, 0.000000f, -0.018237f, 0.086382f, // L -0.468186f, 0.534650f, -0.346176f, 0.000000f, -0.087418f, 0.000000f, 0.000000f, 0.138033f, -0.317697f, 0.000000f, 0.023087f, -0.010709f, 0.000000f, 0.000000f, -0.018237f, -0.086369f, // R -}; - -// Decoder matrix for 2dot1, ambisonic level 1 -static constexpr float decoderMatrix_2dot1_1_lf[3*4] = { -0.280670f, 0.372187f, 0.240963f, 0.000000f, // L -0.280656f, 0.372181f, -0.240980f, 0.000000f, // R -0.5f, 0.0f, 0.0f, 0.0f, // LFE -}; - -// Decoder matrix for 2dot1, ambisonic level 1 -static constexpr float decoderMatrix_2dot1_1_hf[3*4] = { -0.396928f, 0.303889f, 0.196746f, 0.000000f, // L -0.396908f, 0.303884f, -0.196759f, 0.000000f, // R -0.0f, 0.0f, 0.0f, 0.0f, // LFE -}; - -// Decoder matrix for 2dot1, ambisonic level 2 -static constexpr float decoderMatrix_2dot1_2_lf[3*9] = { -0.280670f, 0.372187f, 0.240963f, 0.000000f, -0.085490f, 0.000000f, 0.000000f, 0.135154f, 0.311013f, // L -0.280656f, 0.372181f, -0.240980f, 0.000000f, -0.085579f, 0.000000f, 0.000000f, 0.135130f, -0.311015f, // R -0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, // LFE -}; - -// Decoder matrix for 2dot1, ambisonic level 2 -static constexpr float decoderMatrix_2dot1_2_hf[3*9] = { -0.443779f, 0.455834f, 0.295119f, 0.000000f, -0.054068f, 0.000000f, 0.000000f, 0.085479f, 0.196702f, // L -0.443757f, 0.455826f, -0.295139f, 0.000000f, -0.054125f, 0.000000f, 0.000000f, 0.085464f, -0.196703f, // R -0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, // LFE -}; - -// Decoder matrix for 2dot1, ambisonic level 3 -static constexpr float decoderMatrix_2dot1_3_lf[3*16] = { -0.280670f, 0.372187f, 0.240963f, 0.000000f, -0.085490f, 0.000000f, 0.000000f, 0.135154f, 0.311013f, 0.000000f, 0.045437f, 0.021103f, 0.000000f, 0.000000f, -0.035873f, 0.169918f, // L -0.280656f, 0.372181f, -0.240980f, 0.000000f, -0.085579f, 0.000000f, 0.000000f, 0.135130f, -0.311015f, 0.000000f, 0.045414f, -0.021065f, 0.000000f, 0.000000f, -0.035873f, -0.169892f, // R -0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, // LFE -}; - -// Decoder matrix for 2dot1, ambisonic level 3 -static constexpr float decoderMatrix_2dot1_3_hf[3*16] = { -0.468210f, 0.534659f, 0.346152f, 0.000000f, -0.087326f, 0.000000f, 0.000000f, 0.138058f, 0.317696f, 0.000000f, 0.023099f, 0.010728f, 0.000000f, 0.000000f, -0.018237f, 0.086382f, // L -0.468186f, 0.534650f, -0.346176f, 0.000000f, -0.087418f, 0.000000f, 0.000000f, 0.138033f, -0.317697f, 0.000000f, 0.023087f, -0.010709f, 0.000000f, 0.000000f, -0.018237f, -0.086369f, // R -0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, // LFE -}; - -// Decoder matrix for 5dot0, ambisonic level 1 -static constexpr float decoderMatrix_5dot0_1_lf[5*4] = { -0.240964f, 0.257639f, 0.287251f, 0.000000f, // L -0.240957f, 0.257633f, -0.287251f, 0.000000f, // R -0.127854f, 0.219531f, 0.000000f, 0.000000f, // C -0.520591f, -0.419052f, 0.415955f, 0.000000f, // Ls -0.520596f, -0.419047f, -0.415960f, 0.000000f, // Rs -}; - -// Decoder matrix for 5dot0, ambisonic level 1 -static constexpr float decoderMatrix_5dot0_1_hf[5*4] = { -0.340774f, 0.210361f, 0.234540f, 0.000000f, // L -0.340764f, 0.210357f, -0.234540f, 0.000000f, // R -0.180812f, 0.179246f, 0.000000f, 0.000000f, // C -0.736226f, -0.342155f, 0.339626f, 0.000000f, // Ls -0.736233f, -0.342151f, -0.339630f, 0.000000f, // Rs -}; - -// Decoder matrix for 5dot0, ambisonic level 2 -static constexpr float decoderMatrix_5dot0_2_lf[5*9] = { -0.240964f, 0.257639f, 0.287251f, 0.000000f, -0.063536f, 0.000000f, 0.000000f, -0.026015f, 0.315018f, // L -0.240957f, 0.257633f, -0.287251f, 0.000000f, -0.063562f, 0.000000f, 0.000000f, -0.026018f, -0.315014f, // R -0.127854f, 0.219531f, 0.000000f, 0.000000f, -0.037403f, 0.000000f, 0.000000f, 0.222021f, 0.000000f, // C -0.520591f, -0.419052f, 0.415955f, 0.000000f, -0.092715f, 0.000000f, 0.000000f, -0.061595f, -0.083957f, // Ls -0.520596f, -0.419047f, -0.415960f, 0.000000f, -0.092693f, 0.000000f, 0.000000f, -0.061591f, 0.083957f, // Rs -}; - -// Decoder matrix for 5dot0, ambisonic level 2 -static constexpr float decoderMatrix_5dot0_2_hf[5*9] = { -0.380997f, 0.315542f, 0.351810f, 0.000000f, -0.040184f, 0.000000f, 0.000000f, -0.016453f, 0.199235f, // L -0.380986f, 0.315535f, -0.351809f, 0.000000f, -0.040200f, 0.000000f, 0.000000f, -0.016455f, -0.199232f, // R -0.202154f, 0.268870f, 0.000000f, 0.000000f, -0.023656f, 0.000000f, 0.000000f, 0.140418f, 0.000000f, // C -0.823126f, -0.513232f, 0.509439f, 0.000000f, -0.058638f, 0.000000f, 0.000000f, -0.038956f, -0.053099f, // Ls -0.823134f, -0.513226f, -0.509444f, 0.000000f, -0.058624f, 0.000000f, 0.000000f, -0.038954f, 0.053099f, // Rs -}; - -// Decoder matrix for 5dot0, ambisonic level 3 -static constexpr float decoderMatrix_5dot0_3_lf[5*16] = { -0.240964f, 0.257639f, 0.287251f, 0.000000f, -0.063536f, 0.000000f, 0.000000f, -0.026015f, 0.315018f, 0.000000f, 0.035335f, 0.041639f, 0.000000f, 0.000000f, -0.142145f, 0.134220f, // L -0.240957f, 0.257633f, -0.287251f, 0.000000f, -0.063562f, 0.000000f, 0.000000f, -0.026018f, -0.315014f, 0.000000f, 0.035320f, -0.041624f, 0.000000f, 0.000000f, -0.142141f, -0.134218f, // R -0.127854f, 0.219531f, 0.000000f, 0.000000f, -0.037403f, 0.000000f, 0.000000f, 0.222021f, 0.000000f, 0.000000f, 0.026162f, 0.000000f, 0.000000f, 0.000000f, 0.204779f, 0.000000f, // C -0.520591f, -0.419052f, 0.415955f, 0.000000f, -0.092715f, 0.000000f, 0.000000f, -0.061595f, -0.083957f, 0.000000f, -0.101526f, 0.068569f, 0.000000f, 0.000000f, -0.017680f, -0.126417f, // Ls -0.520596f, -0.419047f, -0.415960f, 0.000000f, -0.092693f, 0.000000f, 0.000000f, -0.061591f, 0.083957f, 0.000000f, -0.101519f, -0.068568f, 0.000000f, 0.000000f, -0.017687f, 0.126417f, // Rs -}; - -// Decoder matrix for 5dot0, ambisonic level 3 -static constexpr float decoderMatrix_5dot0_3_hf[5*16] = { -0.401972f, 0.370107f, 0.412646f, 0.000000f, -0.064901f, 0.000000f, 0.000000f, -0.026574f, 0.321786f, 0.000000f, 0.017964f, 0.021168f, 0.000000f, 0.000000f, -0.072263f, 0.068234f, // L -0.401960f, 0.370099f, -0.412646f, 0.000000f, -0.064928f, 0.000000f, 0.000000f, -0.026577f, -0.321782f, 0.000000f, 0.017956f, -0.021161f, 0.000000f, 0.000000f, -0.072261f, -0.068233f, // R -0.213283f, 0.315364f, 0.000000f, 0.000000f, -0.038207f, 0.000000f, 0.000000f, 0.226791f, 0.000000f, 0.000000f, 0.013300f, 0.000000f, 0.000000f, 0.000000f, 0.104104f, 0.000000f, // C -0.868441f, -0.601983f, 0.597533f, 0.000000f, -0.094707f, 0.000000f, 0.000000f, -0.062919f, -0.085760f, 0.000000f, -0.051613f, 0.034859f, 0.000000f, 0.000000f, -0.008988f, -0.064267f, // Ls -0.868449f, -0.601975f, -0.597540f, 0.000000f, -0.094684f, 0.000000f, 0.000000f, -0.062915f, 0.085761f, 0.000000f, -0.051609f, -0.034858f, 0.000000f, 0.000000f, -0.008992f, 0.064267f, // Rs -}; - -// Decoder matrix for 5dot1, ambisonic level 1 -static constexpr float decoderMatrix_5dot1_1_lf[6*4] = { -0.240964f, 0.257639f, 0.287251f, 0.000000f, // L -0.240957f, 0.257633f, -0.287251f, 0.000000f, // R -0.127854f, 0.219531f, 0.000000f, 0.000000f, // C -0.5f, 0.0f, 0.0f, 0.0f, // LFE -0.520591f, -0.419052f, 0.415955f, 0.000000f, // Ls -0.520596f, -0.419047f, -0.415960f, 0.000000f, // Rs -}; - -// Decoder matrix for 5dot1, ambisonic level 1 -static constexpr float decoderMatrix_5dot1_1_hf[6*4] = { -0.340774f, 0.210361f, 0.234540f, 0.000000f, // L -0.340764f, 0.210357f, -0.234540f, 0.000000f, // R -0.180812f, 0.179246f, 0.000000f, 0.000000f, // C -0.0f, 0.0f, 0.0f, 0.0f, // LFE -0.736226f, -0.342155f, 0.339626f, 0.000000f, // Ls -0.736233f, -0.342151f, -0.339630f, 0.000000f, // Rs -}; - -// Decoder matrix for 5dot1, ambisonic level 2 -static constexpr float decoderMatrix_5dot1_2_lf[6*9] = { -0.240964f, 0.257639f, 0.287251f, 0.000000f, -0.063536f, 0.000000f, 0.000000f, -0.026015f, 0.315018f, // L -0.240957f, 0.257633f, -0.287251f, 0.000000f, -0.063562f, 0.000000f, 0.000000f, -0.026018f, -0.315014f, // R -0.127854f, 0.219531f, 0.000000f, 0.000000f, -0.037403f, 0.000000f, 0.000000f, 0.222021f, 0.000000f, // C -0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, // LFE -0.520591f, -0.419052f, 0.415955f, 0.000000f, -0.092715f, 0.000000f, 0.000000f, -0.061595f, -0.083957f, // Ls -0.520596f, -0.419047f, -0.415960f, 0.000000f, -0.092693f, 0.000000f, 0.000000f, -0.061591f, 0.083957f, // Rs -}; - -// Decoder matrix for 5dot1, ambisonic level 2 -static constexpr float decoderMatrix_5dot1_2_hf[6*9] = { -0.380997f, 0.315542f, 0.351810f, 0.000000f, -0.040184f, 0.000000f, 0.000000f, -0.016453f, 0.199235f, // L -0.380986f, 0.315535f, -0.351809f, 0.000000f, -0.040200f, 0.000000f, 0.000000f, -0.016455f, -0.199232f, // R -0.202154f, 0.268870f, 0.000000f, 0.000000f, -0.023656f, 0.000000f, 0.000000f, 0.140418f, 0.000000f, // C -0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, // LFE -0.823126f, -0.513232f, 0.509439f, 0.000000f, -0.058638f, 0.000000f, 0.000000f, -0.038956f, -0.053099f, // Ls -0.823134f, -0.513226f, -0.509444f, 0.000000f, -0.058624f, 0.000000f, 0.000000f, -0.038954f, 0.053099f, // Rs -}; - -// Decoder matrix for 5dot1, ambisonic level 3 -static constexpr float decoderMatrix_5dot1_3_lf[6*16] = { -0.240964f, 0.257639f, 0.287251f, 0.000000f, -0.063536f, 0.000000f, 0.000000f, -0.026015f, 0.315018f, 0.000000f, 0.035335f, 0.041639f, 0.000000f, 0.000000f, -0.142145f, 0.134220f, // L -0.240957f, 0.257633f, -0.287251f, 0.000000f, -0.063562f, 0.000000f, 0.000000f, -0.026018f, -0.315014f, 0.000000f, 0.035320f, -0.041624f, 0.000000f, 0.000000f, -0.142141f, -0.134218f, // R -0.127854f, 0.219531f, 0.000000f, 0.000000f, -0.037403f, 0.000000f, 0.000000f, 0.222021f, 0.000000f, 0.000000f, 0.026162f, 0.000000f, 0.000000f, 0.000000f, 0.204779f, 0.000000f, // C -0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, // LFE -0.520591f, -0.419052f, 0.415955f, 0.000000f, -0.092715f, 0.000000f, 0.000000f, -0.061595f, -0.083957f, 0.000000f, -0.101526f, 0.068569f, 0.000000f, 0.000000f, -0.017680f, -0.126417f, // Ls -0.520596f, -0.419047f, -0.415960f, 0.000000f, -0.092693f, 0.000000f, 0.000000f, -0.061591f, 0.083957f, 0.000000f, -0.101519f, -0.068568f, 0.000000f, 0.000000f, -0.017687f, 0.126417f, // Rs -}; - -// Decoder matrix for 5dot1, ambisonic level 3 -static constexpr float decoderMatrix_5dot1_3_hf[6*16] = { -0.401972f, 0.370107f, 0.412646f, 0.000000f, -0.064901f, 0.000000f, 0.000000f, -0.026574f, 0.321786f, 0.000000f, 0.017964f, 0.021168f, 0.000000f, 0.000000f, -0.072263f, 0.068234f, // L -0.401960f, 0.370099f, -0.412646f, 0.000000f, -0.064928f, 0.000000f, 0.000000f, -0.026577f, -0.321782f, 0.000000f, 0.017956f, -0.021161f, 0.000000f, 0.000000f, -0.072261f, -0.068233f, // R -0.213283f, 0.315364f, 0.000000f, 0.000000f, -0.038207f, 0.000000f, 0.000000f, 0.226791f, 0.000000f, 0.000000f, 0.013300f, 0.000000f, 0.000000f, 0.000000f, 0.104104f, 0.000000f, // C -0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, // LFE -0.868441f, -0.601983f, 0.597533f, 0.000000f, -0.094707f, 0.000000f, 0.000000f, -0.062919f, -0.085760f, 0.000000f, -0.051613f, 0.034859f, 0.000000f, 0.000000f, -0.008988f, -0.064267f, // Ls -0.868449f, -0.601975f, -0.597540f, 0.000000f, -0.094684f, 0.000000f, 0.000000f, -0.062915f, 0.085761f, 0.000000f, -0.051609f, -0.034858f, 0.000000f, 0.000000f, -0.008992f, 0.064267f, // Rs -}; - -// Decoder matrix for 7dot0, ambisonic level 1 -static constexpr float decoderMatrix_7dot0_1_lf[7*4] = { -0.194124f, 0.244088f, 0.209910f, 0.000000f, // L -0.194108f, 0.244084f, -0.209914f, 0.000000f, // R -0.127854f, 0.219531f, 0.000000f, 0.000000f, // C -0.260404f, 0.000000f, 0.413172f, 0.000000f, // Ls -0.260430f, 0.000000f, -0.413179f, 0.000000f, // Rs -0.260425f, -0.357822f, 0.206589f, 0.000000f, // Lb -0.260400f, -0.357815f, -0.206595f, 0.000000f, // Rb -}; - -// Decoder matrix for 7dot0, ambisonic level 1 -static constexpr float decoderMatrix_7dot0_1_hf[7*4] = { -0.274533f, 0.199297f, 0.171391f, 0.000000f, // L -0.274510f, 0.199294f, -0.171394f, 0.000000f, // R -0.180812f, 0.179246f, 0.000000f, 0.000000f, // C -0.368266f, 0.000000f, 0.337353f, 0.000000f, // Ls -0.368304f, 0.000000f, -0.337359f, 0.000000f, // Rs -0.368297f, -0.292160f, 0.168680f, 0.000000f, // Lb -0.368261f, -0.292155f, -0.168684f, 0.000000f, // Rb -}; - -// Decoder matrix for 7dot0, ambisonic level 2 -static constexpr float decoderMatrix_7dot0_2_lf[7*9] = { -0.194124f, 0.244088f, 0.209910f, 0.000000f, -0.054359f, 0.000000f, 0.000000f, 0.046706f, 0.289736f, // L -0.194108f, 0.244084f, -0.209914f, 0.000000f, -0.054434f, 0.000000f, 0.000000f, 0.046694f, -0.289734f, // R -0.127854f, 0.219531f, 0.000000f, 0.000000f, -0.037403f, 0.000000f, 0.000000f, 0.222021f, 0.000000f, // C -0.260404f, 0.000000f, 0.413172f, 0.000000f, -0.071326f, 0.000000f, 0.000000f, -0.326534f, 0.000000f, // Ls -0.260430f, 0.000000f, -0.413179f, 0.000000f, -0.071237f, 0.000000f, 0.000000f, -0.326534f, 0.000000f, // Rs -0.260425f, -0.357822f, 0.206589f, 0.000000f, -0.071249f, 0.000000f, 0.000000f, 0.163267f, -0.282791f, // Lb -0.260400f, -0.357815f, -0.206595f, 0.000000f, -0.071359f, 0.000000f, 0.000000f, 0.163256f, 0.282788f, // Rb -}; - -// Decoder matrix for 7dot0, ambisonic level 2 -static constexpr float decoderMatrix_7dot0_2_hf[7*9] = { -0.306937f, 0.298946f, 0.257087f, 0.000000f, -0.034380f, 0.000000f, 0.000000f, 0.029540f, 0.183245f, // L -0.306912f, 0.298940f, -0.257091f, 0.000000f, -0.034427f, 0.000000f, 0.000000f, 0.029532f, -0.183244f, // R -0.202154f, 0.268870f, 0.000000f, 0.000000f, -0.023656f, 0.000000f, 0.000000f, 0.140418f, 0.000000f, // C -0.411734f, 0.000000f, 0.506030f, 0.000000f, -0.045111f, 0.000000f, 0.000000f, -0.206518f, 0.000000f, // Ls -0.411776f, 0.000000f, -0.506039f, 0.000000f, -0.045054f, 0.000000f, 0.000000f, -0.206518f, 0.000000f, // Rs -0.411768f, -0.438240f, 0.253019f, 0.000000f, -0.045062f, 0.000000f, 0.000000f, 0.103259f, -0.178853f, // Lb -0.411728f, -0.438232f, -0.253026f, 0.000000f, -0.045131f, 0.000000f, 0.000000f, 0.103252f, 0.178851f, // Rb -}; - -// Decoder matrix for 7dot0, ambisonic level 3 -static constexpr float decoderMatrix_7dot0_3_lf[7*16] = { -0.194124f, 0.244088f, 0.209910f, 0.000000f, -0.054359f, 0.000000f, 0.000000f, 0.046706f, 0.289736f, 0.000000f, 0.031236f, 0.027345f, 0.000000f, 0.000000f, -0.110659f, 0.194894f, // L -0.194108f, 0.244084f, -0.209914f, 0.000000f, -0.054434f, 0.000000f, 0.000000f, 0.046694f, -0.289734f, 0.000000f, 0.031217f, -0.027307f, 0.000000f, 0.000000f, -0.110659f, -0.194879f, // R -0.127854f, 0.219531f, 0.000000f, 0.000000f, -0.037403f, 0.000000f, 0.000000f, 0.222021f, 0.000000f, 0.000000f, 0.026162f, 0.000000f, 0.000000f, 0.000000f, 0.204779f, 0.000000f, // C -0.260404f, 0.000000f, 0.413172f, 0.000000f, -0.071326f, 0.000000f, 0.000000f, -0.326534f, 0.000000f, 0.000000f, 0.000000f, 0.055313f, 0.000000f, 0.000000f, 0.000000f, -0.185006f, // Ls -0.260430f, 0.000000f, -0.413179f, 0.000000f, -0.071237f, 0.000000f, 0.000000f, -0.326534f, 0.000000f, 0.000000f, 0.000000f, -0.055349f, 0.000000f, 0.000000f, 0.000000f, 0.185008f, // Rs -0.260425f, -0.357822f, 0.206589f, 0.000000f, -0.071249f, 0.000000f, 0.000000f, 0.163267f, -0.282791f, 0.000000f, -0.047935f, 0.027670f, 0.000000f, 0.000000f, 0.000000f, 0.185014f, // Lb -0.260400f, -0.357815f, -0.206595f, 0.000000f, -0.071359f, 0.000000f, 0.000000f, 0.163256f, 0.282788f, 0.000000f, -0.047893f, -0.027649f, 0.000000f, 0.000000f, 0.000000f, -0.184996f, // Rb -}; - -// Decoder matrix for 7dot0, ambisonic level 3 -static constexpr float decoderMatrix_7dot0_3_hf[7*16] = { -0.323835f, 0.350641f, 0.301543f, 0.000000f, -0.055527f, 0.000000f, 0.000000f, 0.047710f, 0.295961f, 0.000000f, 0.015880f, 0.013901f, 0.000000f, 0.000000f, -0.056256f, 0.099079f, // L -0.323808f, 0.350635f, -0.301549f, 0.000000f, -0.055604f, 0.000000f, 0.000000f, 0.047697f, -0.295959f, 0.000000f, 0.015870f, -0.013882f, 0.000000f, 0.000000f, -0.056256f, -0.099072f, // R -0.213283f, 0.315364f, 0.000000f, 0.000000f, -0.038207f, 0.000000f, 0.000000f, 0.226791f, 0.000000f, 0.000000f, 0.013300f, 0.000000f, 0.000000f, 0.000000f, 0.104104f, 0.000000f, // C -0.434401f, 0.000000f, 0.593535f, 0.000000f, -0.072859f, 0.000000f, 0.000000f, -0.333550f, 0.000000f, 0.000000f, 0.000000f, 0.028120f, 0.000000f, 0.000000f, 0.000000f, -0.094052f, // Ls -0.434446f, 0.000000f, -0.593546f, 0.000000f, -0.072768f, 0.000000f, 0.000000f, -0.333550f, 0.000000f, 0.000000f, 0.000000f, -0.028138f, 0.000000f, 0.000000f, 0.000000f, 0.094053f, // Rs -0.434437f, -0.514023f, 0.296773f, 0.000000f, -0.072780f, 0.000000f, 0.000000f, 0.166775f, -0.288867f, 0.000000f, -0.024369f, 0.014067f, 0.000000f, 0.000000f, 0.000000f, 0.094056f, // Lb -0.434395f, -0.514014f, -0.296781f, 0.000000f, -0.072892f, 0.000000f, 0.000000f, 0.166764f, 0.288864f, 0.000000f, -0.024348f, -0.014056f, 0.000000f, 0.000000f, 0.000000f, -0.094047f, // Rb -}; - -// Decoder matrix for 7dot1, ambisonic level 1 -static constexpr float decoderMatrix_7dot1_1_lf[8*4] = { -0.194124f, 0.244088f, 0.209910f, 0.000000f, // L -0.194108f, 0.244084f, -0.209914f, 0.000000f, // R -0.127854f, 0.219531f, 0.000000f, 0.000000f, // C -0.5f, 0.0f, 0.0f, 0.0f, // LFE -0.260404f, 0.000000f, 0.413172f, 0.000000f, // Ls -0.260430f, 0.000000f, -0.413179f, 0.000000f, // Rs -0.260425f, -0.357822f, 0.206589f, 0.000000f, // Lb -0.260400f, -0.357815f, -0.206595f, 0.000000f, // Rb -}; - -// Decoder matrix for 7dot1, ambisonic level 1 -static constexpr float decoderMatrix_7dot1_1_hf[8*4] = { -0.274533f, 0.199297f, 0.171391f, 0.000000f, // L -0.274510f, 0.199294f, -0.171394f, 0.000000f, // R -0.180812f, 0.179246f, 0.000000f, 0.000000f, // C -0.0f, 0.0f, 0.0f, 0.0f, // LFE -0.368266f, 0.000000f, 0.337353f, 0.000000f, // Ls -0.368304f, 0.000000f, -0.337359f, 0.000000f, // Rs -0.368297f, -0.292160f, 0.168680f, 0.000000f, // Lb -0.368261f, -0.292155f, -0.168684f, 0.000000f, // Rb -}; - -// Decoder matrix for 7dot1, ambisonic level 2 -static constexpr float decoderMatrix_7dot1_2_lf[8*9] = { -0.194124f, 0.244088f, 0.209910f, 0.000000f, -0.054359f, 0.000000f, 0.000000f, 0.046706f, 0.289736f, // L -0.194108f, 0.244084f, -0.209914f, 0.000000f, -0.054434f, 0.000000f, 0.000000f, 0.046694f, -0.289734f, // R -0.127854f, 0.219531f, 0.000000f, 0.000000f, -0.037403f, 0.000000f, 0.000000f, 0.222021f, 0.000000f, // C -0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, // LFE -0.260404f, 0.000000f, 0.413172f, 0.000000f, -0.071326f, 0.000000f, 0.000000f, -0.326534f, 0.000000f, // Ls -0.260430f, 0.000000f, -0.413179f, 0.000000f, -0.071237f, 0.000000f, 0.000000f, -0.326534f, 0.000000f, // Rs -0.260425f, -0.357822f, 0.206589f, 0.000000f, -0.071249f, 0.000000f, 0.000000f, 0.163267f, -0.282791f, // Lb -0.260400f, -0.357815f, -0.206595f, 0.000000f, -0.071359f, 0.000000f, 0.000000f, 0.163256f, 0.282788f, // Rb -}; - -// Decoder matrix for 7dot1, ambisonic level 2 -static constexpr float decoderMatrix_7dot1_2_hf[8*9] = { -0.306937f, 0.298946f, 0.257087f, 0.000000f, -0.034380f, 0.000000f, 0.000000f, 0.029540f, 0.183245f, // L -0.306912f, 0.298940f, -0.257091f, 0.000000f, -0.034427f, 0.000000f, 0.000000f, 0.029532f, -0.183244f, // R -0.202154f, 0.268870f, 0.000000f, 0.000000f, -0.023656f, 0.000000f, 0.000000f, 0.140418f, 0.000000f, // C -0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, // LFE -0.411734f, 0.000000f, 0.506030f, 0.000000f, -0.045111f, 0.000000f, 0.000000f, -0.206518f, 0.000000f, // Ls -0.411776f, 0.000000f, -0.506039f, 0.000000f, -0.045054f, 0.000000f, 0.000000f, -0.206518f, 0.000000f, // Rs -0.411768f, -0.438240f, 0.253019f, 0.000000f, -0.045062f, 0.000000f, 0.000000f, 0.103259f, -0.178853f, // Lb -0.411728f, -0.438232f, -0.253026f, 0.000000f, -0.045131f, 0.000000f, 0.000000f, 0.103252f, 0.178851f, // Rb -}; - -// Decoder matrix for 7dot1, ambisonic level 3 -static constexpr float decoderMatrix_7dot1_3_lf[8*16] = { -0.194124f, 0.244088f, 0.209910f, 0.000000f, -0.054359f, 0.000000f, 0.000000f, 0.046706f, 0.289736f, 0.000000f, 0.031236f, 0.027345f, 0.000000f, 0.000000f, -0.110659f, 0.194894f, // L -0.194108f, 0.244084f, -0.209914f, 0.000000f, -0.054434f, 0.000000f, 0.000000f, 0.046694f, -0.289734f, 0.000000f, 0.031217f, -0.027307f, 0.000000f, 0.000000f, -0.110659f, -0.194879f, // R -0.127854f, 0.219531f, 0.000000f, 0.000000f, -0.037403f, 0.000000f, 0.000000f, 0.222021f, 0.000000f, 0.000000f, 0.026162f, 0.000000f, 0.000000f, 0.000000f, 0.204779f, 0.000000f, // C -0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, // LFE -0.260404f, 0.000000f, 0.413172f, 0.000000f, -0.071326f, 0.000000f, 0.000000f, -0.326534f, 0.000000f, 0.000000f, 0.000000f, 0.055313f, 0.000000f, 0.000000f, 0.000000f, -0.185006f, // Ls -0.260430f, 0.000000f, -0.413179f, 0.000000f, -0.071237f, 0.000000f, 0.000000f, -0.326534f, 0.000000f, 0.000000f, 0.000000f, -0.055349f, 0.000000f, 0.000000f, 0.000000f, 0.185008f, // Rs -0.260425f, -0.357822f, 0.206589f, 0.000000f, -0.071249f, 0.000000f, 0.000000f, 0.163267f, -0.282791f, 0.000000f, -0.047935f, 0.027670f, 0.000000f, 0.000000f, 0.000000f, 0.185014f, // Lb -0.260400f, -0.357815f, -0.206595f, 0.000000f, -0.071359f, 0.000000f, 0.000000f, 0.163256f, 0.282788f, 0.000000f, -0.047893f, -0.027649f, 0.000000f, 0.000000f, 0.000000f, -0.184996f, // Rb -}; - -// Decoder matrix for 7dot1, ambisonic level 3 -static constexpr float decoderMatrix_7dot1_3_hf[8*16] = { -0.323835f, 0.350641f, 0.301543f, 0.000000f, -0.055527f, 0.000000f, 0.000000f, 0.047710f, 0.295961f, 0.000000f, 0.015880f, 0.013901f, 0.000000f, 0.000000f, -0.056256f, 0.099079f, // L -0.323808f, 0.350635f, -0.301549f, 0.000000f, -0.055604f, 0.000000f, 0.000000f, 0.047697f, -0.295959f, 0.000000f, 0.015870f, -0.013882f, 0.000000f, 0.000000f, -0.056256f, -0.099072f, // R -0.213283f, 0.315364f, 0.000000f, 0.000000f, -0.038207f, 0.000000f, 0.000000f, 0.226791f, 0.000000f, 0.000000f, 0.013300f, 0.000000f, 0.000000f, 0.000000f, 0.104104f, 0.000000f, // C -0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, // LFE -0.434401f, 0.000000f, 0.593535f, 0.000000f, -0.072859f, 0.000000f, 0.000000f, -0.333550f, 0.000000f, 0.000000f, 0.000000f, 0.028120f, 0.000000f, 0.000000f, 0.000000f, -0.094052f, // Ls -0.434446f, 0.000000f, -0.593546f, 0.000000f, -0.072768f, 0.000000f, 0.000000f, -0.333550f, 0.000000f, 0.000000f, 0.000000f, -0.028138f, 0.000000f, 0.000000f, 0.000000f, 0.094053f, // Rs -0.434437f, -0.514023f, 0.296773f, 0.000000f, -0.072780f, 0.000000f, 0.000000f, 0.166775f, -0.288867f, 0.000000f, -0.024369f, 0.014067f, 0.000000f, 0.000000f, 0.000000f, 0.094056f, // Lb -0.434395f, -0.514014f, -0.296781f, 0.000000f, -0.072892f, 0.000000f, 0.000000f, 0.166764f, 0.288864f, 0.000000f, -0.024348f, -0.014056f, 0.000000f, 0.000000f, 0.000000f, -0.094047f, // Rb -}; - -QT_END_NAMESPACE - -#endif - diff --git a/src/multimedia/spatial/qspatialaudioengine.cpp b/src/multimedia/spatial/qspatialaudioengine.cpp deleted file mode 100644 index 7ab89c1fa..000000000 --- a/src/multimedia/spatial/qspatialaudioengine.cpp +++ /dev/null @@ -1,627 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2022 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Spatial Audio module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL-NOGPL2$ -** 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 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include <qspatialaudioengine_p.h> -#include <qspatialaudiosoundsource_p.h> -#include <qspatialaudiostereosource.h> -#include <qspatialaudioroom_p.h> -#include <qspatialaudiolistener.h> -#include <resonance_audio_api_extensions.h> -#include <qambisonicdecoder_p.h> -#include <qaudiodecoder.h> -#include <qmediadevices.h> -#include <qiodevice.h> -#include <qaudiosink.h> -#include <qdebug.h> -#include <qelapsedtimer.h> - -QT_BEGIN_NAMESPACE - -class QAudioOutputStream : public QIODevice -{ - Q_OBJECT -public: - explicit QAudioOutputStream(QSpatialAudioEnginePrivate *d) - : d(d) - { - open(QIODevice::ReadOnly); - } - ~QAudioOutputStream(); - - qint64 readData(char *data, qint64 len) override; - - qint64 writeData(const char *, qint64) override; - - qint64 size() const override { return 0; } - qint64 bytesAvailable() const override { - return std::numeric_limits<qint64>::max(); - } - bool isSequential() const override { - return true; - } - bool atEnd() const override { - return false; - } - qint64 pos() const override { - return m_pos; - } - - Q_INVOKABLE void startOutput() { - QMutexLocker l(&d->mutex); - Q_ASSERT(!sink); - d->ambisonicDecoder.reset(new QAmbisonicDecoder(QAmbisonicDecoder::HighQuality, d->format)); - sink.reset(new QAudioSink(d->device, d->format)); - sink->setBufferSize(16384); - sink->start(this); - } - - Q_INVOKABLE void stopOutput() { - sink->stop(); - sink.reset(); - d->ambisonicDecoder.reset(); - delete this; - } - - void setPaused(bool paused) { - if (paused) - sink->suspend(); - else - sink->resume(); - } - -private: - qint64 m_pos = 0; - QSpatialAudioEnginePrivate *d = nullptr; - std::unique_ptr<QAudioSink> sink; -}; - - -QAudioOutputStream::~QAudioOutputStream() -{ -} - -qint64 QAudioOutputStream::writeData(const char *, qint64) -{ - return 0; -} - -qint64 QAudioOutputStream::readData(char *data, qint64 len) -{ - if (d->paused.loadRelaxed()) - return 0; - - d->updateRooms(); - - int nChannels = d->ambisonicDecoder ? d->ambisonicDecoder->nOutputChannels() : 2; - if (len < nChannels*int(sizeof(float))*QSpatialAudioEnginePrivate::bufferSize) - return 0; - - short *fd = (short *)data; - qint64 frames = len / nChannels / sizeof(short); - bool ok = true; - while (frames >= qint64(QSpatialAudioEnginePrivate::bufferSize)) { - // Fill input buffers - for (auto *source : qAsConst(d->sources)) { - auto *sp = QSpatialAudioSoundSourcePrivate::get(source); - float buf[QSpatialAudioEnginePrivate::bufferSize]; - sp->getBuffer(buf, QSpatialAudioEnginePrivate::bufferSize, 1); - d->api->SetInterleavedBuffer(sp->sourceId, buf, 1, QSpatialAudioEnginePrivate::bufferSize); - } - for (auto *source : qAsConst(d->stereoSources)) { - auto *sp = QSpatialAudioSound::get(source); - float buf[2*QSpatialAudioEnginePrivate::bufferSize]; - sp->getBuffer(buf, QSpatialAudioEnginePrivate::bufferSize, 2); - d->api->SetInterleavedBuffer(sp->sourceId, buf, 2, QSpatialAudioEnginePrivate::bufferSize); - } - - if (d->ambisonicDecoder && d->outputMode == QSpatialAudioEngine::Normal && d->format.channelCount() != 2) { - const float *channels[QAmbisonicDecoder::maxAmbisonicChannels]; - int nSamples = vraudio::getAmbisonicOutput(d->api, channels, d->ambisonicDecoder->nInputChannels()); - Q_ASSERT(d->ambisonicDecoder->nOutputChannels() <= 8); - d->ambisonicDecoder->processBuffer(channels, fd, nSamples); - } else { - ok = d->api->FillInterleavedOutputBuffer(2, QSpatialAudioEnginePrivate::bufferSize, fd); - if (!ok) { - qWarning() << " Reading failed!"; - break; - } - } - fd += nChannels*QSpatialAudioEnginePrivate::bufferSize; - frames -= QSpatialAudioEnginePrivate::bufferSize; - } - const int bytesProcessed = ((char *)fd - data); - m_pos += bytesProcessed; - return bytesProcessed; -} - - -QSpatialAudioEnginePrivate::QSpatialAudioEnginePrivate() -{ - device = QMediaDevices::defaultAudioOutput(); -} - -QSpatialAudioEnginePrivate::~QSpatialAudioEnginePrivate() -{ - delete api; -} - -void QSpatialAudioEnginePrivate::addSpatialSound(QSpatialAudioSoundSource *sound) -{ - QSpatialAudioSound *sd = QSpatialAudioSound::get(sound); - - sd->sourceId = api->CreateSoundObjectSource(vraudio::kBinauralHighQuality); - sources.append(sound); -} - -void QSpatialAudioEnginePrivate::removeSpatialSound(QSpatialAudioSoundSource *sound) -{ - QSpatialAudioSound *sd = QSpatialAudioSound::get(sound); - - api->DestroySource(sd->sourceId); - sd->sourceId = vraudio::ResonanceAudioApi::kInvalidSourceId; - sources.removeOne(sound); -} - -void QSpatialAudioEnginePrivate::addStereoSound(QSpatialAudioStereoSource *sound) -{ - QSpatialAudioSound *sd = QSpatialAudioSound::get(sound); - - sd->sourceId = api->CreateStereoSource(2); - stereoSources.append(sound); -} - -void QSpatialAudioEnginePrivate::removeStereoSound(QSpatialAudioStereoSource *sound) -{ - QSpatialAudioSound *sd = QSpatialAudioSound::get(sound); - - api->DestroySource(sd->sourceId); - sd->sourceId = vraudio::ResonanceAudioApi::kInvalidSourceId; - stereoSources.removeOne(sound); -} - -void QSpatialAudioEnginePrivate::addRoom(QSpatialAudioRoom *room) -{ - rooms.append(room); -} - -void QSpatialAudioEnginePrivate::removeRoom(QSpatialAudioRoom *room) -{ - rooms.removeOne(room); -} - -void QSpatialAudioEnginePrivate::updateRooms() -{ - if (!roomEffectsEnabled) - return; - - bool needUpdate = listenerPositionDirty; - listenerPositionDirty = false; - - bool roomDirty = false; - for (const auto &room : rooms) { - auto *rd = QSpatialAudioRoomPrivate::get(room); - if (rd->dirty) { - roomDirty = true; - rd->update(); - needUpdate = true; - } - } - - if (!needUpdate) - return; - - QVector3D listenerPos = listenerPosition(); - float roomVolume = float(qInf()); - QSpatialAudioRoom *room = nullptr; - // Find the smallest room that contains the listener and apply it's room effects - for (auto *r : qAsConst(rooms)) { - QVector3D dim2 = r->dimensions()/2.; - float vol = dim2.x()*dim2.y()*dim2.z(); - if (vol > roomVolume) - continue; - QVector3D dist = r->position() - listenerPos; - // transform into room coordinates - dist = r->rotation().rotatedVector(dist); - if (qAbs(dist.x()) <= dim2.x() && - qAbs(dist.y()) <= dim2.y() && - qAbs(dist.z()) <= dim2.z()) { - room = r; - roomVolume = vol; - } - } - if (room != currentRoom) - roomDirty = true; - currentRoom = room; - - if (!roomDirty) - return; - - // apply room to engine - if (!currentRoom) { - api->EnableRoomEffects(false); - return; - } - QSpatialAudioRoomPrivate *rp = QSpatialAudioRoomPrivate::get(room); - api->SetReflectionProperties(rp->reflections); - api->SetReverbProperties(rp->reverb); - - // update room effects for all sound sources - for (auto *s : qAsConst(sources)) { - auto *sp = QSpatialAudioSoundSourcePrivate::get(s); - sp->updateRoomEffects(); - } -} - -QVector3D QSpatialAudioEnginePrivate::listenerPosition() const -{ - return listener ? listener->position() : QVector3D(); -} - - -/*! - \class QSpatialAudioEngine - \inmodule QtMultimedia - \ingroup multimedia_spatialaudio - - \brief QSpatialAudioEngine manages a three dimensional sound field. - - You can use an instance of QSpatialAudioEngine to manage a sound field in - three dimensions. A sound field is defined by several QSpatialAudioSoundSource - objects that define a sound at a specified location in 3D space. You can also - add stereo overlays using QSpatialAudioStereoSource. - - You can use QSpatialAudioListener to define the position of the person listening - to the sound field relative to the sound sources. Sound sources will be less audible - if the listener is further away from source. They will also get mapped to the corresponding - loudspeakers depending on the direction between listener and source. - - QSpatialAudioEngine offers two output modes. The first mode renders the sound field to a set of - speakers, either a stereo speaker pair or a surround configuration. The second mode provides - an immersive 3D sound experience when using headphones. - - Perception of sound localization is driven mainly by two factors. The first factor is timing - differences of the sound waves between left and right ear. The second factor comes from various - ways how sounds coming from different direcations create different types of reflections from our - ears and heads. See https://en.wikipedia.org/wiki/Sound_localization for more details. - - The spatial audio engine emulates those timing differences and reflections through - Head related transfer functions (HRTF, see - https://en.wikipedia.org/wiki/Head-related_transfer_function). The functions used emulates those - effects for an average persons ears and head. It provides a good and immersive 3D sound localization - experience for most persons when using headphones. - - The engine is rather versatile allowing you to define amd emulate room properties and reverb settings emulating - different types of rooms. - - Sound sources can also be occluded dampening the sound coming from those sources. - -*/ - -/*! - Constructs a spatial audio engine with \a parent. - - The engine will operate with a sample rate given by \a sampleRate. Sound content that is - not provided at that sample rate will automatically get resampled to \a sampleRate when - being processed by the engine. The default sample rate is fine in most cases, but you can define - a different rate if most of your sound files are sampled with a different rate, and avoid some - CPU overhead for resampling. - */ -QSpatialAudioEngine::QSpatialAudioEngine(QObject *parent, int sampleRate) - : QObject(parent) - , d(new QSpatialAudioEnginePrivate) -{ - d->sampleRate = sampleRate; - d->api = vraudio::CreateResonanceAudioApi(2, QSpatialAudioEnginePrivate::bufferSize, d->sampleRate); -} - -/*! - Destroys the spatial audio engine. - */ -QSpatialAudioEngine::~QSpatialAudioEngine() -{ - stop(); - delete d; -} - -/*! \enum QSpatialAudioEngine::OutputMode - \value Normal Map the sounds to the loudspeaker configuration of the output device. - This is normally a stereo or surround speaker setup. - \value Headphone Use Headphone spatialization to create a 3D audio effect when listening - to the sound field through headphones -*/ - -/*! - \property QSpatialAudioEngine::outputMode - - Sets or retrieves the current output mode of the engine. - - \sa QSpatialAudioEngine::OutputMode - */ -void QSpatialAudioEngine::setOutputMode(OutputMode mode) -{ - if (d->outputMode == mode) - return; - d->outputMode = mode; - if (d->api) { - d->api->SetStereoSpeakerMode(mode == Normal); - } - emit outputModeChanged(); -} - -QSpatialAudioEngine::OutputMode QSpatialAudioEngine::outputMode() const -{ - return d->outputMode; -} - -/*! - Returns the sample rate the engine has been configured with. - */ -int QSpatialAudioEngine::sampleRate() const -{ - return d->sampleRate; -} - -/*! - \property QSpatialAudioEngine::outputDevice - - Sets or returns the device that is being used for playing the sound field. - */ -void QSpatialAudioEngine::setOutputDevice(const QAudioDevice &device) -{ - if (d->device == device) - return; - if (d->api) { - qWarning() << "Changing device on a running engine not implemented"; - return; - } - d->device = device; - emit outputDeviceChanged(); -} - -QAudioDevice QSpatialAudioEngine::outputDevice() const -{ - return d->device; -} - -/*! - \property QSpatialAudioEngine::masterVolume - - Sets or returns volume being used to render the sound field. - */ -void QSpatialAudioEngine::setMasterVolume(float volume) -{ - if (d->masterVolume == volume) - return; - d->masterVolume = volume; - d->api->SetMasterVolume(volume); - emit masterVolumeChanged(); -} - -float QSpatialAudioEngine::masterVolume() const -{ - return d->masterVolume; -} - -/*! - Starts the engine. - */ -void QSpatialAudioEngine::start() -{ - if (d->outputStream) - // already started - return; - - d->format.setChannelCount(2); - d->format.setSampleRate(d->sampleRate); - d->format.setSampleFormat(QAudioFormat::Int16); - - d->api->SetStereoSpeakerMode(d->outputMode == Normal); - d->api->SetMasterVolume(d->masterVolume); - - d->outputStream.reset(new QAudioOutputStream(d)); - d->outputStream->moveToThread(&d->audioThread); - d->audioThread.start(); - - QMetaObject::invokeMethod(d->outputStream.get(), "startOutput"); -} - -/*! - Stops the engine. - */ -void QSpatialAudioEngine::stop() -{ - QMetaObject::invokeMethod(d->outputStream.get(), "stopOutput", Qt::BlockingQueuedConnection); - d->outputStream.reset(); - d->audioThread.exit(0); - d->audioThread.wait(); - delete d->api; - d->api = nullptr; -} - -/*! - \property QSpatialAudioEngine::paused - - Pauses the spatial audio engine. - */ -void QSpatialAudioEngine::setPaused(bool paused) -{ - bool old = d->paused.fetchAndStoreRelaxed(paused); - if (old != paused) { - if (d->outputStream) - d->outputStream->setPaused(paused); - emit pausedChanged(); - } -} - -bool QSpatialAudioEngine::paused() const -{ - return d->paused.loadRelaxed(); -} - -/*! - Enables room effects such as echos and reverb. - - Enables room effects if \a enabled is true. - Room effects will only apply if you create one or more \l QSpatialAudioRoom objects - and the listener is inside at least one of the rooms. If the listener is inside - multiple rooms, the room with the smallest volume will be used. - */ -void QSpatialAudioEngine::setRoomEffectsEnabled(bool enabled) -{ - if (d->roomEffectsEnabled == enabled) - return; - d->roomEffectsEnabled = enabled; -} - -/*! - Returns true if room effects are enabled. - */ -bool QSpatialAudioEngine::roomEffectsEnabled() const -{ - return d->roomEffectsEnabled; -} - -/*! - \property QSpatialAudioEngine::distanceScale - - Defines the scale of the coordinate system being used by the spatial audio engine. - By default, all units are in centimeters, in line with the default units being - used by Qt Quick 3D. - - Set the distance scale to QSpatialAudioEngine::DistanceScaleMeter to get units in meters. -*/ -void QSpatialAudioEngine::setDistanceScale(float scale) -{ - // multiply with 100, to get the conversion to meters that resonance audio uses - scale /= 100.f; - if (scale <= 0.0f) { - qWarning() << "QSpatialAudioEngine: Invalid distance scale."; - return; - } - if (scale == d->distanceScale) - return; - d->distanceScale = scale; - emit distanceScaleChanged(); -} - -float QSpatialAudioEngine::distanceScale() const -{ - return d->distanceScale*100.f; -} - - -/*! \class QSpatialAudioSound - \internal - */ - -void QSpatialAudioSound::load() -{ - decoder.reset(new QAudioDecoder); - buffers.clear(); - currentBuffer = 0; - bufPos = 0; - m_playing = false; - m_loading = true; - auto *ep = QSpatialAudioEnginePrivate::get(engine); - QAudioFormat f = ep->format; - f.setSampleFormat(QAudioFormat::Float); - f.setChannelConfig(nchannels == 2 ? QAudioFormat::ChannelConfigStereo : QAudioFormat::ChannelConfigMono); - decoder->setAudioFormat(f); - decoder->setSource(url); - - connect(decoder.get(), &QAudioDecoder::bufferReady, this, &QSpatialAudioSound::bufferReady); - connect(decoder.get(), &QAudioDecoder::finished, this, &QSpatialAudioSound::finished); - decoder->start(); -} - -void QSpatialAudioSound::getBuffer(float *buf, int nframes, int channels) -{ - Q_ASSERT(channels == nchannels); - QMutexLocker l(&mutex); - if (!m_playing || currentBuffer >= buffers.size()) { - memset(buf, 0, nframes*sizeof(float)); - } else { - int frames = nframes; - float *ff = buf; - while (frames) { - const QAudioBuffer &b = buffers.at(currentBuffer); -// qDebug() << s << b.format().sampleRate() << b.format().channelCount() << b.format().sampleFormat(); - auto *f = b.constData<float>() + bufPos*nchannels; - int toCopy = qMin(b.frameCount() - bufPos, frames); - memcpy(ff, f, toCopy*sizeof(float)*nchannels); - ff += toCopy*nchannels; - frames -= toCopy; - bufPos += toCopy; - Q_ASSERT(bufPos <= b.frameCount()); - if (bufPos == b.frameCount()) { - ++currentBuffer; - bufPos = 0; - } - if (!m_loading) { - if (currentBuffer == buffers.size()) { - currentBuffer = 0; - ++m_currentLoop; - } - if (m_loops > 0 && m_currentLoop >= m_loops) { - m_playing = false; - m_currentLoop = 0; - } - } - } - Q_ASSERT(ff - buf == channels*nframes); - } -} - -void QSpatialAudioSound::bufferReady() -{ - QMutexLocker l(&mutex); - auto b = decoder->read(); -// qDebug() << "read buffer" << b.format() << b.startTime() << b.duration(); - buffers.append(b); - if (m_autoPlay) - m_playing = true; -} - -void QSpatialAudioSound::finished() -{ -// qDebug() << "finished"; - m_loading = false; -} - -QT_END_NAMESPACE - -#include "moc_qspatialaudioengine.cpp" -#include "qspatialaudioengine.moc" diff --git a/src/multimedia/spatial/qspatialaudioengine.h b/src/multimedia/spatial/qspatialaudioengine.h deleted file mode 100644 index f67ce5726..000000000 --- a/src/multimedia/spatial/qspatialaudioengine.h +++ /dev/null @@ -1,111 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2022 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Spatial Audio module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL-NOGPL2$ -** 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 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QSPATIALAUDIOENGINE_H -#define QSPATIALAUDIOENGINE_H - -#include <QtMultimedia/qtmultimediaglobal.h> -#include <QtCore/qobject.h> - -QT_BEGIN_NAMESPACE - -class QSpatialAudioEnginePrivate; -class QAudioDevice; - -class Q_MULTIMEDIA_EXPORT QSpatialAudioEngine : public QObject -{ - Q_OBJECT - Q_PROPERTY(OutputMode outputMode READ outputMode WRITE setOutputMode NOTIFY outputModeChanged) - Q_PROPERTY(QAudioDevice outputDevice READ outputDevice WRITE setOutputDevice NOTIFY outputDeviceChanged) - Q_PROPERTY(float masterVolume READ masterVolume WRITE setMasterVolume NOTIFY masterVolumeChanged) - Q_PROPERTY(bool paused READ paused WRITE setPaused NOTIFY pausedChanged) - Q_PROPERTY(float distanceScale READ distanceScale WRITE setDistanceScale NOTIFY distanceScaleChanged) -public: - explicit QSpatialAudioEngine(QObject *parent = nullptr, int sampleRate = 44100); - ~QSpatialAudioEngine(); - - enum OutputMode { - Normal, - Headphone - }; - Q_ENUM(OutputMode) - - void setOutputMode(OutputMode mode); - OutputMode outputMode() const; - - int sampleRate() const; - - void setOutputDevice(const QAudioDevice &device); - QAudioDevice outputDevice() const; - - void setMasterVolume(float volume); - float masterVolume() const; - - void start(); - void stop(); - - void setPaused(bool paused); - bool paused() const; - - void setRoomEffectsEnabled(bool enabled); - bool roomEffectsEnabled() const; - - static constexpr float DistanceScaleCentimeter = 1.f; - static constexpr float DistanceScaleMeter = 100.f; - - void setDistanceScale(float scale); - float distanceScale() const; - -Q_SIGNALS: - void outputModeChanged(); - void outputDeviceChanged(); - void masterVolumeChanged(); - void pausedChanged(); - void distanceScaleChanged(); - -public Q_SLOTS: - void pause() { setPaused(true); } - void resume() { setPaused(false); } - -private: - friend class QSpatialAudioEnginePrivate; - QSpatialAudioEnginePrivate *d; -}; - -QT_END_NAMESPACE - -#endif diff --git a/src/multimedia/spatial/qspatialaudioengine_p.h b/src/multimedia/spatial/qspatialaudioengine_p.h deleted file mode 100644 index 3163f0c86..000000000 --- a/src/multimedia/spatial/qspatialaudioengine_p.h +++ /dev/null @@ -1,179 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2022 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Spatial Audio module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL-NOGPL2$ -** 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 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QSPATIALAUDIOENGINE_P_H -#define QSPATIALAUDIOENGINE_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of other Qt classes. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <qspatialaudioengine.h> -#include <qaudiodevice.h> -#include <qaudiodecoder.h> -#include <qthread.h> -#include <qmutex.h> -#include <qurl.h> -#include <qaudiobuffer.h> -#include <qvector3d.h> - -namespace vraudio { -class ResonanceAudioApi; -} - -QT_BEGIN_NAMESPACE - -class QSpatialAudioSoundSource; -class QSpatialAudioStereoSource; -class QAudioSink; -class QAudioOutputStream; -class QAmbisonicDecoder; -class QAudioDecoder; -class QSpatialAudioRoom; -class QSpatialAudioListener; - -class QSpatialAudioEnginePrivate -{ -public: - static QSpatialAudioEnginePrivate *get(QSpatialAudioEngine *engine) { return engine ? engine->d : nullptr; } - - static constexpr int bufferSize = 128; - - QSpatialAudioEnginePrivate(); - ~QSpatialAudioEnginePrivate(); - vraudio::ResonanceAudioApi *api = nullptr; - int sampleRate = 44100; - float masterVolume = 1.; - QSpatialAudioEngine::OutputMode outputMode = QSpatialAudioEngine::Normal; - bool roomEffectsEnabled = true; - - // Resonance Audio uses meters internally, while Qt Quick 3D and our API uses cm by default. - // To make things independent from the scale setting, we store all distances in meters internally - // and convert in the setters and getters. - float distanceScale = 0.01f; - - QMutex mutex; - QAudioFormat format; - QAudioDevice device; - QAtomicInteger<bool> paused = false; - - QThread audioThread; - std::unique_ptr<QAudioOutputStream> outputStream; - std::unique_ptr<QAmbisonicDecoder> ambisonicDecoder; - - QSpatialAudioListener *listener = nullptr; - QList<QSpatialAudioSoundSource *> sources; - QList<QSpatialAudioStereoSource *> stereoSources; - QList<QSpatialAudioRoom *> rooms; - mutable bool listenerPositionDirty = true; - QSpatialAudioRoom *currentRoom = nullptr; - - void addSpatialSound(QSpatialAudioSoundSource *sound); - void removeSpatialSound(QSpatialAudioSoundSource *sound); - void addStereoSound(QSpatialAudioStereoSource *sound); - void removeStereoSound(QSpatialAudioStereoSource *sound); - - void addRoom(QSpatialAudioRoom *room); - void removeRoom(QSpatialAudioRoom *room); - void updateRooms(); - - QVector3D listenerPosition() const; -}; - -class QSpatialAudioSound : public QObject -{ -public: - QSpatialAudioSound(QObject *parent, int nchannels = 2) - : QObject(parent) - , nchannels(nchannels) - {} - - template<typename T> - static QSpatialAudioSound *get(T *soundSource) { return soundSource ? soundSource->d : nullptr; } - - - QUrl url; - float volume = 1.; - int nchannels = 2; - std::unique_ptr<QAudioDecoder> decoder; - QSpatialAudioEngine *engine = nullptr; - - QMutex mutex; - int currentBuffer = 0; - int bufPos = 0; - int m_currentLoop = 0; - QList<QAudioBuffer> buffers; - int sourceId = -1; // kInvalidSourceId - - QAtomicInteger<bool> m_autoPlay = true; - QAtomicInteger<bool> m_playing = false; - QAtomicInt m_loops = 1; - bool m_loading = false; - - void play() { - m_playing = true; - } - void pause() { - m_playing = false; - } - void stop() { - QMutexLocker locker(&mutex); - m_playing = false; - currentBuffer = 0; - bufPos = 0; - m_currentLoop = 0; - } - - void load(); - void getBuffer(float *buf, int frames, int channels); - -private Q_SLOTS: - void bufferReady(); - void finished(); - -}; - -QT_END_NAMESPACE - -#endif diff --git a/src/multimedia/spatial/qspatialaudiolistener.cpp b/src/multimedia/spatial/qspatialaudiolistener.cpp deleted file mode 100644 index c93e7a1e5..000000000 --- a/src/multimedia/spatial/qspatialaudiolistener.cpp +++ /dev/null @@ -1,161 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2022 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Spatial Audio module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL-NOGPL2$ -** 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 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include "qspatialaudiolistener.h" -#include "qspatialaudioengine_p.h" -#include "api/resonance_audio_api.h" -#include <qaudiosink.h> -#include <qurl.h> -#include <qdebug.h> -#include <qaudiodecoder.h> - -QT_BEGIN_NAMESPACE - -class QSpatialAudioListenerPrivate -{ -public: - QSpatialAudioEngine *engine = nullptr; - QVector3D pos; - QQuaternion rotation; -}; - -/*! - \class QSpatialAudioListener - \inmodule QtMultimedia - \ingroup multimedia_spatialaudio - - \brief Defines the position and orientation of the person listening to a sound field - defined by QSpatialAudioEngine. - - A QSpatialAudioEngine can have exactly one listener that defines the position and orientation - of the person listening to the sound field. - */ - -/*! - Creates a listener for the spatial audio engine for \a engine. - */ -QSpatialAudioListener::QSpatialAudioListener(QSpatialAudioEngine *engine) - : d(new QSpatialAudioListenerPrivate) -{ - setEngine(engine); -} - -/*! - Destroys the listener. - */ -QSpatialAudioListener::~QSpatialAudioListener() -{ - delete d; -} - -/*! - Sets the listener's position in 3D space to \a pos. Units are in centimeters - by default. - - \sa QSpatialAudioEngine::distanceScale - */ -void QSpatialAudioListener::setPosition(QVector3D pos) -{ - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - pos *= ep->distanceScale; - if (d->pos == pos) - return; - - d->pos = pos; - if (ep && ep->api) { - ep->api->SetHeadPosition(pos.x(), pos.y(), pos.z()); - ep->listenerPositionDirty = true; - } -} - -/*! - Returns the current position of the listener. - */ -QVector3D QSpatialAudioListener::position() const -{ - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - return d->pos/ep->distanceScale; -} - -/*! - Sets the listener's orientation in 3D space to \a q. - */ -void QSpatialAudioListener::setRotation(const QQuaternion &q) -{ - d->rotation = q; - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - if (ep && ep->api) - ep->api->SetHeadRotation(d->rotation.x(), d->rotation.y(), d->rotation.z(), d->rotation.scalar()); -} - -/*! - Returns the listener's orientation in 3D space. - */ -QQuaternion QSpatialAudioListener::rotation() const -{ - return d->rotation; -} - -/*! - \internal - */ -void QSpatialAudioListener::setEngine(QSpatialAudioEngine *engine) -{ - if (d->engine) { - auto *ed = QSpatialAudioEnginePrivate::get(d->engine); - ed->listener = nullptr; - } - d->engine = engine; - if (d->engine) { - auto *ed = QSpatialAudioEnginePrivate::get(d->engine); - if (ed->listener) { - qWarning() << "Ignoring attempt to add a second listener to the spatial audio engine."; - d->engine = nullptr; - return; - } - ed->listener = this; - } -} - -/*! - Returns the engine associated with this listener. - */ -QSpatialAudioEngine *QSpatialAudioListener::engine() const -{ - return d->engine; -} - -QT_END_NAMESPACE diff --git a/src/multimedia/spatial/qspatialaudiolistener.h b/src/multimedia/spatial/qspatialaudiolistener.h deleted file mode 100644 index 715223521..000000000 --- a/src/multimedia/spatial/qspatialaudiolistener.h +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2022 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Spatial Audio module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL-NOGPL2$ -** 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 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QSPATIALAUDIOLISTENER_H -#define QSPATIALAUDIOLISTENER_H - -#include <QtMultimedia/qtmultimediaglobal.h> -#include <QtCore/QObject> -#include <QtMultimedia/qaudioformat.h> -#include <QtGui/qvector3d.h> -#include <QtGui/qquaternion.h> - -QT_BEGIN_NAMESPACE - -class QSpatialAudioEngine; - -class QSpatialAudioListenerPrivate; -class Q_MULTIMEDIA_EXPORT QSpatialAudioListener : public QObject -{ -public: - explicit QSpatialAudioListener(QSpatialAudioEngine *engine); - ~QSpatialAudioListener(); - - QAudioFormat format() const; - - void setPosition(QVector3D pos); - QVector3D position() const; - void setRotation(const QQuaternion &q); - QQuaternion rotation() const; - - QSpatialAudioEngine *engine() const; - -private: - void setEngine(QSpatialAudioEngine *engine); - QSpatialAudioListenerPrivate *d = nullptr; -}; - -QT_END_NAMESPACE - -#endif diff --git a/src/multimedia/spatial/qspatialaudioroom.cpp b/src/multimedia/spatial/qspatialaudioroom.cpp deleted file mode 100644 index 9e091c43f..000000000 --- a/src/multimedia/spatial/qspatialaudioroom.cpp +++ /dev/null @@ -1,418 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2022 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Spatial Audio module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL-NOGPL2$ -** 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 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include <qspatialaudioroom_p.h> - -QT_BEGIN_NAMESPACE - -namespace { -inline QVector3D toVector(const float *f) -{ - return QVector3D(f[0], f[1], f[2]); -} - -inline void toFloats(const QVector3D &v, float *f) -{ - f[0] = v.x(); - f[1] = v.y(); - f[2] = v.z(); -} - -inline QQuaternion toQuaternion(const float *f) -{ - // resonance audio puts the scalar component last - return QQuaternion(f[3], f[0], f[1], f[2]); -} - -inline void toFloats(const QQuaternion &q, float *f) -{ - f[0] = q.x(); - f[1] = q.y(); - f[2] = q.z(); - f[3] = q.scalar(); -} - -// Default values for occlusion and dampening of different wall materials. -// These values are used as defaults if a wall is only defined by a material -// and define how sound passes through the wall. -// We define both occlusion and dampening constants to be able to tune the -// sound. Dampening only reduces the level of the sound without affecting its -// tone, while occlusion will dampen higher frequencies more than lower ones -struct { - float occlusion; - float dampening; -} occlusionAndDampening[] = { - { 0.f, 1.f }, // Transparent, - { 0.f, .1f }, // AcousticCeilingTiles, - { 2.f, .4f }, // BrickBare, - { 2.f, .4f }, // BrickPainted, - { 4.f, 1.f }, // ConcreteBlockCoarse, - { 4.f, 1.f }, // ConcreteBlockPainted, - { .7f, .7f }, // CurtainHeavy, - { .5f, .5f }, // FiberGlassInsulation, - { .2f, .3f }, // GlassThin, - { .5f, .2f }, // GlassThick, - { 7.f, 1.f }, // Grass, - { 4.f, 1.f }, // LinoleumOnConcrete, - { 4.f, 1.f }, // Marble, - { 0.f, .2f }, // Metal, - { 4.f, 1.f }, // ParquetOnConcrete, - { 2.f, .4f }, // PlasterRough, - { 2.f, .4f }, // PlasterSmooth, - { 1.5f, .2f }, // PlywoodPanel, - { 4.f, 1.f }, // PolishedConcreteOrTile, - { 4.f, 1.f }, // Sheetrock, - { 4.f, 1.f }, // WaterOrIceSurface, - { 1.f, .3f }, // WoodCeiling, - { 1.f, .3f }, // WoodPanel, - { 0.f, .0f }, // UniformMaterial, -}; - -} - -float QSpatialAudioRoomPrivate::wallOcclusion(QSpatialAudioRoom::Wall wall) const -{ - return m_wallOcclusion[wall] < 0 ? occlusionAndDampening[roomProperties.material_names[wall]].occlusion : m_wallOcclusion[wall]; -} - -float QSpatialAudioRoomPrivate::wallDampening(QSpatialAudioRoom::Wall wall) const -{ - return m_wallDampening[wall] < 0 ? occlusionAndDampening[roomProperties.material_names[wall]].dampening : m_wallDampening[wall]; -} - -void QSpatialAudioRoomPrivate::update() -{ - if (!dirty) - return; - reflections = vraudio::ComputeReflectionProperties(roomProperties); - reverb = vraudio::ComputeReverbProperties(roomProperties); - dirty = false; -} - - -/*! - \class QSpatialAudioRoom - \inmodule QtMultimedia - \ingroup multimedia_spatialaudio - - Defines a room for the spatial audio engine. - - If the listener is inside a room, first order sound reflections and reverb - matching the rooms properties will get applied to the sound field. - - A room is always square and defined by it's center position, it's orientation and dimensions. - Each of the 6 walls of the room can be made of different materials that will contribute - to the computed reflections and reverb that the listener will experience while being inside - the room. - - If multiple rooms cover the same position, the engine will use the room with the smallest - volume. - */ - -/*! - Constructs a QSpatialAudioRoom for \a engine. - */ -QSpatialAudioRoom::QSpatialAudioRoom(QSpatialAudioEngine *engine) - : d(new QSpatialAudioRoomPrivate) -{ - Q_ASSERT(engine); - d->engine = engine; - auto *ep = QSpatialAudioEnginePrivate::get(engine); - ep->addRoom(this); -} - -/*! - Destroys the room. - */ -QSpatialAudioRoom::~QSpatialAudioRoom() -{ - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - if (ep) - ep->removeRoom(this); - delete d; -} - -/*! - \enum QSpatialAudioRoom::Material - - Defines different materials that can be applied to the different walls of the room. - - \value Transparent The side of the room is open and won't contribute to reflections or reverb. - \value AcousticCeilingTiles Acoustic tiles that suppress most reflections and reverb. - \value BrickBare Bare brick wall. - \value BrickPainted Painted brick wall. - \value ConcreteBlockCoarse Raw concrete wall - \value ConcreteBlockPainted Painted concrete wall - \value CurtainHeavy Heavy curtain. Will mostly reflect low frequencies - \value FiberGlassInsulation Fiber glass insulation. Only reflects very low frequencies - \value GlassThin Thin glass wall - \value GlassThick Thick glass wall - \value Grass Grass - \value LinoleumOnConcrete Linoleum floor - \value Marble Marble floor - \value Metal Metal - \value ParquetOnConcrete Parquet wooden floor on concrete - \value PlasterRough Rough plaster - \value PlasterSmooth Smooth plaster - \value PlywoodPanel Plywodden panel - \value PolishedConcreteOrTile Polished concrete or tiles - \value Sheetrock Rock - \value WaterOrIceSurface Water or ice - \value WoodCeiling Wooden ceiling - \value WoodPanel Wooden panel - \value UniformMaterial Artificial material giving uniform reflections on all frequencies -*/ - -/*! - \enum QSpatialAudioRoom::Wall - - An enum defining the 6 walls of the room - - \value LeftWall Left wall (negative x) - \value RightWall Right wall (positive x) - \value BackWall Back wall (negative y) - \value FrontWall Front wall (positive y) - \value Floor Bottom wall (negative z) - \value Ceiling Top wall (positive z) -*/ - - -/*! - \property QSpatialAudioRoom::position - - Defines the position of the center of the room in 3D space. Units are in centimeters - by default. - - \sa dimensions, QSpatialAudioEngine::distanceScale - */ -void QSpatialAudioRoom::setPosition(QVector3D pos) -{ - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - pos *= ep->distanceScale; - if (toVector(d->roomProperties.position) == pos) - return; - toFloats(pos, d->roomProperties.position); - d->dirty = true; - emit positionChanged(); -} - -QVector3D QSpatialAudioRoom::position() const -{ - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - auto pos = toVector(d->roomProperties.position); - pos /= ep->distanceScale; - return pos; -} - -/*! - \property QSpatialAudioRoom::dimensions - - Defines the dimensions of the room in 3D space. Units are in centimeters - by default. - - \sa position, QSpatialAudioEngine::distanceScale - */ -void QSpatialAudioRoom::setDimensions(QVector3D dim) -{ - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - dim *= ep->distanceScale; - if (toVector(d->roomProperties.dimensions) == dim) - return; - toFloats(dim, d->roomProperties.dimensions); - d->dirty = true; - emit dimensionsChanged(); -} - -QVector3D QSpatialAudioRoom::dimensions() const -{ - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - auto dim = toVector(d->roomProperties.dimensions); - dim /= ep->distanceScale; - return dim; -} - -/*! - \property QSpatialAudioRoom::rotation - - Defines the orientation of the room in 3D space. - */ -void QSpatialAudioRoom::setRotation(const QQuaternion &q) -{ - if (toQuaternion(d->roomProperties.rotation) == q) - return; - toFloats(q, d->roomProperties.rotation); - d->dirty = true; - emit rotationChanged(); -} - -QQuaternion QSpatialAudioRoom::rotation() const -{ - return toQuaternion(d->roomProperties.rotation); -} - -/*! - Sets \a wall to \a material. - - Different wall materials have different reflection and reverb properties - that influence the sound of the room. - - \sa wallMaterial(), Material, QSpatialAudioRoom::Wall - */ -void QSpatialAudioRoom::setWallMaterial(Wall wall, Material material) -{ - static_assert(vraudio::kUniform == int(UniformMaterial)); - static_assert(vraudio::kTransparent == int(Transparent)); - - if (d->roomProperties.material_names[int(wall)] == int(material)) - return; - d->roomProperties.material_names[int(wall)] = vraudio::MaterialName(int(material)); - d->dirty = true; - emit wallsChanged(); -} - -/*! - returns the material being used for \a wall. - - \sa setWallMaterial(), Material, QSpatialAudioRoom::Wall - */ -QSpatialAudioRoom::Material QSpatialAudioRoom::wallMaterial(Wall wall) const -{ - return Material(d->roomProperties.material_names[int(wall)]); -} - -/*! - \property QSpatialAudioRoom::reflectionGain - - A gain factor for reflections generated in this room. A value - from 0 to 1 will dampen reflections, while a value larger than 1 - will apply a gain to reflections, making them louder. - - The default is 1, a factor of 0 disables reflections. Negative - values are mapped to 0. - */ -void QSpatialAudioRoom::setReflectionGain(float factor) -{ - if (factor < 0.) - factor = 0.; - if (d->roomProperties.reflection_scalar == factor) - return; - d->roomProperties.reflection_scalar = factor; - d->dirty = true; - reflectionGainChanged(); -} - -float QSpatialAudioRoom::reflectionGain() const -{ - return d->roomProperties.reflection_scalar; -} - -/*! - \property QSpatialAudioRoom::reverbGain - - A gain factor for reverb generated in this room. A value - from 0 to 1 will dampen reverb, while a value larger than 1 - will apply a gain to the reverb, making it louder. - - The default is 1, a factor of 0 disables reverb. Negative - values are mapped to 0. - */ -void QSpatialAudioRoom::setReverbGain(float factor) -{ - if (factor < 0) - factor = 0; - if (d->roomProperties.reverb_gain == factor) - return; - d->roomProperties.reverb_gain = factor; - d->dirty = true; - reverbGainChanged(); -} - -float QSpatialAudioRoom::reverbGain() const -{ - return d->roomProperties.reverb_gain; -} - -/*! - \property QSpatialAudioRoom::reverbTime - - A factor to be applies to all reverb timings generated for this room. - Larger values will lead to longer reverb timings, making the room sound - larger. - - The default is 1. Negative values are mapped to 0. - */ -void QSpatialAudioRoom::setReverbTime(float factor) -{ - if (factor < 0) - factor = 0; - if (d->roomProperties.reverb_time == factor) - return; - d->roomProperties.reverb_time = factor; - d->dirty = true; - reverbTimeChanged(); -} - -float QSpatialAudioRoom::reverbTime() const -{ - return d->roomProperties.reverb_time; -} - -/*! - \property QSpatialAudioRoom::reverbBrightness - - A brightness factor to be applied to the generated reverb. - A positive value will increase reverb for higher frequencies and - dampen lower frequencies, a negative value does the reverse. - - The default is 0. - */ -void QSpatialAudioRoom::setReverbBrightness(float factor) -{ - if (d->roomProperties.reverb_brightness == factor) - return; - d->roomProperties.reverb_brightness = factor; - d->dirty = true; - reverbBrightnessChanged(); -} - -float QSpatialAudioRoom::reverbBrightness() const -{ - return d->roomProperties.reverb_brightness; -} - -QT_END_NAMESPACE - -#include "moc_qspatialaudioroom.cpp" diff --git a/src/multimedia/spatial/qspatialaudioroom.h b/src/multimedia/spatial/qspatialaudioroom.h deleted file mode 100644 index a3bba8930..000000000 --- a/src/multimedia/spatial/qspatialaudioroom.h +++ /dev/null @@ -1,141 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2022 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Spatial Audio module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL-NOGPL2$ -** 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 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QSPATIALAUDIOROOM_H -#define QSPATIALAUDIOROOM_H - -#include <QtMultimedia/qtmultimediaglobal.h> -#include <QtCore/qobject.h> -#include <QtGui/qvector3d.h> - -QT_BEGIN_NAMESPACE - -class QSpatialAudioEngine; -class QSpatialAudioRoomPrivate; - -class Q_MULTIMEDIA_EXPORT QSpatialAudioRoom : public QObject -{ - Q_OBJECT - Q_PROPERTY(QVector3D position READ position WRITE setPosition NOTIFY positionChanged) - Q_PROPERTY(QVector3D dimensions READ dimensions WRITE setDimensions NOTIFY dimensionsChanged) - Q_PROPERTY(QQuaternion rotation READ rotation WRITE setRotation NOTIFY rotationChanged) - Q_PROPERTY(float reflectionGain READ reflectionGain WRITE setReflectionGain NOTIFY reflectionGainChanged) - Q_PROPERTY(float reverbGain READ reverbGain WRITE setReverbGain NOTIFY reverbGainChanged) - Q_PROPERTY(float reverbTime READ reverbTime WRITE setReverbTime NOTIFY reverbTimeChanged) - Q_PROPERTY(float reverbBrightness READ reverbBrightness WRITE setReverbBrightness NOTIFY reverbBrightnessChanged) -public: - QSpatialAudioRoom(QSpatialAudioEngine *engine); - ~QSpatialAudioRoom(); - - enum Material { - Transparent, - AcousticCeilingTiles, - BrickBare, - BrickPainted, - ConcreteBlockCoarse, - ConcreteBlockPainted, - CurtainHeavy, - FiberGlassInsulation, - GlassThin, - GlassThick, - Grass, - LinoleumOnConcrete, - Marble, - Metal, - ParquetOnConcrete, - PlasterRough, - PlasterSmooth, - PlywoodPanel, - PolishedConcreteOrTile, - Sheetrock, - WaterOrIceSurface, - WoodCeiling, - WoodPanel, - UniformMaterial, - }; - - enum Wall { - LeftWall, - RightWall, - Floor, - Ceiling, - FrontWall, - BackWall - }; - - void setPosition(QVector3D pos); - QVector3D position() const; - - void setDimensions(QVector3D pos); - QVector3D dimensions() const; - - void setRotation(const QQuaternion &q); - QQuaternion rotation() const; - - void setWallMaterial(Wall wall, Material material); - Material wallMaterial(Wall wall) const; - - void setReflectionGain(float factor); - float reflectionGain() const; - - void setReverbGain(float factor); - float reverbGain() const; - - void setReverbTime(float factor); - float reverbTime() const; - - void setReverbBrightness(float factor); - float reverbBrightness() const; - -Q_SIGNALS: - void positionChanged(); - void dimensionsChanged(); - void rotationChanged(); - void wallsChanged(); - void reflectionGainChanged(); - void reverbGainChanged(); - void reverbTimeChanged(); - void reverbBrightnessChanged(); - -private: - friend class QSpatialAudioRoomPrivate; - QSpatialAudioRoomPrivate *d; -}; - -QT_END_NAMESPACE - -#endif diff --git a/src/multimedia/spatial/qspatialaudioroom_p.h b/src/multimedia/spatial/qspatialaudioroom_p.h deleted file mode 100644 index 668570eef..000000000 --- a/src/multimedia/spatial/qspatialaudioroom_p.h +++ /dev/null @@ -1,83 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2022 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Spatial Audio module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL-NOGPL2$ -** 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 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QSPATIALAUDIOROOM_P_H -#define QSPATIALAUDIOROOM_P_H - -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <qspatialaudioroom.h> -#include <qspatialaudioengine_p.h> -#include <QtGui/qquaternion.h> - -#include <resonance_audio_api_extensions.h> -#include "platforms/common/room_effects_utils.h" -#include "platforms/common/room_properties.h" - -QT_BEGIN_NAMESPACE - -class QSpatialAudioRoomPrivate -{ -public: - static QSpatialAudioRoomPrivate *get(const QSpatialAudioRoom *r) { return r->d; } - - QSpatialAudioEngine *engine = nullptr; - vraudio::RoomProperties roomProperties; - bool dirty = true; - - vraudio::ReverbProperties reverb; - vraudio::ReflectionProperties reflections; - - float m_wallOcclusion[6] = { -1.f, -1.f, -1.f, -1.f, -1.f, -1.f }; - float m_wallDampening[6] = { -1.f, -1.f, -1.f, -1.f, -1.f, -1.f }; - - float wallOcclusion(QSpatialAudioRoom::Wall wall) const; - float wallDampening(QSpatialAudioRoom::Wall wall) const; - - void update(); -}; - -QT_END_NAMESPACE - -#endif diff --git a/src/multimedia/spatial/qspatialaudiosoundsource.cpp b/src/multimedia/spatial/qspatialaudiosoundsource.cpp deleted file mode 100644 index c86e6351b..000000000 --- a/src/multimedia/spatial/qspatialaudiosoundsource.cpp +++ /dev/null @@ -1,617 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2022 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Spatial Audio module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL-NOGPL2$ -** 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 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include "qspatialaudioroom_p.h" -#include "qspatialaudiosoundsource_p.h" -#include "qspatialaudiolistener.h" -#include "qspatialaudioengine_p.h" -#include "qspatialaudioroom.h" -#include "api/resonance_audio_api.h" -#include <qaudiosink.h> -#include <qurl.h> -#include <qdebug.h> -#include <qaudiodecoder.h> - -QT_BEGIN_NAMESPACE - -/*! - \class QSpatialAudioSoundSource - \inmodule QtMultimedia - \ingroup multimedia_spatialaudio - - \brief A sound object in 3D space. - - QSpatialAudioSoundSource represents an audible object in 3D space. You can define - it's position and orientation in space, set the sound it is playing and define a - volume for the object. - - The object can have different attenuation behavior, emit sound mainly in one direction - or spherically, and behave as if occluded by some other object. - */ - -/*! - Creates a spatial sound source for \a engine. The object can be placed in - 3D space and will be louder the closer to the listener it is. - */ -QSpatialAudioSoundSource::QSpatialAudioSoundSource(QSpatialAudioEngine *engine) - : d(new QSpatialAudioSoundSourcePrivate(this)) -{ - setEngine(engine); -} - -/*! - Destroys the sound source. - */ -QSpatialAudioSoundSource::~QSpatialAudioSoundSource() -{ - setEngine(nullptr); -} - -/*! - \property QSpatialAudioSoundSource::position - - Defines the position of the sound source in 3D space. Units are in centimeters - by default. - - \sa QSpatialAudioEngine::distanceScale - */ -void QSpatialAudioSoundSource::setPosition(QVector3D pos) -{ - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - pos *= ep->distanceScale; - d->pos = pos; - if (ep) - ep->api->SetSourcePosition(d->sourceId, pos.x(), pos.y(), pos.z()); - d->updateRoomEffects(); - emit positionChanged(); -} - -QVector3D QSpatialAudioSoundSource::position() const -{ - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - return d->pos/ep->distanceScale; -} - -/*! - \property QSpatialAudioSoundSource::rotation - - Defines the orientation of the sound source in 3D space. - */ -void QSpatialAudioSoundSource::setRotation(const QQuaternion &q) -{ - d->rotation = q; - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - if (ep) - ep->api->SetSourceRotation(d->sourceId, q.x(), q.y(), q.z(), q.scalar()); - emit rotationChanged(); -} - -QQuaternion QSpatialAudioSoundSource::rotation() const -{ - return d->rotation; -} - -/*! - \property QSpatialAudioSoundSource::volume - - Defines the volume of the sound. - - Values between 0 and 1 will attenuate the sound, while values above 1 - provide an additional gain boost. - */ -void QSpatialAudioSoundSource::setVolume(float volume) -{ - if (d->volume == volume) - return; - d->volume = volume; - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - if (ep) - ep->api->SetSourceVolume(d->sourceId, d->volume*d->wallDampening); - emit volumeChanged(); -} - -float QSpatialAudioSoundSource::volume() const -{ - return d->volume; -} - -/*! - \enum QSpatialAudioSoundSource::DistanceModel - - Defines how the volume of the sound scales with distance to the listener. - - \value DistanceModel_Logarithmic Volume decreases logarithmically with distance. - \value DistanceModel_Linear Volume decreases linearly with distance. - \value DistanceModel_ManualAttenutation Attenuation is defined manually using the - \l manualAttenuation property. -*/ - -/*! - \property QSpatialAudioSoundSource::distanceModel - - Defines distance model for this sound source. The volume starts scaling down - from \l size to \l distanceCutoff. The volume is constant for distances smaller - than size and zero for distances larger than the cutoff distance. - - \sa QSpatialAudioSoundSource::DistanceModel - */ -void QSpatialAudioSoundSource::setDistanceModel(DistanceModel model) -{ - if (d->distanceModel == model) - return; - d->distanceModel = model; - - d->updateDistanceModel(); - emit distanceModelChanged(); -} - -void QSpatialAudioSoundSourcePrivate::updateDistanceModel() -{ - if (!engine || sourceId < 0) - return; - auto *ep = QSpatialAudioEnginePrivate::get(engine); - - vraudio::DistanceRolloffModel dm = vraudio::kLogarithmic; - switch (distanceModel) { - case QSpatialAudioSoundSource::DistanceModel_Linear: - dm = vraudio::kLinear; - break; - case QSpatialAudioSoundSource::DistanceModel_ManualAttenutation: - dm = vraudio::kNone; - break; - default: - break; - } - - ep->api->SetSourceDistanceModel(sourceId, dm, size, distanceCutoff); -} - -void QSpatialAudioSoundSourcePrivate::updateRoomEffects() -{ - if (!engine || sourceId < 0) - return; - auto *ep = QSpatialAudioEnginePrivate::get(engine); - if (!ep->currentRoom) - return; - auto *rp = QSpatialAudioRoomPrivate::get(ep->currentRoom); - - QVector3D roomDim2 = ep->currentRoom->dimensions()/2.; - QVector3D roomPos = ep->currentRoom->position(); - QQuaternion roomRot = ep->currentRoom->rotation(); - QVector3D dist = pos - roomPos; - // transform into room coordinates - dist = roomRot.rotatedVector(dist); - if (qAbs(dist.x()) <= roomDim2.x() && - qAbs(dist.y()) <= roomDim2.y() && - qAbs(dist.z()) <= roomDim2.z()) { - // Source is inside room, apply - ep->api->SetSourceRoomEffectsGain(sourceId, 1); - wallDampening = 1.; - wallOcclusion = 0.; - } else { - // ### calculate room occlusion and dampening - // This is a bit of heuristics on top of the heuristic dampening/occlusion numbers for walls - // - // We basically cast a ray from the listener through the walls. If walls have different characteristics - // and we get close to a corner, we try to use some averaging to avoid abrupt changes - auto relativeListenerPos = ep->listenerPosition() - roomPos; - relativeListenerPos = roomRot.rotatedVector(relativeListenerPos); - - auto direction = dist.normalized(); - enum { - X, Y, Z - }; - // Very rough approximation, use the size of the source plus twice the size of our head. - // One could probably improve upon this. - const float transitionDistance = size + 0.4; - QSpatialAudioRoom::Wall walls[3]; - walls[X] = direction.x() > 0 ? QSpatialAudioRoom::RightWall : QSpatialAudioRoom::LeftWall; - walls[Y] = direction.y() > 0 ? QSpatialAudioRoom::FrontWall : QSpatialAudioRoom::BackWall; - walls[Z] = direction.z() > 0 ? QSpatialAudioRoom::Ceiling : QSpatialAudioRoom::Floor; - float factors[3] = { 0., 0., 0. }; - bool foundWall = false; - if (direction.x() != 0) { - float sign = direction.x() > 0 ? 1.f : -1.f; - float dx = sign * roomDim2.x() - relativeListenerPos.x(); - QVector3D intersection = relativeListenerPos + direction*dx/direction.x(); - float dy = roomDim2.y() - qAbs(intersection.y()); - float dz = roomDim2.z() - qAbs(intersection.z()); - if (dy > 0 && dz > 0) { -// qDebug() << "Hit with wall X" << walls[0] << dy << dz; - // Ray is hitting this wall - factors[Y] = qMax(0.f, 1.f/3.f - dy/transitionDistance); - factors[Z] = qMax(0.f, 1.f/3.f - dz/transitionDistance); - factors[X] = 1.f - factors[Y] - factors[Z]; - foundWall = true; - } - } - if (!foundWall && direction.y() != 0) { - float sign = direction.y() > 0 ? 1.f : -1.f; - float dy = sign * roomDim2.y() - relativeListenerPos.y(); - QVector3D intersection = relativeListenerPos + direction*dy/direction.y(); - float dx = roomDim2.x() - qAbs(intersection.x()); - float dz = roomDim2.z() - qAbs(intersection.z()); - if (dx > 0 && dz > 0) { - // Ray is hitting this wall -// qDebug() << "Hit with wall Y" << walls[1] << dx << dy; - factors[X] = qMax(0.f, 1.f/3.f - dx/transitionDistance); - factors[Z] = qMax(0.f, 1.f/3.f - dz/transitionDistance); - factors[Y] = 1.f - factors[X] - factors[Z]; - foundWall = true; - } - } - if (!foundWall) { - Q_ASSERT(direction.z() != 0); - float sign = direction.z() > 0 ? 1.f : -1.f; - float dz = sign * roomDim2.z() - relativeListenerPos.z(); - QVector3D intersection = relativeListenerPos + direction*dz/direction.z(); - float dx = roomDim2.x() - qAbs(intersection.x()); - float dy = roomDim2.y() - qAbs(intersection.y()); - if (dx > 0 && dy > 0) { - // Ray is hitting this wall -// qDebug() << "Hit with wall Z" << walls[2]; - factors[X] = qMax(0.f, 1.f/3.f - dx/transitionDistance); - factors[Y] = qMax(0.f, 1.f/3.f - dy/transitionDistance); - factors[Z] = 1.f - factors[X] - factors[Y]; - foundWall = true; - } - } - wallDampening = 0; - wallOcclusion = 0; - for (int i = 0; i < 3; ++i) { - wallDampening += factors[i]*rp->wallDampening(walls[i]); - wallOcclusion += factors[i]*rp->wallOcclusion(walls[i]); - } - -// qDebug() << "intersection with wall" << walls[0] << walls[1] << walls[2] << factors[0] << factors[1] << factors[2] << wallDampening << wallOcclusion; - ep->api->SetSourceRoomEffectsGain(sourceId, 0); - } - ep->api->SetSoundObjectOcclusionIntensity(sourceId, occlusionIntensity + wallOcclusion); - ep->api->SetSourceVolume(sourceId, volume*wallDampening); -} - -QSpatialAudioSoundSource::DistanceModel QSpatialAudioSoundSource::distanceModel() const -{ - return d->distanceModel; -} - -/*! - \property QSpatialAudioSoundSource::size - - Defines the size of the sound source. If the listener is closer to the sound - object than the size, volume will stay constant. The size is also used to for - occlusion calculations, where large sources can be partially occluded by a wall. - */ -void QSpatialAudioSoundSource::setSize(float size) -{ - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - size *= ep->distanceScale; - if (d->size == size) - return; - d->size = size; - - d->updateDistanceModel(); - emit sizeChanged(); -} - -float QSpatialAudioSoundSource::size() const -{ - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - return d->size/ep->distanceScale; -} - -/*! - \property QSpatialAudioSoundSource::distanceCutoff - - Defines a distance beyond which sound coming from the source will cutoff. - If the listener is further away from the sound object than the cutoff - distance it won't be audible anymore. - */ -void QSpatialAudioSoundSource::setDistanceCutoff(float cutoff) -{ - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - cutoff *= ep->distanceScale; - if (d->distanceCutoff == cutoff) - return; - d->distanceCutoff = cutoff; - - d->updateDistanceModel(); - emit distanceCutoffChanged(); -} - -float QSpatialAudioSoundSource::distanceCutoff() const -{ - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - return d->distanceCutoff/ep->distanceScale; -} - -/*! - \property QSpatialAudioSoundSource::manualAttenuation - - Defines a manual attenuation factor if \l distanceModel is set to - QSpatialAudioSoundSource::DistanceModel_ManualAttenutation. - */ -void QSpatialAudioSoundSource::setManualAttenuation(float attenuation) -{ - if (d->manualAttenuation == attenuation) - return; - d->manualAttenuation = attenuation; - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - if (ep) - ep->api->SetSourceDistanceAttenuation(d->sourceId, d->manualAttenuation); - emit manualAttenuationChanged(); -} - -float QSpatialAudioSoundSource::manualAttenuation() const -{ - return d->manualAttenuation; -} - -/*! - \property QSpatialAudioSoundSource::occlusionIntensity - - Defines how much the object is occluded. 0 implies the object is - not occluded at all, 1 implies the sound source is fully occluded by - another object. - - A fully occluded object will still be audible, but especially higher - frequencies will be dampened. In addition, the object will still - participate in generating reverb and reflections in the room. - - Values larger than 1 are possible to further dampen the direct - sound coming from the source. - - The default is 0. - */ -void QSpatialAudioSoundSource::setOcclusionIntensity(float occlusion) -{ - if (d->occlusionIntensity == occlusion) - return; - d->occlusionIntensity = occlusion; - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - if (ep) - ep->api->SetSoundObjectOcclusionIntensity(d->sourceId, d->occlusionIntensity + d->wallOcclusion); - emit occlusionIntensityChanged(); -} - -float QSpatialAudioSoundSource::occlusionIntensity() const -{ - return d->occlusionIntensity; -} - -/*! - \property QSpatialAudioSoundSource::directivity - - Defines the directivity of the sound source. A value of 0 implies that the sound is - emitted equally in all directions, while a value of 1 implies that the source mainly - emits sound in the forward direction. - - Valid values are between 0 and 1, the default is 0. - */ -void QSpatialAudioSoundSource::setDirectivity(float alpha) -{ - alpha = qBound(0., alpha, 1.); - if (alpha == d->directivity) - return; - d->directivity = alpha; - - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - if (ep) - ep->api->SetSoundObjectDirectivity(d->sourceId, d->directivity, d->directivityOrder); - - emit directivityChanged(); -} - -float QSpatialAudioSoundSource::directivity() const -{ - return d->directivity; -} - -/*! - \property QSpatialAudioSoundSource::directivityOrder - - Defines the order of the directivity of the sound source. A higher order - implies a sharper localization of the sound cone. - - The minimum value and default for this property is 1. - */ -void QSpatialAudioSoundSource::setDirectivityOrder(float order) -{ - order = qMax(order, 1.); - if (order == d->directivityOrder) - return; - d->directivityOrder = order; - - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - if (ep) - ep->api->SetSoundObjectDirectivity(d->sourceId, d->directivity, d->directivityOrder); - - emit directivityChanged(); -} - -float QSpatialAudioSoundSource::directivityOrder() const -{ - return d->directivityOrder; -} - -/*! - \property QSpatialAudioSoundSource::nearFieldGain - - Defines the near field gain for the sound source. Valid values are between 0 and 1. - A near field gain of 1 will raise the volume of the sound signal by approx 20 dB for - distances very close to the listener. - */ -void QSpatialAudioSoundSource::setNearFieldGain(float gain) -{ - gain = qBound(0., gain, 1.); - if (gain == d->nearFieldGain) - return; - d->nearFieldGain = gain; - - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - if (ep) - ep->api->SetSoundObjectNearFieldEffectGain(d->sourceId, d->nearFieldGain/9.); - - emit nearFieldGainChanged(); - -} - -float QSpatialAudioSoundSource::nearFieldGain() const -{ - return d->nearFieldGain; -} - -/*! - \property QSpatialAudioSoundSource::source - - The source file for the sound to be played. - */ -void QSpatialAudioSoundSource::setSource(const QUrl &url) -{ - if (d->url == url) - return; - d->url = url; - - d->load(); - emit sourceChanged(); -} - -QUrl QSpatialAudioSoundSource::source() const -{ - return d->url; -} - -/*! - \property QSpatialAudioSoundSource::loops - - Determines how many times the sound is played before the player stops. - Set to QSpatialAudioSoundSource::Infinite to play the current sound in a loop forever. - - The default value is \c 1. - */ -int QSpatialAudioSoundSource::loops() const -{ - return d->m_loops.loadRelaxed(); -} - -void QSpatialAudioSoundSource::setLoops(int loops) -{ - int oldLoops = d->m_loops.fetchAndStoreRelaxed(loops); - if (oldLoops != loops) - emit loopsChanged(); -} - -/*! - \property QSpatialAudioSoundSource::autoPlay - - Determines whether the sound should automatically start playing when a source - gets specified. - - The default value is \c true. - */ -bool QSpatialAudioSoundSource::autoPlay() const -{ - return d->m_autoPlay.loadRelaxed(); -} - -void QSpatialAudioSoundSource::setAutoPlay(bool autoPlay) -{ - bool old = d->m_autoPlay.fetchAndStoreRelaxed(autoPlay); - if (old != autoPlay) - emit autoPlayChanged(); -} - -/*! - Starts playing back the sound. Does nothing if the sound is already playing. - */ -void QSpatialAudioSoundSource::play() -{ - d->play(); -} - -/*! - Pauses sound playback. Calling play() will continue playback. - */ -void QSpatialAudioSoundSource::pause() -{ - d->pause(); -} - -/*! - Stops sound playback and resets the current position and current loop count to 0. - Calling play() will start playback at the beginning of the sound file. - */ -void QSpatialAudioSoundSource::stop() -{ - d->stop(); -} - -/*! - \internal - */ -void QSpatialAudioSoundSource::setEngine(QSpatialAudioEngine *engine) -{ - if (d->engine == engine) - return; - auto *ep = QSpatialAudioEnginePrivate::get(engine); - - if (ep) - ep->removeSpatialSound(this); - d->engine = engine; - - ep = QSpatialAudioEnginePrivate::get(engine); - if (ep) { - ep->addSpatialSound(this); - ep->api->SetSourcePosition(d->sourceId, d->pos.x(), d->pos.y(), d->pos.z()); - ep->api->SetSourceRotation(d->sourceId, d->rotation.x(), d->rotation.y(), d->rotation.z(), d->rotation.scalar()); - ep->api->SetSourceVolume(d->sourceId, d->volume); - ep->api->SetSoundObjectDirectivity(d->sourceId, d->directivity, d->directivityOrder); - ep->api->SetSoundObjectNearFieldEffectGain(d->sourceId, d->nearFieldGain); - d->updateDistanceModel(); - } -} - -/*! - Returns the engine associated with this listener. - */ -QSpatialAudioEngine *QSpatialAudioSoundSource::engine() const -{ - return d->engine; -} - -QT_END_NAMESPACE - -#include "moc_qspatialaudiosoundsource.cpp" diff --git a/src/multimedia/spatial/qspatialaudiosoundsource.h b/src/multimedia/spatial/qspatialaudiosoundsource.h deleted file mode 100644 index cd0d8fe75..000000000 --- a/src/multimedia/spatial/qspatialaudiosoundsource.h +++ /dev/null @@ -1,161 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2022 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Spatial Audio module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL-NOGPL2$ -** 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 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QSPATIALAUDIOSOURCE_H -#define QSPATIALAUDIOSOURCE_H - -#include <QtMultimedia/qtmultimediaglobal.h> -#include <QtCore/QObject> -#include <QtGui/qvector3d.h> -#include <QtGui/qquaternion.h> - -QT_BEGIN_NAMESPACE - -class QSpatialAudioEngine; -class QSpatialAudioSound; - -class QSpatialAudioSoundSourcePrivate; -class Q_MULTIMEDIA_EXPORT QSpatialAudioSoundSource : public QObject -{ - Q_OBJECT - Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) - Q_PROPERTY(QVector3D position READ position WRITE setPosition NOTIFY positionChanged) - Q_PROPERTY(QQuaternion rotation READ rotation WRITE setRotation NOTIFY rotationChanged) - Q_PROPERTY(float volume READ volume WRITE setVolume NOTIFY volumeChanged) - Q_PROPERTY(DistanceModel distanceModel READ distanceModel WRITE setDistanceModel NOTIFY distanceModelChanged) - Q_PROPERTY(float size READ size WRITE setSize NOTIFY sizeChanged) - Q_PROPERTY(float distanceCutoff READ distanceCutoff WRITE setDistanceCutoff NOTIFY distanceCutoffChanged) - Q_PROPERTY(float manualAttenuation READ manualAttenuation WRITE setManualAttenuation NOTIFY manualAttenuationChanged) - Q_PROPERTY(float occlusionIntensity READ occlusionIntensity WRITE setOcclusionIntensity NOTIFY occlusionIntensityChanged) - Q_PROPERTY(float directivity READ directivity WRITE setDirectivity NOTIFY directivityChanged) - Q_PROPERTY(float directivityOrder READ directivityOrder WRITE setDirectivityOrder NOTIFY directivityOrderChanged) - Q_PROPERTY(float nearFieldGain READ nearFieldGain WRITE setNearFieldGain NOTIFY nearFieldGainChanged) - Q_PROPERTY(int loops READ loops WRITE setLoops NOTIFY loopsChanged) - Q_PROPERTY(bool autoPlay READ autoPlay WRITE setAutoPlay NOTIFY autoPlayChanged) - -public: - explicit QSpatialAudioSoundSource(QSpatialAudioEngine *engine); - ~QSpatialAudioSoundSource(); - - void setSource(const QUrl &url); - QUrl source() const; - - enum Loops - { - Infinite = -1, - Once = 1 - }; - Q_ENUM(Loops) - - int loops() const; - void setLoops(int loops); - - bool autoPlay() const; - void setAutoPlay(bool autoPlay); - - void setPosition(QVector3D pos); - QVector3D position() const; - - void setRotation(const QQuaternion &q); - QQuaternion rotation() const; - - void setVolume(float volume); - float volume() const; - - enum DistanceModel { - DistanceModel_Logarithmic, - DistanceModel_Linear, - DistanceModel_ManualAttenutation - }; - Q_ENUM(DistanceModel); - - void setDistanceModel(DistanceModel model); - DistanceModel distanceModel() const; - - void setSize(float size); - float size() const; - - void setDistanceCutoff(float cutoff); - float distanceCutoff() const; - - void setManualAttenuation(float attenuation); - float manualAttenuation() const; - - void setOcclusionIntensity(float occlusion); - float occlusionIntensity() const; - - void setDirectivity(float alpha); - float directivity() const; - - void setDirectivityOrder(float alpha); - float directivityOrder() const; - - void setNearFieldGain(float gain); - float nearFieldGain() const; - - QSpatialAudioEngine *engine() const; - -Q_SIGNALS: - void sourceChanged(); - void loopsChanged(); - void autoPlayChanged(); - void positionChanged(); - void rotationChanged(); - void volumeChanged(); - void distanceModelChanged(); - void sizeChanged(); - void distanceCutoffChanged(); - void manualAttenuationChanged(); - void occlusionIntensityChanged(); - void directivityChanged(); - void directivityOrderChanged(); - void nearFieldGainChanged(); - -public Q_SLOTS: - void play(); - void pause(); - void stop(); - -private: - void setEngine(QSpatialAudioEngine *engine); - friend class QSpatialAudioSound; - friend class QSpatialAudioSoundSourcePrivate; - QSpatialAudioSoundSourcePrivate *d = nullptr; -}; - -QT_END_NAMESPACE - -#endif diff --git a/src/multimedia/spatial/qspatialaudiosoundsource_p.h b/src/multimedia/spatial/qspatialaudiosoundsource_p.h deleted file mode 100644 index 83bd2d232..000000000 --- a/src/multimedia/spatial/qspatialaudiosoundsource_p.h +++ /dev/null @@ -1,95 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2022 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Spatial Audio module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL-NOGPL2$ -** 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 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QSPATIALAUDIOSOUNDSOURCE_P_H -#define QSPATIALAUDIOSOUNDSOURCE_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of other Qt classes. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <qspatialaudiosoundsource.h> -#include <qspatialaudioengine_p.h> -#include <qurl.h> -#include <qvector3d.h> -#include <qquaternion.h> -#include <qaudiobuffer.h> -#include <qaudiodevice.h> -#include <qmutex.h> - -QT_BEGIN_NAMESPACE - -class QAudioDecoder; -class QSpatialAudioEnginePrivate; - -class QSpatialAudioSoundSourcePrivate : public QSpatialAudioSound -{ -public: - QSpatialAudioSoundSourcePrivate(QObject *parent) - : QSpatialAudioSound(parent, 1) - {} - - static QSpatialAudioSoundSourcePrivate *get(QSpatialAudioSoundSource *soundSource) - { return soundSource ? soundSource->d : nullptr; } - - QVector3D pos; - QQuaternion rotation; - QSpatialAudioSoundSource::DistanceModel distanceModel = QSpatialAudioSoundSource::DistanceModel_Logarithmic; - float size = .1f; - float distanceCutoff = 50.f; - float manualAttenuation = 0.f; - float occlusionIntensity = 0.f; - float directivity = 0.f; - float directivityOrder = 1.f; - float nearFieldGain = 0.f; - float wallDampening = 1.f; - float wallOcclusion = 0.f; - - void updateDistanceModel(); - void updateRoomEffects(); -}; - -QT_END_NAMESPACE - -#endif diff --git a/src/multimedia/spatial/qspatialaudiostereosource.cpp b/src/multimedia/spatial/qspatialaudiostereosource.cpp deleted file mode 100644 index 61f3a47b2..000000000 --- a/src/multimedia/spatial/qspatialaudiostereosource.cpp +++ /dev/null @@ -1,215 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2022 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Spatial Audio module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL-NOGPL2$ -** 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 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include "qspatialaudiostereosource.h" -#include "qspatialaudiolistener.h" -#include "qspatialaudioengine_p.h" -#include "api/resonance_audio_api.h" -#include <qaudiosink.h> -#include <qurl.h> -#include <qdebug.h> -#include <qaudiodecoder.h> - -QT_BEGIN_NAMESPACE - -/*! - \class QSpatialAudioStereoSource - \inmodule QtMultimedia - \ingroup multimedia_spatialaudio - - \brief A stereo overlay sound. - - QSpatialAudioStereoSource represents a position and orientation independent sound. - It's commonly used for background sounds (e.g. music) that is supposed to be independent - of the listeners position and orientation. - */ - -/*! - Creates a stereo sound source for \a engine. - */ -QSpatialAudioStereoSource::QSpatialAudioStereoSource(QSpatialAudioEngine *engine) - : d(new QSpatialAudioSound(this)) -{ - setEngine(engine); -} - -QSpatialAudioStereoSource::~QSpatialAudioStereoSource() -{ - setEngine(nullptr); - delete d; -} - -/*! - \property QSpatialAudioStereoSource::volume - - Defines the volume of the sound. - - Values between 0 and 1 will attenuate the sound, while values above 1 - provide an additional gain boost. - */ -void QSpatialAudioStereoSource::setVolume(float volume) -{ - if (d->volume == volume) - return; - d->volume = volume; - auto *ep = QSpatialAudioEnginePrivate::get(d->engine); - if (ep) - ep->api->SetSourceVolume(d->sourceId, d->volume); - emit volumeChanged(); -} - -float QSpatialAudioStereoSource::volume() const -{ - return d->volume; -} - -void QSpatialAudioStereoSource::setSource(const QUrl &url) -{ - if (d->url == url) - return; - d->url = url; - - d->load(); - emit sourceChanged(); -} - -/*! - \property QSpatialAudioStereoSource::source - - The source file for the sound to be played. - */ -QUrl QSpatialAudioStereoSource::source() const -{ - return d->url; -} - -/*! - \property QSpatialAudioStereoSource::loops - - Determines how many times the sound is played before the player stops. - Set to QSpatialAudioSoundSource::Infinite to play the current sound in - a loop forever. - - The default value is \c 1. - */ -int QSpatialAudioStereoSource::loops() const -{ - return d->m_loops.loadRelaxed(); -} - -void QSpatialAudioStereoSource::setLoops(int loops) -{ - int oldLoops = d->m_loops.fetchAndStoreRelaxed(loops); - if (oldLoops != loops) - emit loopsChanged(); -} - -/*! - \property QSpatialAudioStereoSource::autoPlay - - Determines whether the sound should automatically start playing when a source - gets specified. - - The default value is \c true. - */ -bool QSpatialAudioStereoSource::autoPlay() const -{ - return d->m_autoPlay.loadRelaxed(); -} - -void QSpatialAudioStereoSource::setAutoPlay(bool autoPlay) -{ - bool old = d->m_autoPlay.fetchAndStoreRelaxed(autoPlay); - if (old != autoPlay) - emit autoPlayChanged(); -} - -/*! - Starts playing back the sound. Does nothing if the sound is already playing. - */ -void QSpatialAudioStereoSource::play() -{ - d->play(); -} - -/*! - Pauses sound playback. Calling play() will continue playback. - */ -void QSpatialAudioStereoSource::pause() -{ - d->pause(); -} - -/*! - Stops sound playback and resets the current position and current loop count to 0. - Calling play() will start playback at the beginning of the sound file. - */ -void QSpatialAudioStereoSource::stop() -{ - d->stop(); -} - -/*! - \internal - */ -void QSpatialAudioStereoSource::setEngine(QSpatialAudioEngine *engine) -{ - if (d->engine == engine) - return; - auto *ep = QSpatialAudioEnginePrivate::get(engine); - - if (ep) - ep->removeStereoSound(this); - d->engine = engine; - - ep = QSpatialAudioEnginePrivate::get(engine); - if (ep) { - ep->addStereoSound(this); - ep->api->SetSourceVolume(d->sourceId, d->volume); - } -} - -/*! - Returns the engine associated with this listener. - */ -QSpatialAudioEngine *QSpatialAudioStereoSource::engine() const -{ - return d->engine; -} - -QT_END_NAMESPACE - -#include "moc_qspatialaudiostereosource.cpp" diff --git a/src/multimedia/spatial/qspatialaudiostereosource.h b/src/multimedia/spatial/qspatialaudiostereosource.h deleted file mode 100644 index 402aee9f8..000000000 --- a/src/multimedia/spatial/qspatialaudiostereosource.h +++ /dev/null @@ -1,102 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2022 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Spatial Audio module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL-NOGPL2$ -** 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 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QSPATIALAUDIOSTEREOSOURCE_H -#define QSPATIALAUDIOSTEREOSOURCE_H - -#include <QtMultimedia/qtmultimediaglobal.h> -#include <QtCore/QUrl> -#include <QtCore/QObject> - -QT_BEGIN_NAMESPACE - -class QSpatialAudioEngine; -class QSpatialAudioSound; - -class QSpatialAudioStereoSourcePrivate; -class Q_MULTIMEDIA_EXPORT QSpatialAudioStereoSource : public QObject -{ - Q_OBJECT - Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) - Q_PROPERTY(float volume READ volume WRITE setVolume NOTIFY volumeChanged) - Q_PROPERTY(int loops READ loops WRITE setLoops NOTIFY loopsChanged) - Q_PROPERTY(bool autoPlay READ autoPlay WRITE setAutoPlay NOTIFY autoPlayChanged) - -public: - explicit QSpatialAudioStereoSource(QSpatialAudioEngine *engine); - ~QSpatialAudioStereoSource(); - - void setSource(const QUrl &url); - QUrl source() const; - - enum Loops - { - Infinite = -1, - Once = 1 - }; - Q_ENUM(Loops) - - int loops() const; - void setLoops(int loops); - - bool autoPlay() const; - void setAutoPlay(bool autoPlay); - - void setVolume(float volume); - float volume() const; - - QSpatialAudioEngine *engine() const; - -Q_SIGNALS: - void sourceChanged(); - void loopsChanged(); - void autoPlayChanged(); - void volumeChanged(); - -public Q_SLOTS: - void play(); - void pause(); - void stop(); - -private: - void setEngine(QSpatialAudioEngine *engine); - friend class QSpatialAudioSound; - QSpatialAudioSound *d = nullptr; -}; - -QT_END_NAMESPACE - -#endif diff --git a/src/multimedia/video/qabstractvideobuffer.cpp b/src/multimedia/video/qabstractvideobuffer.cpp index 803c09c8d..7368082b1 100644 --- a/src/multimedia/video/qabstractvideobuffer.cpp +++ b/src/multimedia/video/qabstractvideobuffer.cpp @@ -1,180 +1,115 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ - -#include "qabstractvideobuffer_p.h" - -#include <qvariant.h> -#include <private/qrhi_p.h> - -#include <QDebug> +// Copyright (C) 2024 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 "qabstractvideobuffer.h" QT_BEGIN_NAMESPACE /*! \class QAbstractVideoBuffer - \internal + \since 6.8 \brief The QAbstractVideoBuffer class is an abstraction for video data. \inmodule QtMultimedia \ingroup multimedia \ingroup multimedia_video - The QVideoFrame class makes use of a QAbstractVideoBuffer internally to reference a buffer of - video data. Quite often video data buffers may reside in video memory rather than system - memory, and this class provides an abstraction of the location. - - In addition, creating a subclass of QAbstractVideoBuffer will allow you to construct video - frames from preallocated or static buffers. This caters for cases where the QVideoFrame constructors - taking a QByteArray or a QImage do not suffice. This may be necessary when implementing - a new hardware accelerated video system, for example. + The \l QVideoFrame class makes use of a QAbstractVideoBuffer internally to reference a buffer of + video data. Creating a subclass of QAbstractVideoBuffer allows you to construct video + frames from preallocated or static buffers. The subclass can contain a hardware buffer, + and implement access to the data by mapping the buffer to CPU memory. The contents of a buffer can be accessed by mapping the buffer to memory using the map() - function, which returns a pointer to memory containing the contents of the video buffer. - The memory returned by map() is released by calling the unmap() function. - - The handle() of a buffer may also be used to manipulate its contents using type specific APIs. - The type of a buffer's handle is given by the handleType() function. + function, which returns a structure containing information about plane layout of the current + video data. - \sa QVideoFrame + \sa QVideoFrame, QVideoFrameFormat, QtVideo::MapMode */ /*! - \enum QVideoFrame::HandleType + \class QAbstractVideoBuffer::MapData + \brief The QAbstractVideoBuffer::MapData structure describes the mapped plane layout. + \inmodule QtMultimedia + \ingroup multimedia + \ingroup multimedia_video + + The structure contains a number of mapped planes, and plane data for each plane, + specificly, a number of bytes per line, a data pointer, and a data size. + The structure doesn't hold any ownership of the data it refers to. - Identifies the type of a video buffers handle. + A defaultly created structure means that no data has been mapped. - \value NoHandle - The buffer has no handle, its data can only be accessed by mapping the buffer. - \value RhiTextureHandle - The handle of the buffer is defined by The Qt Rendering Hardware Interface - (RHI). RHI is Qt's internal graphics abstraction for 3D APIs, such as - OpenGL, Vulkan, Metal, and Direct 3D. + All the values in the structure default to zeros. - \sa handleType() + \sa QAbstractVideoBuffer::map */ /*! - \enum QVideoFrame::MapMode - - Enumerates how a video buffer's data is mapped to system memory. - - \value NotMapped - The video buffer is not mapped to memory. - \value ReadOnly - The mapped memory is populated with data from the video buffer when mapped, - but the content of the mapped memory may be discarded when unmapped. - \value WriteOnly - The mapped memory is uninitialized when mapped, but the possibly modified - content will be used to populate the video buffer when unmapped. - \value ReadWrite - The mapped memory is populated with data from the video - buffer, and the video buffer is repopulated with the content of the mapped - memory when it is unmapped. - - \sa mapMode(), map() + \variable QAbstractVideoBuffer::MapData::planeCount + + The number of planes of the mapped video data. If the format of the data + is multiplanar, and the value is \c 1, the actual plane layout will + be calculated upon invoking of \l QVideoFrame::map from the frame height, + \c{bytesPerLine[0]}, and \c{dataSize[0]}. + + Defaults to \c 0. */ /*! - Constructs an abstract video buffer of the given \a type. + \variable QAbstractVideoBuffer::MapData::bytesPerLine + + The array of numbrers of bytes per line for each + plane from \c 0 to \c{planeCount - 1}. + + The values of the array default to \c 0. */ -QAbstractVideoBuffer::QAbstractVideoBuffer(QVideoFrame::HandleType type, QRhi *rhi) - : m_type(type), - m_rhi(rhi) -{ -} /*! - Destroys an abstract video buffer. + \variable QAbstractVideoBuffer::MapData::data + + The array of pointers to the mapped video pixel data + for each plane from \c 0 to \c{planeCount - 1}. + The implementation of QAbstractVideoBuffer must hold ownership of the data + at least until \l QAbstractVideoBuffer::unmap is called. + + The values of the array default to \c nullptr. */ -QAbstractVideoBuffer::~QAbstractVideoBuffer() -{ -} /*! - Returns the type of a video buffer's handle. + \variable QAbstractVideoBuffer::MapData::dataSize - \sa handle() -*/ -QVideoFrame::HandleType QAbstractVideoBuffer::handleType() const -{ - return m_type; -} + The array of sizes in bytes of the mapped video pixel data + for each plane from \c 0 to \c{planeCount - 1}. -std::unique_ptr<QRhiTexture> QAbstractVideoBuffer::texture(int /*plane*/) const -{ - return {}; -} + The values of the array default to \c 0. +*/ +// must be out-of-line to ensure correct working of dynamic_cast when QHwVideoBuffer is created in tests /*! - Returns the QRhi instance. + Destroys a video buffer. */ -QRhi *QAbstractVideoBuffer::rhi() const -{ - return m_rhi; -} +QAbstractVideoBuffer::~QAbstractVideoBuffer() = default; -/*! \fn uchar *QAbstractVideoBuffer::map(MapMode mode, int *numBytes, int *bytesPerLine) +/*! \fn QAbstractVideoBuffer::MapData QAbstractVideoBuffer::map(QtVideo::MapMode mode) - Independently maps the planes of a video buffer to memory. + Maps the planes of a video buffer to memory. - The map \a mode indicates whether the contents of the mapped memory should be read from and/or - written to the buffer. If the map mode includes the \c QVideoFrame::ReadOnly flag the - mapped memory will be populated with the content of the buffer when initially mapped. If the map - mode includes the \c QVideoFrame::WriteOnly flag the content of the possibly modified - mapped memory will be written back to the buffer when unmapped. + Returns a \l MapData structure that contains information about the plane layout of + the mapped current video data. If the mapping fails, the method returns the default structure. + For CPU memory buffers, the data is considered as already mapped, so the function + just returns the plane layout of the preallocated underlying data. - When access to the data is no longer needed be sure to call the unmap() function to release the - mapped memory and possibly update the buffer contents. - - Returns the number of planes in the mapped video data. For each plane the line stride of that - plane will be returned in \a bytesPerLine, and a pointer to the plane data will be returned in - \a data. The accumulative size of the mapped data is returned in \a numBytes. - - Not all buffer implementations will map more than the first plane, if this returns a single - plane for a planar format the additional planes will have to be calculated from the line stride - of the first plane and the frame height. Mapping a buffer with QVideoFrame will do this for - you. + The map \a mode indicates whether the contents of the mapped memory should be read from and/or + written to the buffer. If the map mode includes the \c QtVideo::MapMode::WriteOnly flag, + the content of the possibly modified mapped memory is expected to be written back + to the buffer when unmapped. - To implement this function create a derivative of QAbstractPlanarVideoBuffer and implement - its map function instance instead. + When access to the data is no longer needed, the \l unmap function is called + to release the mapped memory and possibly update the buffer contents. - \since 5.4 + If the format of the video data is multiplanar, the method may map the whole pixel data + as a single plane. In this case, mapping a buffer with \l QVideoFrame + will calculate additional planes from the specified line stride of the first plane, + the frame height, and the data size. */ /*! @@ -182,56 +117,23 @@ QRhi *QAbstractVideoBuffer::rhi() const Releases the memory mapped by the map() function. - If the \l {QVideoFrame::MapMode}{MapMode} included the \c QVideoFrame::WriteOnly + If the \l {QtVideo::MapMode}{MapMode} included the \c QtVideo::MapMode::WriteOnly flag this will write the current content of the mapped memory back to the video frame. - \sa map() -*/ - -/*! \fn quint64 QAbstractVideoBuffer::textureHandle(QRhi *rhi, int plane) const - - Returns a texture handle to the data buffer. + For CPU video buffers, the function may be not overridden. + The default implementation of \c unmap does nothing. - \sa handleType() + \sa map() */ -/* - \fn int QAbstractPlanarVideoBuffer::map(MapMode mode, int *numBytes, int bytesPerLine[4], uchar *data[4]) - - Maps the contents of a video buffer to memory. - - The map \a mode indicates whether the contents of the mapped memory should be read from and/or - written to the buffer. If the map mode includes the \c QVideoFrame::ReadOnly flag the - mapped memory will be populated with the content of the buffer when initially mapped. If the map - mode includes the \c QVideoFrame::WriteOnly flag the content of the possibly modified - mapped memory will be written back to the buffer when unmapped. - - When access to the data is no longer needed be sure to call the unmap() function to release the - mapped memory and possibly update the buffer contents. +/*! + \fn QAbstractVideoBuffer::format() const - Returns the number of planes in the mapped video data. For each plane the line stride of that - plane will be returned in \a bytesPerLine, and a pointer to the plane data will be returned in - \a data. The accumulative size of the mapped data is returned in \a numBytes. + Gets \l QVideoFrameFormat of the underlying video buffer. - \sa QAbstractVideoBuffer::map(), QAbstractVideoBuffer::unmap(), QVideoFrame::mapMode() + The format must be available upon construction of \l QVideoFrame. + QVideoFrame will contain won instance of the given format, that + can be detached and modified. */ -#ifndef QT_NO_DEBUG_STREAM -QDebug operator<<(QDebug dbg, QVideoFrame::MapMode mode) -{ - QDebugStateSaver saver(dbg); - dbg.nospace(); - switch (mode) { - case QVideoFrame::ReadOnly: - return dbg << "ReadOnly"; - case QVideoFrame::ReadWrite: - return dbg << "ReadWrite"; - case QVideoFrame::WriteOnly: - return dbg << "WriteOnly"; - default: - return dbg << "NotMapped"; - } -} -#endif - QT_END_NAMESPACE diff --git a/src/multimedia/video/qabstractvideobuffer.h b/src/multimedia/video/qabstractvideobuffer.h new file mode 100644 index 000000000..3e046f3b4 --- /dev/null +++ b/src/multimedia/video/qabstractvideobuffer.h @@ -0,0 +1,32 @@ +// Copyright (C) 2024 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 QABSTRACTVIDEOBUFFER_H +#define QABSTRACTVIDEOBUFFER_H + +#include <QtMultimedia/qtmultimediaexports.h> +#include <QtMultimedia/qvideoframeformat.h> +#include <QtMultimedia/qtvideo.h> + +QT_BEGIN_NAMESPACE + +class Q_MULTIMEDIA_EXPORT QAbstractVideoBuffer +{ +public: + struct MapData + { + int planeCount = 0; + int bytesPerLine[4] = {}; + uchar *data[4] = {}; + int dataSize[4] = {}; + }; + + virtual ~QAbstractVideoBuffer(); + virtual MapData map(QtVideo::MapMode mode) = 0; + virtual void unmap() { } + virtual QVideoFrameFormat format() const = 0; +}; + +QT_END_NAMESPACE + +#endif diff --git a/src/multimedia/video/qabstractvideobuffer_p.h b/src/multimedia/video/qabstractvideobuffer_p.h deleted file mode 100644 index 7fe0d1ad9..000000000 --- a/src/multimedia/video/qabstractvideobuffer_p.h +++ /dev/null @@ -1,110 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2022 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$ -** -****************************************************************************/ - -#ifndef QABSTRACTVIDEOBUFFER_H -#define QABSTRACTVIDEOBUFFER_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qvideoframe.h> - -#include <QtCore/qmetatype.h> -#include <QtGui/qmatrix4x4.h> -#include <QtCore/private/qglobal_p.h> - -#include <memory> - -QT_BEGIN_NAMESPACE - - -class QVariant; -class QRhi; -class QRhiTexture; - -class Q_MULTIMEDIA_EXPORT QAbstractVideoBuffer -{ -public: - QAbstractVideoBuffer(QVideoFrame::HandleType type, QRhi *rhi = nullptr); - virtual ~QAbstractVideoBuffer(); - - QVideoFrame::HandleType handleType() const; - QRhi *rhi() const; - - struct MapData - { - int nPlanes = 0; - int bytesPerLine[4] = {}; - uchar *data[4] = {}; - int size[4] = {}; - }; - - virtual QVideoFrame::MapMode mapMode() const = 0; - virtual MapData map(QVideoFrame::MapMode mode) = 0; - virtual void unmap() = 0; - - virtual void mapTextures() {} - virtual quint64 textureHandle(int /*plane*/) const { return 0; } - virtual std::unique_ptr<QRhiTexture> texture(int /*plane*/) const; - - virtual QMatrix4x4 externalTextureMatrix() const { return {}; } -protected: - QVideoFrame::HandleType m_type; - QRhi *m_rhi = nullptr; - -private: - Q_DISABLE_COPY(QAbstractVideoBuffer) -}; - -#ifndef QT_NO_DEBUG_STREAM -Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug, QVideoFrame::MapMode); -#endif - -QT_END_NAMESPACE - -#endif diff --git a/src/multimedia/video/qhwvideobuffer.cpp b/src/multimedia/video/qhwvideobuffer.cpp new file mode 100644 index 000000000..ecd3435d0 --- /dev/null +++ b/src/multimedia/video/qhwvideobuffer.cpp @@ -0,0 +1,17 @@ +// Copyright (C) 2024 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 "qhwvideobuffer_p.h" + +QT_BEGIN_NAMESPACE + +QVideoFrameTextures::~QVideoFrameTextures() = default; + +QHwVideoBuffer::QHwVideoBuffer(QVideoFrame::HandleType type, QRhi *rhi) : m_type(type), m_rhi(rhi) +{ +} + +// must be out-of-line to ensure correct working of dynamic_cast when QHwVideoBuffer is created in tests +QHwVideoBuffer::~QHwVideoBuffer() = default; + +QT_END_NAMESPACE diff --git a/src/multimedia/video/qhwvideobuffer_p.h b/src/multimedia/video/qhwvideobuffer_p.h new file mode 100644 index 000000000..fabf82dce --- /dev/null +++ b/src/multimedia/video/qhwvideobuffer_p.h @@ -0,0 +1,58 @@ +// Copyright (C) 2024 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 QHWVIDEOBUFFER_P_H +#define QHWVIDEOBUFFER_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "qabstractvideobuffer.h" +#include "qvideoframe.h" + +#include <QtGui/qmatrix4x4.h> + +QT_BEGIN_NAMESPACE + +class QRhi; +class QRhiTexture; + +class Q_MULTIMEDIA_EXPORT QVideoFrameTextures +{ +public: + virtual ~QVideoFrameTextures(); + virtual QRhiTexture *texture(uint plane) const = 0; +}; + +class Q_MULTIMEDIA_EXPORT QHwVideoBuffer : public QAbstractVideoBuffer +{ +public: + QHwVideoBuffer(QVideoFrame::HandleType type, QRhi *rhi = nullptr); + + ~QHwVideoBuffer() override; + + QVideoFrame::HandleType handleType() const { return m_type; } + QRhi *rhi() const { return m_rhi; } + + QVideoFrameFormat format() const override { return {}; } + + virtual std::unique_ptr<QVideoFrameTextures> mapTextures(QRhi *) { return {}; } + virtual quint64 textureHandle(QRhi *, int /*plane*/) const { return 0; } + virtual QMatrix4x4 externalTextureMatrix() const { return {}; } + +protected: + QVideoFrame::HandleType m_type; + QRhi *m_rhi = nullptr; +}; + +QT_END_NAMESPACE + +#endif // QHWVIDEOBUFFER_P_H diff --git a/src/multimedia/video/qimagevideobuffer.cpp b/src/multimedia/video/qimagevideobuffer.cpp new file mode 100644 index 000000000..400b89319 --- /dev/null +++ b/src/multimedia/video/qimagevideobuffer.cpp @@ -0,0 +1,78 @@ +// Copyright (C) 2023 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 "qimagevideobuffer_p.h" +#include "qvideoframeformat.h" + +QT_BEGIN_NAMESPACE + +namespace { + +QImage::Format fixImageFormat(QImage::Format format) +{ + switch (format) { + case QImage::Format_ARGB32_Premultiplied: + case QImage::Format_ARGB8565_Premultiplied: + case QImage::Format_ARGB6666_Premultiplied: + case QImage::Format_ARGB8555_Premultiplied: + case QImage::Format_ARGB4444_Premultiplied: + case QImage::Format_RGBA8888_Premultiplied: + case QImage::Format_A2BGR30_Premultiplied: + case QImage::Format_A2RGB30_Premultiplied: + case QImage::Format_RGBA64_Premultiplied: + case QImage::Format_RGBA16FPx4_Premultiplied: + case QImage::Format_RGBA32FPx4_Premultiplied: + return QImage::Format_ARGB32_Premultiplied; + case QImage::Format_ARGB32: + case QImage::Format_RGBA8888: + case QImage::Format_Alpha8: + case QImage::Format_RGBA64: + case QImage::Format_RGBA16FPx4: + case QImage::Format_RGBA32FPx4: + return QImage::Format_ARGB32; + case QImage::Format_Invalid: + return QImage::Format_Invalid; + default: + return QImage::Format_RGB32; + } +} + +QImage fixImage(QImage image) +{ + if (image.format() == QImage::Format_Invalid) + return image; + + const auto frameFormat = QVideoFrameFormat::pixelFormatFromImageFormat(image.format()); + if (frameFormat != QVideoFrameFormat::Format_Invalid) + return image; + + return image.convertToFormat(fixImageFormat(image.format())); +} + +} // namespace + +QImageVideoBuffer::QImageVideoBuffer(QImage image) : m_image(fixImage(std::move(image))) { } + +QAbstractVideoBuffer::MapData QImageVideoBuffer::map(QtVideo::MapMode mode) +{ + MapData mapData; + + if (!m_image.isNull()) { + mapData.planeCount = 1; + mapData.bytesPerLine[0] = m_image.bytesPerLine(); + if (mode == QtVideo::MapMode::ReadOnly) + mapData.data[0] = const_cast<uint8_t *>(m_image.constBits()); + else + mapData.data[0] = m_image.bits(); + mapData.dataSize[0] = m_image.sizeInBytes(); + } + + return mapData; +} + +QImage QImageVideoBuffer::underlyingImage() const +{ + return m_image; +} + +QT_END_NAMESPACE diff --git a/src/multimedia/video/qimagevideobuffer_p.h b/src/multimedia/video/qimagevideobuffer_p.h new file mode 100644 index 000000000..4ea894ba8 --- /dev/null +++ b/src/multimedia/video/qimagevideobuffer_p.h @@ -0,0 +1,40 @@ +// Copyright (C) 2023 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 QIMAGEVIDEOBUFFER_P_H +#define QIMAGEVIDEOBUFFER_P_H + +#include <qabstractvideobuffer.h> +#include <qimage.h> + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +QT_BEGIN_NAMESPACE + +class Q_MULTIMEDIA_EXPORT QImageVideoBuffer : public QAbstractVideoBuffer +{ +public: + QImageVideoBuffer(QImage image); + + MapData map(QtVideo::MapMode mode) override; + + QVideoFrameFormat format() const override { return {}; } + + QImage underlyingImage() const; + +private: + QImage m_image; +}; + +QT_END_NAMESPACE + +#endif // QIMAGEVIDEOBUFFER_P_H diff --git a/src/multimedia/video/qmemoryvideobuffer.cpp b/src/multimedia/video/qmemoryvideobuffer.cpp index 8bb3eae17..0940d2ca4 100644 --- a/src/multimedia/video/qmemoryvideobuffer.cpp +++ b/src/multimedia/video/qmemoryvideobuffer.cpp @@ -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 #include "qmemoryvideobuffer_p.h" @@ -53,11 +17,9 @@ QT_BEGIN_NAMESPACE /*! Constructs a video buffer with an image stride of \a bytesPerLine from a byte \a array. */ -QMemoryVideoBuffer::QMemoryVideoBuffer(const QByteArray &array, int bytesPerLine) - : QAbstractVideoBuffer(QVideoFrame::NoHandle) +QMemoryVideoBuffer::QMemoryVideoBuffer(QByteArray data, int bytesPerLine) + : m_bytesPerLine(bytesPerLine), m_data(std::move(data)) { - data = array; - this->bytesPerLine = bytesPerLine; } /*! @@ -68,35 +30,23 @@ QMemoryVideoBuffer::~QMemoryVideoBuffer() = default; /*! \reimp */ -QVideoFrame::MapMode QMemoryVideoBuffer::mapMode() const -{ - return m_mapMode; -} - -/*! - \reimp -*/ -QAbstractVideoBuffer::MapData QMemoryVideoBuffer::map(QVideoFrame::MapMode mode) +QAbstractVideoBuffer::MapData QMemoryVideoBuffer::map(QtVideo::MapMode mode) { MapData mapData; - if (m_mapMode == QVideoFrame::NotMapped && data.size() && mode != QVideoFrame::NotMapped) { - m_mapMode = mode; - mapData.nPlanes = 1; - mapData.bytesPerLine[0] = bytesPerLine; - mapData.data[0] = reinterpret_cast<uchar *>(data.data()); - mapData.size[0] = data.size(); + if (!m_data.isEmpty()) { + mapData.planeCount = 1; + mapData.bytesPerLine[0] = m_bytesPerLine; + // avoid detaching and extra copying in case the underlyingByteArray is + // being held by textures or anything else. + if (mode == QtVideo::MapMode::ReadOnly) + mapData.data[0] = reinterpret_cast<uchar *>(const_cast<char *>(m_data.constData())); + else + mapData.data[0] = reinterpret_cast<uchar *>(m_data.data()); + mapData.dataSize[0] = m_data.size(); } return mapData; } -/*! - \reimp -*/ -void QMemoryVideoBuffer::unmap() -{ - m_mapMode = QVideoFrame::NotMapped; -} - QT_END_NAMESPACE diff --git a/src/multimedia/video/qmemoryvideobuffer_p.h b/src/multimedia/video/qmemoryvideobuffer_p.h index 078b1af26..1bd5d6be2 100644 --- a/src/multimedia/video/qmemoryvideobuffer_p.h +++ b/src/multimedia/video/qmemoryvideobuffer_p.h @@ -1,47 +1,10 @@ -/**************************************************************************** -** -** 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 QMEMORYVIDEOBUFFER_P_H #define QMEMORYVIDEOBUFFER_P_H -#include <private/qabstractvideobuffer_p.h> -#include <qvideoframe.h> +#include "qabstractvideobuffer.h" // // W A R N I N G @@ -59,17 +22,16 @@ QT_BEGIN_NAMESPACE class Q_MULTIMEDIA_EXPORT QMemoryVideoBuffer : public QAbstractVideoBuffer { public: - QMemoryVideoBuffer(const QByteArray &data, int bytesPerLine); - ~QMemoryVideoBuffer(); + QMemoryVideoBuffer(QByteArray data, int bytesPerLine); + ~QMemoryVideoBuffer() override; - QVideoFrame::MapMode mapMode() const override; + MapData map(QtVideo::MapMode mode) override; - MapData map(QVideoFrame::MapMode mode) override; - void unmap() override; + QVideoFrameFormat format() const override { return {}; } - int bytesPerLine = 0; - QVideoFrame::MapMode m_mapMode = QVideoFrame::NotMapped; - QByteArray data; +private: + int m_bytesPerLine = 0; + QByteArray m_data; }; QT_END_NAMESPACE diff --git a/src/multimedia/video/qtvideo.cpp b/src/multimedia/video/qtvideo.cpp new file mode 100644 index 000000000..b971afbce --- /dev/null +++ b/src/multimedia/video/qtvideo.cpp @@ -0,0 +1,51 @@ +// Copyright (C) 2023 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 "qtvideo.h" + +QT_BEGIN_NAMESPACE + +/*! + \namespace QtVideo + \since 6.7 + \inmodule QtMultimedia + \brief Enumerations for camera and video functionality. +*/ + +/*! + \enum QtVideo::Rotation + \since 6.7 + + The angle of the clockwise rotation that should be applied to a video + frame before displaying. + + \value None No rotation required, the frame has correct orientation + \value Clockwise90 The frame should be rotated clockwise by 90 degrees + \value Clockwise180 The frame should be rotated clockwise by 180 degrees + \value Clockwise270 The frame should be rotated clockwise by 270 degrees +*/ + +/*! + \enum QtVideo::MapMode + + Enumerates how a video buffer's data is mapped to system memory. + + \value NotMapped + The video buffer is not mapped to memory. + \value ReadOnly + The mapped memory is populated with data from the video buffer when mapped, + but the content of the mapped memory may be discarded when unmapped. + \value WriteOnly + The mapped memory is uninitialized when mapped, but the possibly modified + content will be used to populate the video buffer when unmapped. + \value ReadWrite + The mapped memory is populated with data from the video + buffer, and the video buffer is repopulated with the content of the mapped + memory when it is unmapped. + + \sa QVideoFrame::mapMode(), map() +*/ + +QT_END_NAMESPACE + +#include "moc_qtvideo.cpp" diff --git a/src/multimedia/video/qtvideo.h b/src/multimedia/video/qtvideo.h new file mode 100644 index 000000000..4106f568a --- /dev/null +++ b/src/multimedia/video/qtvideo.h @@ -0,0 +1,57 @@ +// Copyright (C) 2023 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 QTVIDEO_H +#define QTVIDEO_H + +#include <QtMultimedia/qtmultimediaexports.h> +#include <QtCore/qobjectdefs.h> +#include <QtCore/qtconfigmacros.h> + +QT_BEGIN_NAMESPACE + +namespace QtVideo +{ +Q_NAMESPACE_EXPORT(Q_MULTIMEDIA_EXPORT) + +enum class Rotation { + None = 0, + Clockwise90 = 90, + Clockwise180 = 180, + Clockwise270 = 270, +}; +Q_ENUM_NS(Rotation) + +enum class MapMode { + NotMapped = 0x00, + ReadOnly = 0x01, + WriteOnly = 0x02, + ReadWrite = ReadOnly | WriteOnly, +}; +Q_ENUM_NS(MapMode) + +constexpr MapMode operator&(MapMode lhs, MapMode rhs) +{ + return MapMode(qToUnderlying(lhs) & qToUnderlying(rhs)); +} + +constexpr MapMode operator|(MapMode lhs, MapMode rhs) +{ + return MapMode(qToUnderlying(lhs) | qToUnderlying(rhs)); +} + +constexpr MapMode &operator&=(MapMode &lhs, MapMode rhs) +{ + return (lhs = lhs & rhs); +} + +constexpr MapMode &operator|=(MapMode &lhs, MapMode rhs) +{ + return (lhs = lhs | rhs); +} + +} // namespace QtVideo + +QT_END_NAMESPACE + +#endif // QTVIDEO_H diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp index 0894cc466..9da4ea3b8 100644 --- a/src/multimedia/video/qvideoframe.cpp +++ b/src/multimedia/video/qvideoframe.cpp @@ -1,91 +1,27 @@ -/**************************************************************************** -** -** 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 #include "qvideoframe.h" +#include "qvideoframe_p.h" #include "qvideotexturehelper_p.h" +#include "qmultimediautils_p.h" #include "qmemoryvideobuffer_p.h" #include "qvideoframeconverter_p.h" -#include "qvideoframeformat.h" +#include "qimagevideobuffer_p.h" #include "qpainter.h" #include <qtextlayout.h> #include <qimage.h> -#include <qmutex.h> #include <qpair.h> #include <qsize.h> #include <qvariant.h> -#include <private/qrhi_p.h> +#include <rhi/qrhi.h> #include <QDebug> QT_BEGIN_NAMESPACE -class QVideoFramePrivate : public QSharedData -{ -public: - QVideoFramePrivate() = default; - QVideoFramePrivate(const QVideoFrameFormat &format) - : format(format) - { - } - - ~QVideoFramePrivate() - { - delete buffer; - } - - qint64 startTime = -1; - qint64 endTime = -1; - QAbstractVideoBuffer::MapData mapData; - QVideoFrameFormat format; - QAbstractVideoBuffer *buffer = nullptr; - int mappedCount = 0; - QMutex mapMutex; - QString subtitleText; - QVideoFrame::RotationAngle rotationAngle = QVideoFrame::Rotation0; - bool mirrored = false; - QImage image; -private: - Q_DISABLE_COPY(QVideoFramePrivate) -}; - QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QVideoFramePrivate); /*! @@ -122,6 +58,23 @@ QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QVideoFramePrivate); \note Since video frames can be expensive to copy, QVideoFrame is explicitly shared, so any change made to a video frame will also apply to any copies. + + \sa QAbstractVideoBuffer, QVideoFrameFormat, QtVideo::MapMode +*/ + +/*! + \enum QVideoFrame::HandleType + + Identifies the type of a video buffers handle. + + \value NoHandle + The buffer has no handle, its data can only be accessed by mapping the buffer. + \value RhiTextureHandle + The handle of the buffer is defined by The Qt Rendering Hardware Interface + (RHI). RHI is Qt's internal graphics abstraction for 3D APIs, such as + OpenGL, Vulkan, Metal, and Direct 3D. + + \sa handleType() */ @@ -132,6 +85,8 @@ QVideoFrame::QVideoFrame() { } +#if QT_DEPRECATED_SINCE(6, 8) + /*! \internal Constructs a video frame from a \a buffer with the given pixel \a format and \a size in pixels. @@ -139,9 +94,8 @@ QVideoFrame::QVideoFrame() \note This doesn't increment the reference count of the video buffer. */ QVideoFrame::QVideoFrame(QAbstractVideoBuffer *buffer, const QVideoFrameFormat &format) - : d(new QVideoFramePrivate(format)) + : d(new QVideoFramePrivate(format, std::unique_ptr<QAbstractVideoBuffer>(buffer))) { - d->buffer = buffer; } /*! @@ -149,9 +103,11 @@ QVideoFrame::QVideoFrame(QAbstractVideoBuffer *buffer, const QVideoFrameFormat & */ QAbstractVideoBuffer *QVideoFrame::videoBuffer() const { - return d ? d->buffer : nullptr; + return d ? d->videoBuffer.get() : nullptr; } +#endif + /*! Constructs a video frame of the given pixel \a format. @@ -167,11 +123,98 @@ QVideoFrame::QVideoFrame(const QVideoFrameFormat &format) // Check the memory was successfully allocated. if (!data.isEmpty()) - d->buffer = new QMemoryVideoBuffer(data, textureDescription->strideForWidth(format.frameWidth())); + d->videoBuffer = std::make_unique<QMemoryVideoBuffer>( + data, textureDescription->strideForWidth(format.frameWidth())); } } /*! + Constructs a QVideoFrame from a QImage. + \since 6.8 + + If the QImage::Format matches one of the formats in + QVideoFrameFormat::PixelFormat, the QVideoFrame will hold an instance of + the \a image and use that format without any pixel format conversion. + In this case, pixel data will be copied only if you call \l{QVideoFrame::map} + with \c WriteOnly flag while keeping the original image. + + Otherwise, if the QImage::Format matches none of video formats, + the image is first converted to a supported (A)RGB format using + QImage::convertedTo() with the Qt::AutoColor flag. + This may incur a performance penalty. + + If QImage::isNull() evaluates to true for the input QImage, the + QVideoFrame will be invalid and QVideoFrameFormat::isValid() will + return false. + + \sa QVideoFrameFormat::pixelFormatFromImageFormat() + \sa QImage::convertedTo() + \sa QImage::isNull() +*/ +QVideoFrame::QVideoFrame(const QImage &image) +{ + auto buffer = std::make_unique<QImageVideoBuffer>(image); + + // If the QImage::Format is not convertible to QVideoFrameFormat, + // QImageVideoBuffer automatically converts image to a compatible + // (A)RGB format. + const QImage &bufferImage = buffer->underlyingImage(); + + if (bufferImage.isNull()) + return; + + // `bufferImage` is now supported by QVideoFrameFormat::pixelFormatFromImageFormat() + QVideoFrameFormat format = { + bufferImage.size(), QVideoFrameFormat::pixelFormatFromImageFormat(bufferImage.format()) + }; + + Q_ASSERT(format.isValid()); + + d = new QVideoFramePrivate{ std::move(format), std::move(buffer) }; +} + +/*! + Constructs a QVideoFrame from a \l QAbstractVideoBuffer. + + \since 6.8 + + The specified \a videoBuffer refers to an instance a reimplemented + \l QAbstractVideoBuffer. The instance is expected to contain a preallocated custom + video buffer and must implement \l QAbstractVideoBuffer::format, + \l QAbstractVideoBuffer::map, and \l QAbstractVideoBuffer::unmap for GPU content. + + If \a videoBuffer is null or gets an invalid \l QVideoFrameFormat, + the constructors creates an invalid video frame. + + The created frame will hold ownership of the specified video buffer for its lifetime. + Considering that QVideoFrame is implemented via a shared private object, + the specified video buffer will be destroyed upon destruction of the last copy + of the created video frame. + + Note, if a video frame has been passed to \l QMediaRecorder or a rendering pipeline, + the lifetime of the frame is undefined, and the media recorder can destroy it + in a different thread. + + QVideoFrame will contain own instance of QVideoFrameFormat. + Upon invoking \l setStreamFrameRate, \l setMirrored, or \l setRotation, + the inner format can be modified, and \l surfaceFormat will return + a detached instance. + + \sa QAbstractVideoBuffer, QVideoFrameFormat +*/ +QVideoFrame::QVideoFrame(std::unique_ptr<QAbstractVideoBuffer> videoBuffer) +{ + if (!videoBuffer) + return; + + QVideoFrameFormat format = videoBuffer->format(); + if (!format.isValid()) + return; + + d = new QVideoFramePrivate{ std::move(format), std::move(videoBuffer) }; +} + +/*! Constructs a shallow copy of \a other. Since QVideoFrame is explicitly shared, these two instances will reflect the same frame. @@ -185,6 +228,12 @@ QVideoFrame::QVideoFrame(const QVideoFrame &other) = default; */ /*! + \fn void QVideoFrame::swap(QVideoFrame &other) noexcept + + Swaps the current video frame with \a other. +*/ + +/*! \fn QVideoFrame &QVideoFrame::operator=(QVideoFrame &&other) Moves \a other into this QVideoFrame. @@ -228,7 +277,7 @@ QVideoFrame::~QVideoFrame() = default; */ bool QVideoFrame::isValid() const { - return (d && d->buffer) && d->format.pixelFormat() != QVideoFrameFormat::Format_Invalid; + return d && d->videoBuffer && d->format.pixelFormat() != QVideoFrameFormat::Format_Invalid; } /*! @@ -255,7 +304,7 @@ QVideoFrameFormat QVideoFrame::surfaceFormat() const */ QVideoFrame::HandleType QVideoFrame::handleType() const { - return (d && d->buffer) ? d->buffer->handleType() : QVideoFrame::NoHandle; + return (d && d->hwVideoBuffer) ? d->hwVideoBuffer->handleType() : QVideoFrame::NoHandle; } /*! @@ -285,25 +334,25 @@ int QVideoFrame::height() const /*! Identifies if a video frame's contents are currently mapped to system memory. - This is a convenience function which checks that the \l {QVideoFrame::MapMode}{MapMode} - of the frame is not equal to QVideoFrame::NotMapped. + This is a convenience function which checks that the \l {QtVideo::MapMode}{MapMode} + of the frame is not equal to QtVideo::MapMode::NotMapped. Returns true if the contents of the video frame are mapped to system memory, and false otherwise. - \sa mapMode(), QVideoFrame::MapMode + \sa mapMode(), QtVideo::MapMode */ bool QVideoFrame::isMapped() const { - return d && d->buffer && d->buffer->mapMode() != QVideoFrame::NotMapped; + return d && d->mapMode != QtVideo::MapMode::NotMapped; } /*! Identifies if the mapped contents of a video frame will be persisted when the frame is unmapped. - This is a convenience function which checks if the \l {QVideoFrame::MapMode}{MapMode} - contains the QVideoFrame::WriteOnly flag. + This is a convenience function which checks if the \l {QtVideo::MapMode}{MapMode} + contains the QtVideo::MapMode::WriteOnly flag. Returns true if the video frame will be updated when unmapped, and false otherwise. @@ -311,37 +360,37 @@ bool QVideoFrame::isMapped() const Depending on the buffer implementation the changes may be persisted, or worse alter a shared buffer. - \sa mapMode(), QVideoFrame::MapMode + \sa mapMode(), QtVideo::MapMode */ bool QVideoFrame::isWritable() const { - return d && d->buffer && (d->buffer->mapMode() & QVideoFrame::WriteOnly); + return d && (d->mapMode & QtVideo::MapMode::WriteOnly) != QtVideo::MapMode::NotMapped; } /*! Identifies if the mapped contents of a video frame were read from the frame when it was mapped. - This is a convenience function which checks if the \l {QVideoFrame::MapMode}{MapMode} - contains the QVideoFrame::WriteOnly flag. + This is a convenience function which checks if the \l {QtVideo::MapMode}{MapMode} + contains the QtVideo::MapMode::WriteOnly flag. Returns true if the contents of the mapped memory were read from the video frame, and false otherwise. - \sa mapMode(), QVideoFrame::MapMode + \sa mapMode(), QtVideo::MapMode */ bool QVideoFrame::isReadable() const { - return d && d->buffer && (d->buffer->mapMode() & QVideoFrame::ReadOnly); + return d && (d->mapMode & QtVideo::MapMode::ReadOnly) != QtVideo::MapMode::NotMapped; } /*! Returns the mode a video frame was mapped to system memory in. - \sa map(), QVideoFrame::MapMode + \sa map(), QtVideo::MapMode */ QVideoFrame::MapMode QVideoFrame::mapMode() const { - return (d && d->buffer) ? d->buffer->mapMode() : QVideoFrame::NotMapped; + return static_cast<QVideoFrame::MapMode>(d ? d->mapMode : QtVideo::MapMode::NotMapped); } /*! @@ -352,9 +401,9 @@ QVideoFrame::MapMode QVideoFrame::mapMode() const copying the contents around, so avoid mapping and unmapping unless required. The map \a mode indicates whether the contents of the mapped memory should be read from and/or - written to the frame. If the map mode includes the \c QVideoFrame::ReadOnly flag the + written to the frame. If the map mode includes the \c QtVideo::MapMode::ReadOnly flag the mapped memory will be populated with the content of the video frame when initially mapped. If the map - mode includes the \c QVideoFrame::WriteOnly flag the content of the possibly modified + mode includes the \c QtVideo::MapMode::WriteOnly flag the content of the possibly modified mapped memory will be written back to the frame when unmapped. While mapped the contents of a video frame can be accessed directly through the pointer returned @@ -374,20 +423,18 @@ QVideoFrame::MapMode QVideoFrame::mapMode() const \sa unmap(), mapMode(), bits() */ -bool QVideoFrame::map(QVideoFrame::MapMode mode) +bool QVideoFrame::map(QtVideo::MapMode mode) { - - if (!d || !d->buffer) + if (!d || !d->videoBuffer) return false; QMutexLocker lock(&d->mapMutex); - if (mode == QVideoFrame::NotMapped) + if (mode == QtVideo::MapMode::NotMapped) return false; if (d->mappedCount > 0) { //it's allowed to map the video frame multiple times in read only mode - if (d->buffer->mapMode() == QVideoFrame::ReadOnly - && mode == QVideoFrame::ReadOnly) { + if (d->mapMode == QtVideo::MapMode::ReadOnly && mode == QtVideo::MapMode::ReadOnly) { d->mappedCount++; return true; } @@ -397,14 +444,16 @@ bool QVideoFrame::map(QVideoFrame::MapMode mode) Q_ASSERT(d->mapData.data[0] == nullptr); Q_ASSERT(d->mapData.bytesPerLine[0] == 0); - Q_ASSERT(d->mapData.nPlanes == 0); - Q_ASSERT(d->mapData.size[0] == 0); + Q_ASSERT(d->mapData.planeCount == 0); + Q_ASSERT(d->mapData.dataSize[0] == 0); - d->mapData = d->buffer->map(mode); - if (d->mapData.nPlanes == 0) + d->mapData = d->videoBuffer->map(mode); + if (d->mapData.planeCount == 0) return false; - if (d->mapData.nPlanes == 1) { + d->mapMode = mode; + + if (d->mapData.planeCount == 1) { auto pixelFmt = d->format.pixelFormat(); // If the plane count is 1 derive the additional planes for planar formats. switch (pixelFmt) { @@ -442,16 +491,16 @@ bool QVideoFrame::map(QVideoFrame::MapMode mode) const int height = this->height(); const int yStride = d->mapData.bytesPerLine[0]; const int uvHeight = pixelFmt == QVideoFrameFormat::Format_YUV422P ? height : height / 2; - const int uvStride = (d->mapData.size[0] - (yStride * height)) / uvHeight / 2; + const int uvStride = (d->mapData.dataSize[0] - (yStride * height)) / uvHeight / 2; // Three planes, the second and third vertically (and horizontally for other than Format_YUV422P formats) subsampled. - d->mapData.nPlanes = 3; + d->mapData.planeCount = 3; d->mapData.bytesPerLine[2] = d->mapData.bytesPerLine[1] = uvStride; - d->mapData.size[0] = yStride * height; - d->mapData.size[1] = uvStride * uvHeight; - d->mapData.size[2] = uvStride * uvHeight; - d->mapData.data[1] = d->mapData.data[0] + d->mapData.size[0]; - d->mapData.data[2] = d->mapData.data[1] + d->mapData.size[1]; + d->mapData.dataSize[0] = yStride * height; + d->mapData.dataSize[1] = uvStride * uvHeight; + d->mapData.dataSize[2] = uvStride * uvHeight; + d->mapData.data[1] = d->mapData.data[0] + d->mapData.dataSize[0]; + d->mapData.data[2] = d->mapData.data[1] + d->mapData.dataSize[1]; break; } case QVideoFrameFormat::Format_NV12: @@ -461,38 +510,110 @@ bool QVideoFrame::map(QVideoFrame::MapMode mode) case QVideoFrameFormat::Format_P010: case QVideoFrameFormat::Format_P016: { // Semi planar, Full resolution Y plane with interleaved subsampled U and V planes. - d->mapData.nPlanes = 2; + d->mapData.planeCount = 2; d->mapData.bytesPerLine[1] = d->mapData.bytesPerLine[0]; - int size = d->mapData.size[0]; - d->mapData.size[0] = (d->mapData.bytesPerLine[0] * height()); - d->mapData.size[1] = size - d->mapData.size[0]; - d->mapData.data[1] = d->mapData.data[0] + d->mapData.size[0]; + int size = d->mapData.dataSize[0]; + d->mapData.dataSize[0] = (d->mapData.bytesPerLine[0] * height()); + d->mapData.dataSize[1] = size - d->mapData.dataSize[0]; + d->mapData.data[1] = d->mapData.data[0] + d->mapData.dataSize[0]; break; } case QVideoFrameFormat::Format_IMC1: case QVideoFrameFormat::Format_IMC3: { // Three planes, the second and third vertically and horizontally subsumpled, // but with lines padded to the width of the first plane. - d->mapData.nPlanes = 3; + d->mapData.planeCount = 3; d->mapData.bytesPerLine[2] = d->mapData.bytesPerLine[1] = d->mapData.bytesPerLine[0]; - d->mapData.size[0] = (d->mapData.bytesPerLine[0] * height()); - d->mapData.size[1] = (d->mapData.bytesPerLine[0] * height() / 2); - d->mapData.size[2] = (d->mapData.bytesPerLine[0] * height() / 2); - d->mapData.data[1] = d->mapData.data[0] + d->mapData.size[0]; - d->mapData.data[2] = d->mapData.data[1] + d->mapData.size[1]; + d->mapData.dataSize[0] = (d->mapData.bytesPerLine[0] * height()); + d->mapData.dataSize[1] = (d->mapData.bytesPerLine[0] * height() / 2); + d->mapData.dataSize[2] = (d->mapData.bytesPerLine[0] * height() / 2); + d->mapData.data[1] = d->mapData.data[0] + d->mapData.dataSize[0]; + d->mapData.data[2] = d->mapData.data[1] + d->mapData.dataSize[1]; break; } } } d->mappedCount++; + + // unlock mapMutex to avoid potential deadlock imageMutex <--> mapMutex + lock.unlock(); + + if ((mode & QtVideo::MapMode::WriteOnly) != QtVideo::MapMode::NotMapped) { + QMutexLocker lock(&d->imageMutex); + d->image = {}; + } + return true; } +#if QT_DEPRECATED_SINCE(6, 8) + +/*! + \deprecated [6.8] Use \c QtVideo::MapMode instead. The values of this enum + are consistent with values of \c QtVideo::MapMode. + \enum QVideoFrame::MapMode + + Enumerates how a video buffer's data is mapped to system memory. + + \value NotMapped + The video buffer is not mapped to memory. + \value ReadOnly + The mapped memory is populated with data from the video buffer when mapped, + but the content of the mapped memory may be discarded when unmapped. + \value WriteOnly + The mapped memory is uninitialized when mapped, but the possibly modified + content will be used to populate the video buffer when unmapped. + \value ReadWrite + The mapped memory is populated with data from the video + buffer, and the video buffer is repopulated with the content of the mapped + memory when it is unmapped. + + \sa mapMode(), map() +*/ + +/*! + \deprecated [6.8] Use \c QVideoFrame::map(Qt::Video::MapMode) instead. + Maps the contents of a video frame to system (CPU addressable) memory. + + In some cases the video frame data might be stored in video memory or otherwise inaccessible + memory, so it is necessary to map a frame before accessing the pixel data. This may involve + copying the contents around, so avoid mapping and unmapping unless required. + + The map \a mode indicates whether the contents of the mapped memory should be read from and/or + written to the frame. If the map mode includes the \c QVideoFrame::ReadOnly flag the + mapped memory will be populated with the content of the video frame when initially mapped. If the map + mode includes the \c QVideoFrame::WriteOnly flag the content of the possibly modified + mapped memory will be written back to the frame when unmapped. + + While mapped the contents of a video frame can be accessed directly through the pointer returned + by the bits() function. + + When access to the data is no longer needed, be sure to call the unmap() function to release the + mapped memory and possibly update the video frame contents. + + If the video frame has been mapped in read only mode, it is permissible to map it + multiple times in read only mode (and unmap it a corresponding number of times). In all + other cases it is necessary to unmap the frame first before mapping a second time. + + \note Writing to memory that is mapped as read-only is undefined, and may result in changes + to shared data or crashes. + + Returns true if the frame was mapped to memory in the given \a mode and false otherwise. + + \sa unmap(), mapMode(), bits() +*/ +bool QVideoFrame::map(QVideoFrame::MapMode mode) +{ + return map(static_cast<QtVideo::MapMode>(mode)); +} + +#endif + /*! Releases the memory mapped by the map() function. - If the \l {QVideoFrame::MapMode}{MapMode} included the QVideoFrame::WriteOnly + If the \l {QtVideo::MapMode}{MapMode} included the QtVideo::MapMode::WriteOnly flag this will persist the current content of the mapped memory to the video frame. unmap() should not be called if map() function failed. @@ -501,7 +622,7 @@ bool QVideoFrame::map(QVideoFrame::MapMode mode) */ void QVideoFrame::unmap() { - if (!d || !d->buffer) + if (!d || !d->videoBuffer) return; QMutexLocker lock(&d->mapMutex); @@ -515,7 +636,8 @@ void QVideoFrame::unmap() if (d->mappedCount == 0) { d->mapData = {}; - d->buffer->unmap(); + d->mapMode = QtVideo::MapMode::NotMapped; + d->videoBuffer->unmap(); } } @@ -532,7 +654,7 @@ int QVideoFrame::bytesPerLine(int plane) const { if (!d) return 0; - return plane >= 0 && plane < d->mapData.nPlanes ? d->mapData.bytesPerLine[plane] : 0; + return plane >= 0 && plane < d->mapData.planeCount ? d->mapData.bytesPerLine[plane] : 0; } /*! @@ -551,7 +673,7 @@ uchar *QVideoFrame::bits(int plane) { if (!d) return nullptr; - return plane >= 0 && plane < d->mapData.nPlanes ? d->mapData.data[plane] : nullptr; + return plane >= 0 && plane < d->mapData.planeCount ? d->mapData.data[plane] : nullptr; } /*! @@ -569,7 +691,7 @@ const uchar *QVideoFrame::bits(int plane) const { if (!d) return nullptr; - return plane >= 0 && plane < d->mapData.nPlanes ? d->mapData.data[plane] : nullptr; + return plane >= 0 && plane < d->mapData.planeCount ? d->mapData.data[plane] : nullptr; } /*! @@ -583,7 +705,7 @@ int QVideoFrame::mappedBytes(int plane) const { if (!d) return 0; - return plane >= 0 && plane < d->mapData.nPlanes ? d->mapData.size[plane] : 0; + return plane >= 0 && plane < d->mapData.planeCount ? d->mapData.dataSize[plane] : 0; } /*! @@ -601,30 +723,6 @@ int QVideoFrame::planeCount() const } /*! - \internal - Returns a texture id to the video frame's buffers. -*/ -quint64 QVideoFrame::textureHandle(int plane) const -{ - if (!d || !d->buffer) - return 0; - d->buffer->mapTextures(); - return d->buffer->textureHandle(plane); -} - -/*! - \internal - Returns a QRhiTexture of the video frame -*/ -std::unique_ptr<QRhiTexture> QVideoFrame::rhiTexture(int plane) const -{ - if (!d || !d->buffer) - return {}; - d->buffer->mapTextures(); - return d->buffer->texture(plane); -} - -/*! Returns the presentation time (in microseconds) when the frame should be displayed. An invalid time is represented as -1. @@ -676,8 +774,10 @@ void QVideoFrame::setEndTime(qint64 time) d->endTime = time; } +#if QT_DEPRECATED_SINCE(6, 7) /*! \enum QVideoFrame::RotationAngle + \deprecated [6.7] Use QtVideo::Rotation instead. The angle of the clockwise rotation that should be applied to a video frame before displaying. @@ -689,29 +789,47 @@ void QVideoFrame::setEndTime(qint64 time) */ /*! + \fn void QVideoFrame::setRotationAngle(RotationAngle) + \deprecated [6.7] Use \c QVideoFrame::setRotation instead. + + Sets the \a angle the frame should be rotated clockwise before displaying. +*/ + +/*! + \fn QVideoFrame::RotationAngle QVideoFrame::rotationAngle() const + \deprecated [6.7] Use \c QVideoFrame::rotation instead. + + Returns the angle the frame should be rotated clockwise before displaying. +*/ + +#endif + + +/*! Sets the \a angle the frame should be rotated clockwise before displaying. */ -void QVideoFrame::setRotationAngle(QVideoFrame::RotationAngle angle) +void QVideoFrame::setRotation(QtVideo::Rotation angle) { if (d) - d->rotationAngle = angle; + d->format.setRotation(angle); } /*! Returns the angle the frame should be rotated clockwise before displaying. */ -QVideoFrame::RotationAngle QVideoFrame::rotationAngle() const +QtVideo::Rotation QVideoFrame::rotation() const { - return d ? d->rotationAngle : Rotation0; + return d ? d->format.rotation() : QtVideo::Rotation::None; } /*! - Sets the \a mirrored flag for the frame. + Sets the \a mirrored flag for the frame and + sets the flag to the underlying \l surfaceFormat. */ void QVideoFrame::setMirrored(bool mirrored) { if (d) - d->mirrored = mirrored; + d->format.setMirrored(mirrored); } /*! @@ -719,7 +837,24 @@ void QVideoFrame::setMirrored(bool mirrored) */ bool QVideoFrame::mirrored() const { - return d && d->mirrored; + return d && d->format.isMirrored(); +} + +/*! + Sets the frame \a rate of a video stream in frames per second. +*/ +void QVideoFrame::setStreamFrameRate(qreal rate) +{ + if (d) + d->format.setStreamFrameRate(rate); +} + +/*! + Returns the frame rate of a video stream in frames per second. +*/ +qreal QVideoFrame::streamFrameRate() const +{ + return d ? d->format.streamFrameRate() : 0.; } /*! @@ -730,11 +865,14 @@ QImage QVideoFrame::toImage() const { if (!isValid()) return {}; - if (!d->image.isNull()) - return d->image; - d->image = qImageFromVideoFrame(*this, rotationAngle(), mirrored(), - surfaceFormat().scanLineDirection() != QVideoFrameFormat::TopToBottom); + QMutexLocker lock(&d->imageMutex); + + if (d->image.isNull()) { + const bool mirrorY = surfaceFormat().scanLineDirection() != QVideoFrameFormat::TopToBottom; + d->image = qImageFromVideoFrame(*this, rotation(), mirrored(), mirrorY); + } + return d->image; } @@ -772,9 +910,7 @@ void QVideoFrame::paint(QPainter *painter, const QRectF &rect, const PaintOption } QRectF targetRect = rect; - QSizeF size = this->size(); - if (rotationAngle() % 180) - size.transpose(); + QSizeF size = qRotatedFrameSize(*this); size.scale(targetRect.size(), options.aspectRatioMode); @@ -802,7 +938,7 @@ void QVideoFrame::paint(QPainter *painter, const QRectF &rect, const PaintOption } } - if (map(QVideoFrame::ReadOnly)) { + if (map(QtVideo::MapMode::ReadOnly)) { const QTransform oldTransform = painter->transform(); QTransform transform = oldTransform; transform.translate(targetRect.center().x() - size.width()/2, @@ -850,12 +986,12 @@ static QString qFormatTimeStamps(qint64 start, qint64 end) if (onlyOne) { if (start > 0) - return QString::fromLatin1("@%1:%2:%3.%4") + return QStringLiteral("@%1:%2:%3.%4") .arg(start, 1, 10, QLatin1Char('0')) .arg(s_minutes, 2, 10, QLatin1Char('0')) .arg(s_seconds, 2, 10, QLatin1Char('0')) .arg(s_millis, 2, 10, QLatin1Char('0')); - return QString::fromLatin1("@%1:%2.%3") + return QStringLiteral("@%1:%2.%3") .arg(s_minutes, 2, 10, QLatin1Char('0')) .arg(s_seconds, 2, 10, QLatin1Char('0')) .arg(s_millis, 2, 10, QLatin1Char('0')); @@ -864,12 +1000,12 @@ static QString qFormatTimeStamps(qint64 start, qint64 end) if (end == -1) { // Similar to start-start, except it means keep displaying it? if (start > 0) - return QString::fromLatin1("%1:%2:%3.%4 - forever") + return QStringLiteral("%1:%2:%3.%4 - forever") .arg(start, 1, 10, QLatin1Char('0')) .arg(s_minutes, 2, 10, QLatin1Char('0')) .arg(s_seconds, 2, 10, QLatin1Char('0')) .arg(s_millis, 2, 10, QLatin1Char('0')); - return QString::fromLatin1("%1:%2.%3 - forever") + return QStringLiteral("%1:%2.%3 - forever") .arg(s_minutes, 2, 10, QLatin1Char('0')) .arg(s_seconds, 2, 10, QLatin1Char('0')) .arg(s_millis, 2, 10, QLatin1Char('0')); @@ -883,7 +1019,7 @@ static QString qFormatTimeStamps(qint64 start, qint64 end) end /= 60; if (start > 0 || end > 0) - return QString::fromLatin1("%1:%2:%3.%4 - %5:%6:%7.%8") + return QStringLiteral("%1:%2:%3.%4 - %5:%6:%7.%8") .arg(start, 1, 10, QLatin1Char('0')) .arg(s_minutes, 2, 10, QLatin1Char('0')) .arg(s_seconds, 2, 10, QLatin1Char('0')) @@ -892,7 +1028,7 @@ static QString qFormatTimeStamps(qint64 start, qint64 end) .arg(e_minutes, 2, 10, QLatin1Char('0')) .arg(e_seconds, 2, 10, QLatin1Char('0')) .arg(e_millis, 2, 10, QLatin1Char('0')); - return QString::fromLatin1("%1:%2.%3 - %4:%5.%6") + return QStringLiteral("%1:%2.%3 - %4:%5.%6") .arg(s_minutes, 2, 10, QLatin1Char('0')) .arg(s_seconds, 2, 10, QLatin1Char('0')) .arg(s_millis, 2, 10, QLatin1Char('0')) diff --git a/src/multimedia/video/qvideoframe.h b/src/multimedia/video/qvideoframe.h index f1e329c38..146547830 100644 --- a/src/multimedia/video/qvideoframe.h +++ b/src/multimedia/video/qvideoframe.h @@ -1,46 +1,11 @@ -/**************************************************************************** -** -** 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 QVIDEOFRAME_H #define QVIDEOFRAME_H #include <QtMultimedia/qtmultimediaglobal.h> +#include <QtMultimedia/qtvideo.h> #include <QtMultimedia/qvideoframeformat.h> #include <QtCore/qmetatype.h> @@ -60,6 +25,7 @@ QT_DECLARE_QESDP_SPECIALIZATION_DTOR_WITH_EXPORT(QVideoFramePrivate, Q_MULTIMEDI class Q_MULTIMEDIA_EXPORT QVideoFrame { + Q_GADGET public: enum HandleType @@ -70,22 +36,30 @@ public: enum MapMode { - NotMapped = 0x00, - ReadOnly = 0x01, - WriteOnly = 0x02, - ReadWrite = ReadOnly | WriteOnly + NotMapped Q_DECL_ENUMERATOR_DEPRECATED_X("Use QtVideo::MapMode::NotMapped instead") + = static_cast<int>(QtVideo::MapMode::NotMapped), + ReadOnly Q_DECL_ENUMERATOR_DEPRECATED_X("Use QtVideo::MapMode::ReadOnly instead") + = static_cast<int>(QtVideo::MapMode::ReadOnly), + WriteOnly Q_DECL_ENUMERATOR_DEPRECATED_X("Use QtVideo::MapMode::WriteOnly instead") + = static_cast<int>(QtVideo::MapMode::WriteOnly), + ReadWrite Q_DECL_ENUMERATOR_DEPRECATED_X("Use QtVideo::MapMode::ReadWrite instead") + = static_cast<int>(QtVideo::MapMode::ReadWrite) }; +#if QT_DEPRECATED_SINCE(6, 7) enum RotationAngle { - Rotation0 = 0, - Rotation90 = 90, - Rotation180 = 180, - Rotation270 = 270 + Rotation0 Q_DECL_ENUMERATOR_DEPRECATED_X("Use QtVideo::Rotation::None instead") = 0, + Rotation90 Q_DECL_ENUMERATOR_DEPRECATED_X("Use QtVideo::Rotation::Clockwise90 instead") = 90, + Rotation180 Q_DECL_ENUMERATOR_DEPRECATED_X("Use QtVideo::Rotation::Clockwise180 instead") = 180, + Rotation270 Q_DECL_ENUMERATOR_DEPRECATED_X("Use QtVideo::Rotation::Clockwise270 instead") = 270 }; +#endif QVideoFrame(); QVideoFrame(const QVideoFrameFormat &format); + explicit QVideoFrame(const QImage &image); + explicit QVideoFrame(std::unique_ptr<QAbstractVideoBuffer> videoBuffer); QVideoFrame(const QVideoFrame &other); ~QVideoFrame(); @@ -116,7 +90,11 @@ public: QVideoFrame::MapMode mapMode() const; + bool map(QtVideo::MapMode mode); +#if QT_DEPRECATED_SINCE(6, 8) + QT_DEPRECATED_VERSION_X_6_7("Use QVideoFrame::map(QtVideo::MapMode) instead") bool map(QVideoFrame::MapMode mode); +#endif void unmap(); int bytesPerLine(int plane) const; @@ -126,21 +104,29 @@ public: int mappedBytes(int plane) const; int planeCount() const; - quint64 textureHandle(int plane) const; - std::unique_ptr<QRhiTexture> rhiTexture(int plane) const; - qint64 startTime() const; void setStartTime(qint64 time); qint64 endTime() const; void setEndTime(qint64 time); - void setRotationAngle(RotationAngle); - RotationAngle rotationAngle() const; +#if QT_DEPRECATED_SINCE(6, 7) + QT_DEPRECATED_VERSION_X_6_7("Use QVideoFrame::setRotation(QtVideo::Rotation) instead") + void setRotationAngle(RotationAngle angle) { setRotation(QtVideo::Rotation(angle)); } + + QT_DEPRECATED_VERSION_X_6_7("Use QVideoFrame::rotation() instead") + RotationAngle rotationAngle() const { return RotationAngle(rotation()); } +#endif + + void setRotation(QtVideo::Rotation angle); + QtVideo::Rotation rotation() const; void setMirrored(bool); bool mirrored() const; + void setStreamFrameRate(qreal rate); + qreal streamFrameRate() const; + QImage toImage() const; struct PaintOptions { @@ -158,10 +144,15 @@ public: void paint(QPainter *painter, const QRectF &rect, const PaintOptions &options); +#if QT_DEPRECATED_SINCE(6, 8) + QT_DEPRECATED_VERSION_X_6_8("The constructor is internal and deprecated") QVideoFrame(QAbstractVideoBuffer *buffer, const QVideoFrameFormat &format); + QT_DEPRECATED_VERSION_X_6_8("The method is internal and deprecated") QAbstractVideoBuffer *videoBuffer() const; +#endif private: + friend class QVideoFramePrivate; QExplicitlySharedDataPointer<QVideoFramePrivate> d; }; diff --git a/src/multimedia/video/qvideoframe_p.h b/src/multimedia/video/qvideoframe_p.h new file mode 100644 index 000000000..2ca798fbe --- /dev/null +++ b/src/multimedia/video/qvideoframe_p.h @@ -0,0 +1,93 @@ +// Copyright (C) 2024 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 QVIDEOFRAME_P_H +#define QVIDEOFRAME_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "qvideoframe.h" +#include "qhwvideobuffer_p.h" + +#include <qmutex.h> + +QT_BEGIN_NAMESPACE + +class QVideoFramePrivate : public QSharedData +{ +public: + QVideoFramePrivate() = default; + + ~QVideoFramePrivate() + { + if (videoBuffer && mapMode != QtVideo::MapMode::NotMapped) + videoBuffer->unmap(); + } + + template <typename Buffer> + static QVideoFrame createFrame(std::unique_ptr<Buffer> buffer, QVideoFrameFormat format) + { + QVideoFrame result; + result.d.reset(new QVideoFramePrivate(std::move(format), std::move(buffer))); + return result; + } + + template <typename Buffer = QAbstractVideoBuffer> + QVideoFramePrivate(QVideoFrameFormat format, std::unique_ptr<Buffer> buffer = nullptr) + : format{ std::move(format) }, videoBuffer{ std::move(buffer) } + { + if constexpr (std::is_base_of_v<QHwVideoBuffer, Buffer>) + hwVideoBuffer = static_cast<QHwVideoBuffer *>(videoBuffer.get()); + else if constexpr (std::is_same_v<QAbstractVideoBuffer, Buffer>) + hwVideoBuffer = dynamic_cast<QHwVideoBuffer *>(videoBuffer.get()); + // else hwVideoBuffer == nullptr + } + + static QVideoFramePrivate *handle(QVideoFrame &frame) { return frame.d.get(); }; + + static QHwVideoBuffer *hwBuffer(const QVideoFrame &frame) + { + return frame.d ? frame.d->hwVideoBuffer : nullptr; + }; + + static QAbstractVideoBuffer *buffer(const QVideoFrame &frame) + { + return frame.d ? frame.d->videoBuffer.get() : nullptr; + }; + + QVideoFrame adoptThisByVideoFrame() + { + QVideoFrame frame; + frame.d = QExplicitlySharedDataPointer(this, QAdoptSharedDataTag{}); + return frame; + } + + qint64 startTime = -1; + qint64 endTime = -1; + QAbstractVideoBuffer::MapData mapData; + QtVideo::MapMode mapMode = QtVideo::MapMode::NotMapped; + QVideoFrameFormat format; + std::unique_ptr<QAbstractVideoBuffer> videoBuffer; + QHwVideoBuffer *hwVideoBuffer = nullptr; + int mappedCount = 0; + QMutex mapMutex; + QString subtitleText; + QImage image; + QMutex imageMutex; + +private: + Q_DISABLE_COPY(QVideoFramePrivate) +}; + +QT_END_NAMESPACE + +#endif // QVIDEOFRAMEPRIVATE_P_H diff --git a/src/multimedia/video/qvideoframeconversionhelper.cpp b/src/multimedia/video/qvideoframeconversionhelper.cpp index b49fc539f..d3f2b0403 100644 --- a/src/multimedia/video/qvideoframeconversionhelper.cpp +++ b/src/multimedia/video/qvideoframeconversionhelper.cpp @@ -1,45 +1,11 @@ -/**************************************************************************** -** -** 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 #include "qvideoframeconversionhelper_p.h" #include "qrgb.h" +#include <mutex> + QT_BEGIN_NAMESPACE #define CLAMP(n) (n > 255 ? 255 : (n < 0 ? 0 : n)) @@ -67,31 +33,31 @@ static inline void planarYUV420_to_ARGB32(const uchar *y, int yStride, quint32 *rgb, int width, int height) { - quint32 *rgb0 = rgb; - quint32 *rgb1 = rgb + width; + height &= ~1; - for (int j = 0; j < height; j += 2) { + for (int j = 0; j + 1 < height; j += 2) { const uchar *lineY0 = y; const uchar *lineY1 = y + yStride; const uchar *lineU = u; const uchar *lineV = v; - for (int i = 0; i < width; i += 2) { + quint32 *rgb0 = rgb; + quint32 *rgb1 = rgb + width; + for (int i = 0; i + 1 < width; i += 2) { EXPAND_UV(*lineU, *lineV); lineU += uvPixelStride; lineV += uvPixelStride; - *rgb0++ = qYUVToARGB32(*lineY0++, rv, guv, bu); - *rgb0++ = qYUVToARGB32(*lineY0++, rv, guv, bu); - *rgb1++ = qYUVToARGB32(*lineY1++, rv, guv, bu); - *rgb1++ = qYUVToARGB32(*lineY1++, rv, guv, bu); + rgb0[i] = qYUVToARGB32(*lineY0++, rv, guv, bu); + rgb0[i + 1] = qYUVToARGB32(*lineY0++, rv, guv, bu); + rgb1[i] = qYUVToARGB32(*lineY1++, rv, guv, bu); + rgb1[i + 1] = qYUVToARGB32(*lineY1++, rv, guv, bu); } y += yStride << 1; // stride * 2 u += uStride; v += vStride; - rgb0 += width; - rgb1 += width; + rgb += width << 1; // width * 2 } } @@ -102,31 +68,27 @@ static inline void planarYUV422_to_ARGB32(const uchar *y, int yStride, quint32 *rgb, int width, int height) { - quint32 *rgb0 = rgb; - for (int j = 0; j < height; ++j) { const uchar *lineY0 = y; const uchar *lineU = u; const uchar *lineV = v; - for (int i = 0; i < width; i += 2) { + for (int i = 0; i + 1 < width; i += 2) { EXPAND_UV(*lineU, *lineV); lineU += uvPixelStride; lineV += uvPixelStride; - *rgb0++ = qYUVToARGB32(*lineY0++, rv, guv, bu); - *rgb0++ = qYUVToARGB32(*lineY0++, rv, guv, bu); + rgb[i] = qYUVToARGB32(*lineY0++, rv, guv, bu); + rgb[i+1] = qYUVToARGB32(*lineY0++, rv, guv, bu); } y += yStride; // stride * 2 u += uStride; v += vStride; - rgb0 += width; + rgb += width; } } - - static void QT_FASTCALL qt_convert_YUV420P_to_ARGB32(const QVideoFrame &frame, uchar *output) { FETCH_INFO_TRIPLANAR(frame) @@ -220,8 +182,7 @@ static void QT_FASTCALL qt_convert_UYVY_to_ARGB32(const QVideoFrame &frame, ucha for (int i = 0; i < height; ++i) { const uchar *lineSrc = src; - - for (int j = 0; j < width; j += 2) { + for (int j = 0; j + 1 < width; j += 2) { int u = *lineSrc++; int y0 = *lineSrc++; int v = *lineSrc++; @@ -229,11 +190,12 @@ static void QT_FASTCALL qt_convert_UYVY_to_ARGB32(const QVideoFrame &frame, ucha EXPAND_UV(u, v); - *rgb++ = qYUVToARGB32(y0, rv, guv, bu); - *rgb++ = qYUVToARGB32(y1, rv, guv, bu); + rgb[j] = qYUVToARGB32(y0, rv, guv, bu); + rgb[j+1] = qYUVToARGB32(y1, rv, guv, bu); } src += stride; + rgb += width; } } @@ -246,8 +208,7 @@ static void QT_FASTCALL qt_convert_YUYV_to_ARGB32(const QVideoFrame &frame, ucha for (int i = 0; i < height; ++i) { const uchar *lineSrc = src; - - for (int j = 0; j < width; j += 2) { + for (int j = 0; j + 1 < width; j += 2) { int y0 = *lineSrc++; int u = *lineSrc++; int y1 = *lineSrc++; @@ -255,11 +216,12 @@ static void QT_FASTCALL qt_convert_YUYV_to_ARGB32(const QVideoFrame &frame, ucha EXPAND_UV(u, v); - *rgb++ = qYUVToARGB32(y0, rv, guv, bu); - *rgb++ = qYUVToARGB32(y1, rv, guv, bu); + rgb[j] = qYUVToARGB32(y0, rv, guv, bu); + rgb[j+1] = qYUVToARGB32(y1, rv, guv, bu); } src += stride; + rgb += width; } } @@ -409,22 +371,24 @@ static void QT_FASTCALL qt_convert_premultiplied_to_ARGB32(const QVideoFrame &fr } static inline void planarYUV420_16bit_to_ARGB32(const uchar *y, int yStride, - const uchar *u, int uStride, - const uchar *v, int vStride, - int uvPixelStride, - quint32 *rgb, - int width, int height) + const uchar *u, int uStride, + const uchar *v, int vStride, + int uvPixelStride, + quint32 *rgb, + int width, int height) { - quint32 *rgb0 = rgb; - quint32 *rgb1 = rgb + width; + height &= ~1; - for (int j = 0; j < height; j += 2) { + for (int j = 0; j + 1 < height; j += 2) { const uchar *lineY0 = y; const uchar *lineY1 = y + yStride; const uchar *lineU = u; const uchar *lineV = v; - for (int i = 0; i < width; i += 2) { + quint32 *rgb0 = rgb; + quint32 *rgb1 = rgb + width; + + for (int i = 0; i + 1 < width; i += 2) { EXPAND_UV(*lineU, *lineV); lineU += uvPixelStride; lineV += uvPixelStride; @@ -442,11 +406,11 @@ static inline void planarYUV420_16bit_to_ARGB32(const uchar *y, int yStride, y += yStride << 1; // stride * 2 u += uStride; v += vStride; - rgb0 += width; - rgb1 += width; + rgb += width * 2; } } + static void QT_FASTCALL qt_convert_P016_to_ARGB32(const QVideoFrame &frame, uchar *output) { FETCH_INFO_BIPLANAR(frame) @@ -494,6 +458,14 @@ static void QT_FASTCALL qt_convert_Y_to_ARGB32(const QVideoFrame &frame, uchar * MERGE_LOOPS(width, height, stride, 1) } +template<typename Pixel> +static void QT_FASTCALL qt_copy_pixels_with_mask(Pixel *dst, const Pixel *src, size_t size, + Pixel mask) +{ + for (size_t x = 0; x < size; ++x) + dst[x] = src[x] | mask; +} + static VideoFrameConvertFunc qConvertFuncs[QVideoFrameFormat::NPixelFormats] = { /* Format_Invalid */ nullptr, // Not needed /* Format_ARGB8888 */ qt_convert_to_ARGB32<ARGB8888>, @@ -526,24 +498,32 @@ static VideoFrameConvertFunc qConvertFuncs[QVideoFrameFormat::NPixelFormats] = { /* Format_Jpeg */ nullptr, // Not needed }; -static void qInitConvertFuncsAsm() +static PixelsCopyFunc qPixelsCopyFunc = qt_copy_pixels_with_mask<uint32_t>; + +static std::once_flag InitFuncsAsmFlag; + +static void qInitFuncsAsm() { #ifdef QT_COMPILER_SUPPORTS_SSE2 extern void QT_FASTCALL qt_convert_ARGB8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output); extern void QT_FASTCALL qt_convert_ABGR8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output); extern void QT_FASTCALL qt_convert_RGBA8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output); extern void QT_FASTCALL qt_convert_BGRA8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output); + extern void QT_FASTCALL qt_copy_pixels_with_mask_sse2(uint32_t * dst, const uint32_t *src, size_t size, uint32_t mask); + if (qCpuHasFeature(SSE2)){ qConvertFuncs[QVideoFrameFormat::Format_ARGB8888] = qt_convert_ARGB8888_to_ARGB32_sse2; qConvertFuncs[QVideoFrameFormat::Format_ARGB8888_Premultiplied] = qt_convert_ARGB8888_to_ARGB32_sse2; qConvertFuncs[QVideoFrameFormat::Format_XRGB8888] = qt_convert_ARGB8888_to_ARGB32_sse2; qConvertFuncs[QVideoFrameFormat::Format_BGRA8888] = qt_convert_BGRA8888_to_ARGB32_sse2; qConvertFuncs[QVideoFrameFormat::Format_BGRA8888_Premultiplied] = qt_convert_BGRA8888_to_ARGB32_sse2; - qConvertFuncs[QVideoFrameFormat::Format_XBGR8888] = qt_convert_BGRA8888_to_ARGB32_sse2; + qConvertFuncs[QVideoFrameFormat::Format_BGRX8888] = qt_convert_BGRA8888_to_ARGB32_sse2; qConvertFuncs[QVideoFrameFormat::Format_ABGR8888] = qt_convert_ABGR8888_to_ARGB32_sse2; qConvertFuncs[QVideoFrameFormat::Format_XBGR8888] = qt_convert_ABGR8888_to_ARGB32_sse2; - qConvertFuncs[QVideoFrameFormat::Format_BGRA8888] = qt_convert_BGRA8888_to_ARGB32_sse2; - qConvertFuncs[QVideoFrameFormat::Format_BGRA8888] = qt_convert_BGRA8888_to_ARGB32_sse2; + qConvertFuncs[QVideoFrameFormat::Format_RGBA8888] = qt_convert_RGBA8888_to_ARGB32_sse2; + qConvertFuncs[QVideoFrameFormat::Format_RGBX8888] = qt_convert_RGBA8888_to_ARGB32_sse2; + + qPixelsCopyFunc = qt_copy_pixels_with_mask_sse2; } #endif #ifdef QT_COMPILER_SUPPORTS_SSSE3 @@ -557,11 +537,11 @@ static void qInitConvertFuncsAsm() qConvertFuncs[QVideoFrameFormat::Format_XRGB8888] = qt_convert_ARGB8888_to_ARGB32_ssse3; qConvertFuncs[QVideoFrameFormat::Format_BGRA8888] = qt_convert_BGRA8888_to_ARGB32_ssse3; qConvertFuncs[QVideoFrameFormat::Format_BGRA8888_Premultiplied] = qt_convert_BGRA8888_to_ARGB32_ssse3; - qConvertFuncs[QVideoFrameFormat::Format_XBGR8888] = qt_convert_BGRA8888_to_ARGB32_ssse3; + qConvertFuncs[QVideoFrameFormat::Format_BGRX8888] = qt_convert_BGRA8888_to_ARGB32_ssse3; qConvertFuncs[QVideoFrameFormat::Format_ABGR8888] = qt_convert_ABGR8888_to_ARGB32_ssse3; qConvertFuncs[QVideoFrameFormat::Format_XBGR8888] = qt_convert_ABGR8888_to_ARGB32_ssse3; - qConvertFuncs[QVideoFrameFormat::Format_BGRA8888] = qt_convert_BGRA8888_to_ARGB32_ssse3; - qConvertFuncs[QVideoFrameFormat::Format_BGRA8888] = qt_convert_BGRA8888_to_ARGB32_ssse3; + qConvertFuncs[QVideoFrameFormat::Format_RGBA8888] = qt_convert_RGBA8888_to_ARGB32_ssse3; + qConvertFuncs[QVideoFrameFormat::Format_RGBX8888] = qt_convert_RGBA8888_to_ARGB32_ssse3; } #endif #ifdef QT_COMPILER_SUPPORTS_AVX2 @@ -569,31 +549,82 @@ static void qInitConvertFuncsAsm() extern void QT_FASTCALL qt_convert_ABGR8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output); extern void QT_FASTCALL qt_convert_RGBA8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output); extern void QT_FASTCALL qt_convert_BGRA8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output); + extern void QT_FASTCALL qt_copy_pixels_with_mask_avx2(uint32_t * dst, const uint32_t *src, size_t size, uint32_t mask); if (qCpuHasFeature(AVX2)){ qConvertFuncs[QVideoFrameFormat::Format_ARGB8888] = qt_convert_ARGB8888_to_ARGB32_avx2; qConvertFuncs[QVideoFrameFormat::Format_ARGB8888_Premultiplied] = qt_convert_ARGB8888_to_ARGB32_avx2; qConvertFuncs[QVideoFrameFormat::Format_XRGB8888] = qt_convert_ARGB8888_to_ARGB32_avx2; qConvertFuncs[QVideoFrameFormat::Format_BGRA8888] = qt_convert_BGRA8888_to_ARGB32_avx2; qConvertFuncs[QVideoFrameFormat::Format_BGRA8888_Premultiplied] = qt_convert_BGRA8888_to_ARGB32_avx2; - qConvertFuncs[QVideoFrameFormat::Format_XBGR8888] = qt_convert_BGRA8888_to_ARGB32_avx2; + qConvertFuncs[QVideoFrameFormat::Format_BGRX8888] = qt_convert_BGRA8888_to_ARGB32_avx2; qConvertFuncs[QVideoFrameFormat::Format_ABGR8888] = qt_convert_ABGR8888_to_ARGB32_avx2; qConvertFuncs[QVideoFrameFormat::Format_XBGR8888] = qt_convert_ABGR8888_to_ARGB32_avx2; - qConvertFuncs[QVideoFrameFormat::Format_BGRA8888] = qt_convert_BGRA8888_to_ARGB32_avx2; - qConvertFuncs[QVideoFrameFormat::Format_BGRA8888] = qt_convert_BGRA8888_to_ARGB32_avx2; + qConvertFuncs[QVideoFrameFormat::Format_RGBA8888] = qt_convert_RGBA8888_to_ARGB32_avx2; + qConvertFuncs[QVideoFrameFormat::Format_RGBX8888] = qt_convert_RGBA8888_to_ARGB32_avx2; + + qPixelsCopyFunc = qt_copy_pixels_with_mask_avx2; } #endif } VideoFrameConvertFunc qConverterForFormat(QVideoFrameFormat::PixelFormat format) { - static bool initAsmFuncsDone = false; - if (!initAsmFuncsDone) { - qInitConvertFuncsAsm(); - initAsmFuncsDone = true; - } + std::call_once(InitFuncsAsmFlag, &qInitFuncsAsm); + VideoFrameConvertFunc convert = qConvertFuncs[format]; return convert; } +void Q_MULTIMEDIA_EXPORT qCopyPixelsWithAlphaMask(uint32_t *dst, + const uint32_t *src, + size_t pixCount, + QVideoFrameFormat::PixelFormat format, + bool srcAlphaVaries) +{ + if (pixCount == 0) + return; + + const auto mask = qAlphaMask(format); + + if (srcAlphaVaries || (src[0] & mask) != mask) + qCopyPixelsWithMask(dst, src, pixCount, mask); + else + memcpy(dst, src, pixCount * 4); +} + +void qCopyPixelsWithMask(uint32_t *dst, const uint32_t *src, size_t size, uint32_t mask) +{ + std::call_once(InitFuncsAsmFlag, &qInitFuncsAsm); + + qPixelsCopyFunc(dst, src, size, mask); +} + +uint32_t qAlphaMask(QVideoFrameFormat::PixelFormat format) +{ + switch (format) { + case QVideoFrameFormat::Format_ARGB8888: + case QVideoFrameFormat::Format_ARGB8888_Premultiplied: + case QVideoFrameFormat::Format_XRGB8888: + case QVideoFrameFormat::Format_ABGR8888: + case QVideoFrameFormat::Format_XBGR8888: +#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN + return 0xff; +#else + return 0xff000000; +#endif + case QVideoFrameFormat::Format_BGRA8888: + case QVideoFrameFormat::Format_BGRA8888_Premultiplied: + case QVideoFrameFormat::Format_BGRX8888: + case QVideoFrameFormat::Format_RGBA8888: + case QVideoFrameFormat::Format_RGBX8888: +#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN + return 0xff000000; +#else + return 0xff; +#endif + default: + return 0; + } +} QT_END_NAMESPACE diff --git a/src/multimedia/video/qvideoframeconversionhelper_avx2.cpp b/src/multimedia/video/qvideoframeconversionhelper_avx2.cpp index bffc48561..6802cca74 100644 --- a/src/multimedia/video/qvideoframeconversionhelper_avx2.cpp +++ b/src/multimedia/video/qvideoframeconversionhelper_avx2.cpp @@ -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 #include "qvideoframeconversionhelper_p.h" @@ -78,7 +42,7 @@ void convert_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output) auto *pixel = reinterpret_cast<const Pixel *>(src); int x = 0; - ALIGN(32, argb, x, width) { + QT_MEDIA_ALIGN(32, argb, x, width) { *argb = pixel->convert(); ++pixel; ++argb; @@ -129,6 +93,43 @@ void QT_FASTCALL qt_convert_BGRA8888_to_ARGB32_avx2(const QVideoFrame &frame, uc convert_to_ARGB32_avx2<3, 2, 1, 0>(frame, output); } +void QT_FASTCALL qt_copy_pixels_with_mask_avx2(uint32_t *dst, const uint32_t *src, size_t size, uint32_t mask) +{ + const auto mask256 = _mm256_set_epi32(mask, mask, mask, mask, mask, mask, mask, mask); + + size_t x = 0; + + QT_MEDIA_ALIGN(32, dst, x, size) + *(dst++) = *(src++) | mask; + + for (; x < size - (8 * 4 + 1); x += 8 * 4) { + const auto srcData1 = _mm256_loadu_si256(reinterpret_cast<const __m256i *>(src)); + const auto srcData2 = _mm256_loadu_si256(reinterpret_cast<const __m256i *>(src += 8)); + const auto srcData3 = _mm256_loadu_si256(reinterpret_cast<const __m256i *>(src += 8)); + const auto srcData4 = _mm256_loadu_si256(reinterpret_cast<const __m256i *>(src += 8)); + + _mm256_store_si256(reinterpret_cast<__m256i *>(dst), _mm256_or_si256(srcData1, mask256)); + _mm256_store_si256(reinterpret_cast<__m256i *>(dst += 8), _mm256_or_si256(srcData2, mask256)); + _mm256_store_si256(reinterpret_cast<__m256i *>(dst += 8), _mm256_or_si256(srcData3, mask256)); + _mm256_store_si256(reinterpret_cast<__m256i *>(dst += 8), _mm256_or_si256(srcData4, mask256)); + + src += 8; + dst += 8; + } + + // leftovers + for (; x < size - 7; x += 8) { + const auto srcData = _mm256_loadu_si256(reinterpret_cast<const __m256i *>(src)); + _mm256_store_si256(reinterpret_cast<__m256i *>(dst), _mm256_or_si256(srcData, mask256)); + + src += 8; + dst += 8; + } + + for (; x < size; ++x) + *(dst++) = *(src++) | mask; +} + QT_END_NAMESPACE #endif diff --git a/src/multimedia/video/qvideoframeconversionhelper_p.h b/src/multimedia/video/qvideoframeconversionhelper_p.h index 792b3964d..17490a817 100644 --- a/src/multimedia/video/qvideoframeconversionhelper_p.h +++ b/src/multimedia/video/qvideoframeconversionhelper_p.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 QVIDEOFRAMECONVERSIONHELPER_P_H #define QVIDEOFRAMECONVERSIONHELPER_P_H @@ -58,9 +22,20 @@ QT_BEGIN_NAMESPACE // Converts to RGB32 or ARGB32_Premultiplied typedef void (QT_FASTCALL *VideoFrameConvertFunc)(const QVideoFrame &frame, uchar *output); +typedef void(QT_FASTCALL *PixelsCopyFunc)(uint32_t *dst, const uint32_t *src, size_t size, uint32_t mask); VideoFrameConvertFunc qConverterForFormat(QVideoFrameFormat::PixelFormat format); +void Q_MULTIMEDIA_EXPORT qCopyPixelsWithAlphaMask(uint32_t *dst, + const uint32_t *src, + size_t size, + QVideoFrameFormat::PixelFormat format, + bool srcAlphaVaries); + +void Q_MULTIMEDIA_EXPORT qCopyPixelsWithMask(uint32_t *dst, const uint32_t *src, size_t size, uint32_t mask); + +uint32_t Q_MULTIMEDIA_EXPORT qAlphaMask(QVideoFrameFormat::PixelFormat format); + template<int a, int r, int g, int b> struct ArgbPixel { @@ -158,7 +133,7 @@ using BGRX8888 = RgbPixel<2, 1, 0>; stride = 0; \ } -#define ALIGN(boundary, ptr, x, length) \ +#define QT_MEDIA_ALIGN(boundary, ptr, x, length) \ for (; ((reinterpret_cast<qintptr>(ptr) & (boundary - 1)) != 0) && x < length; ++x) QT_END_NAMESPACE diff --git a/src/multimedia/video/qvideoframeconversionhelper_sse2.cpp b/src/multimedia/video/qvideoframeconversionhelper_sse2.cpp index 5c6250224..b7049d806 100644 --- a/src/multimedia/video/qvideoframeconversionhelper_sse2.cpp +++ b/src/multimedia/video/qvideoframeconversionhelper_sse2.cpp @@ -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 #include "qvideoframeconversionhelper_p.h" @@ -65,7 +29,7 @@ void convert_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) auto *pixel = reinterpret_cast<const Pixel *>(src); int x = 0; - ALIGN(16, argb, x, width) { + QT_MEDIA_ALIGN(16, argb, x, width) { *argb = pixel->convert(); ++pixel; ++argb; @@ -116,6 +80,44 @@ void QT_FASTCALL qt_convert_BGRA8888_to_ARGB32_sse2(const QVideoFrame &frame, uc convert_to_ARGB32_sse2<3, 2, 1, 0>(frame, output); } +void QT_FASTCALL qt_copy_pixels_with_mask_sse2(uint32_t *dst, const uint32_t *src, size_t size, uint32_t mask) +{ + const auto mask128 = _mm_set_epi32(mask, mask, mask, mask); + + size_t x = 0; + + QT_MEDIA_ALIGN(16, dst, x, size) + *(dst++) = *(src++) | mask; + + for (; x < size - (4 * 4 - 1); x += 4 * 4) { + const auto srcData0 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(src)); + const auto srcData1 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(src += 4)); + const auto srcData2 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(src += 4)); + const auto srcData3 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(src += 4)); + + _mm_store_si128(reinterpret_cast<__m128i *>(dst), _mm_or_si128(srcData0, mask128)); + _mm_store_si128(reinterpret_cast<__m128i *>(dst += 4), _mm_or_si128(srcData1, mask128)); + _mm_store_si128(reinterpret_cast<__m128i *>(dst += 4), _mm_or_si128(srcData2, mask128)); + _mm_store_si128(reinterpret_cast<__m128i *>(dst += 4), _mm_or_si128(srcData3, mask128)); + + src += 4; + dst += 4; + } + + for (; x < size - 3; x += 4) { + const auto srcData = _mm_loadu_si128(reinterpret_cast<const __m128i *>(src)); + + _mm_store_si128(reinterpret_cast<__m128i *>(dst), _mm_or_si128(srcData, mask128)); + + src += 4; + dst += 4; + } + + // leftovers + for (; x < size; ++x) + *(dst++) = *(src++) | mask; +} + QT_END_NAMESPACE #endif diff --git a/src/multimedia/video/qvideoframeconversionhelper_ssse3.cpp b/src/multimedia/video/qvideoframeconversionhelper_ssse3.cpp index 47c0f683b..10a244fb0 100644 --- a/src/multimedia/video/qvideoframeconversionhelper_ssse3.cpp +++ b/src/multimedia/video/qvideoframeconversionhelper_ssse3.cpp @@ -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 #include "qvideoframeconversionhelper_p.h" @@ -70,7 +34,7 @@ void convert_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output) const auto *pixel = reinterpret_cast<const Pixel *>(src); int x = 0; - ALIGN(16, argb, x, width) { + QT_MEDIA_ALIGN(16, argb, x, width) { *argb = pixel->convert(); ++pixel; ++argb; diff --git a/src/multimedia/video/qvideoframeconverter.cpp b/src/multimedia/video/qvideoframeconverter.cpp index 6ad1e8dc2..7883f91a5 100644 --- a/src/multimedia/video/qvideoframeconverter.cpp +++ b/src/multimedia/video/qvideoframeconverter.cpp @@ -1,60 +1,12 @@ -/**************************************************************************** -** -** Copyright (C) 2022 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) 2022 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 "qvideoframeconverter_p.h" #include "qvideoframeconversionhelper_p.h" #include "qvideoframeformat.h" - -#include <QtGui/private/qrhinull_p.h> -#if QT_CONFIG(opengl) -#include <QtGui/private/qrhigles2_p.h> -#include <QOffscreenSurface> -#endif -#if QT_CONFIG(vulkan) -#include <QtGui/private/qrhivulkan_p.h> -#endif -#ifdef Q_OS_WIN -#include <QtGui/private/qrhid3d11_p.h> -#endif -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) -#include <QtGui/private/qrhimetal_p.h> -#endif +#include "qvideoframe_p.h" +#include "qmultimediautils_p.h" +#include "qabstractvideobuffer.h" #include <QtCore/qcoreapplication.h> #include <QtCore/qsize.h> @@ -62,16 +14,19 @@ #include <QtCore/qfile.h> #include <QtCore/qthreadstorage.h> #include <QtGui/qimage.h> +#include <QtGui/qoffscreensurface.h> #include <qpa/qplatformintegration.h> #include <private/qvideotexturehelper_p.h> -#include <private/qabstractvideobuffer_p.h> #include <private/qguiapplication_p.h> -#include <private/qrhi_p.h> +#include <rhi/qrhi.h> +#ifdef Q_OS_DARWIN +#include <QtCore/private/qcore_mac_p.h> +#endif QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(qLcVideoFrameConverter, "qt.multimedia.video.frameconverter") +Q_STATIC_LOGGING_CATEGORY(qLcVideoFrameConverter, "qt.multimedia.video.frameconverter") namespace { @@ -82,11 +37,21 @@ struct State QOffscreenSurface *fallbackSurface = nullptr; #endif bool cpuOnly = false; +#if defined(Q_OS_ANDROID) + QMetaObject::Connection appStateChangedConnection; +#endif ~State() { + resetRhi(); + } + + void resetRhi() { delete rhi; + rhi = nullptr; #if QT_CONFIG(opengl) delete fallbackSurface; + fallbackSurface = nullptr; #endif + cpuOnly = false; } }; @@ -135,7 +100,7 @@ static bool pixelFormatHasAlpha(QVideoFrameFormat::PixelFormat format) } }; -static QShader getShader(const QString &name) +static QShader vfcGetShader(const QString &name) { QShader shader = g_shaderCache.value(name); if (shader.isValid()) @@ -151,13 +116,13 @@ static QShader getShader(const QString &name) return shader; } -static void rasterTransform(QImage &image, QVideoFrame::RotationAngle rotation, +static void rasterTransform(QImage &image, QtVideo::Rotation rotation, bool mirrorX, bool mirrorY) { QTransform t; if (mirrorX) t.scale(-1.f, 1.f); - if (rotation != QVideoFrame::Rotation0) + if (rotation != QtVideo::Rotation::None) t.rotate(float(rotation)); if (mirrorY) t.scale(1.f, -1.f); @@ -171,11 +136,13 @@ static void imageCleanupHandler(void *info) delete imageData; } -static QRhi *initializeRHI(QRhi::Implementation backend) +static QRhi *initializeRHI(QRhi *videoFrameRhi) { if (g_state.localData().rhi || g_state.localData().cpuOnly) return g_state.localData().rhi; + QRhi::Implementation backend = videoFrameRhi ? videoFrameRhi->backend() : QRhi::Null; + if (QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::RhiBasedRendering)) { #if defined(Q_OS_MACOS) || defined(Q_OS_IOS) @@ -201,7 +168,19 @@ static QRhi *initializeRHI(QRhi::Implementation backend) g_state.localData().fallbackSurface = QRhiGles2InitParams::newFallbackSurface(); QRhiGles2InitParams params; params.fallbackSurface = g_state.localData().fallbackSurface; + if (backend == QRhi::OpenGLES2) + params.shareContext = static_cast<const QRhiGles2NativeHandles*>(videoFrameRhi->nativeHandles())->context; g_state.localData().rhi = QRhi::create(QRhi::OpenGLES2, ¶ms); + +#if defined(Q_OS_ANDROID) + // reset RHI state on application suspension, as this will be invalid after resuming + if (!g_state.localData().appStateChangedConnection) { + g_state.localData().appStateChangedConnection = QObject::connect(qApp, &QGuiApplication::applicationStateChanged, qApp, [](auto state) { + if (state == Qt::ApplicationSuspended) + g_state.localData().resetRhi(); + }); + } +#endif } } #endif @@ -216,41 +195,37 @@ static QRhi *initializeRHI(QRhi::Implementation backend) } static bool updateTextures(QRhi *rhi, - QRhiResourceUpdateBatch *rub, std::unique_ptr<QRhiBuffer> &uniformBuffer, std::unique_ptr<QRhiSampler> &textureSampler, std::unique_ptr<QRhiShaderResourceBindings> &shaderResourceBindings, std::unique_ptr<QRhiGraphicsPipeline> &graphicsPipeline, std::unique_ptr<QRhiRenderPassDescriptor> &renderPass, - const QVideoFrame &frame, - std::unique_ptr<QRhiTexture> (&textures)[QVideoTextureHelper::TextureDescription::maxPlanes]) + QVideoFrame &frame, + const std::unique_ptr<QVideoFrameTextures> &videoFrameTextures) { auto format = frame.surfaceFormat(); auto pixelFormat = format.pixelFormat(); auto textureDesc = QVideoTextureHelper::textureDescription(pixelFormat); - for (int i = 0; i < QVideoTextureHelper::TextureDescription::maxPlanes; ++i) - QVideoTextureHelper::updateRhiTexture(frame, rhi, rub, i, textures[i]); - QRhiShaderResourceBinding bindings[4]; auto *b = bindings; *b++ = QRhiShaderResourceBinding::uniformBuffer(0, QRhiShaderResourceBinding::VertexStage | QRhiShaderResourceBinding::FragmentStage, uniformBuffer.get()); for (int i = 0; i < textureDesc->nplanes; ++i) *b++ = QRhiShaderResourceBinding::sampledTexture(i + 1, QRhiShaderResourceBinding::FragmentStage, - textures[i].get(), textureSampler.get()); + videoFrameTextures->texture(i), textureSampler.get()); shaderResourceBindings->setBindings(bindings, b); shaderResourceBindings->create(); graphicsPipeline.reset(rhi->newGraphicsPipeline()); graphicsPipeline->setTopology(QRhiGraphicsPipeline::TriangleStrip); - QShader vs = getShader(QVideoTextureHelper::vertexShaderFileName(format)); + QShader vs = vfcGetShader(QVideoTextureHelper::vertexShaderFileName(format)); if (!vs.isValid()) return false; - QShader fs = getShader(QVideoTextureHelper::fragmentShaderFileName(format)); + QShader fs = vfcGetShader(QVideoTextureHelper::fragmentShaderFileName(format)); if (!fs.isValid()) return false; @@ -276,10 +251,10 @@ static bool updateTextures(QRhi *rhi, return true; } -static QImage convertJPEG(const QVideoFrame &frame, QVideoFrame::RotationAngle rotation, bool mirrorX, bool mirrorY) +static QImage convertJPEG(const QVideoFrame &frame, QtVideo::Rotation rotation, bool mirrorX, bool mirrorY) { QVideoFrame varFrame = frame; - if (!varFrame.map(QVideoFrame::ReadOnly)) { + if (!varFrame.map(QtVideo::MapMode::ReadOnly)) { qCDebug(qLcVideoFrameConverter) << Q_FUNC_INFO << ": frame mapping failed"; return {}; } @@ -290,7 +265,7 @@ static QImage convertJPEG(const QVideoFrame &frame, QVideoFrame::RotationAngle r return image; } -static QImage convertCPU(const QVideoFrame &frame, QVideoFrame::RotationAngle rotation, bool mirrorX, bool mirrorY) +static QImage convertCPU(const QVideoFrame &frame, QtVideo::Rotation rotation, bool mirrorX, bool mirrorY) { VideoFrameConvertFunc convert = qConverterForFormat(frame.pixelFormat()); if (!convert) { @@ -298,7 +273,7 @@ static QImage convertCPU(const QVideoFrame &frame, QVideoFrame::RotationAngle ro return {}; } else { QVideoFrame varFrame = frame; - if (!varFrame.map(QVideoFrame::ReadOnly)) { + if (!varFrame.map(QtVideo::MapMode::ReadOnly)) { qCDebug(qLcVideoFrameConverter) << Q_FUNC_INFO << ": frame mapping failed"; return {}; } @@ -311,7 +286,8 @@ static QImage convertCPU(const QVideoFrame &frame, QVideoFrame::RotationAngle ro } } -QImage qImageFromVideoFrame(const QVideoFrame &frame, QVideoFrame::RotationAngle rotation, bool mirrorX, bool mirrorY) +QImage qImageFromVideoFrame(const QVideoFrame &frame, QtVideo::Rotation rotation, bool mirrorX, + bool mirrorY, bool forceCpu) { #ifdef Q_OS_DARWIN QMacAutoReleasePool releasePool; @@ -328,7 +304,6 @@ QImage qImageFromVideoFrame(const QVideoFrame &frame, QVideoFrame::RotationAngle std::unique_ptr<QRhiSampler> textureSampler; std::unique_ptr<QRhiShaderResourceBindings> shaderResourceBindings; std::unique_ptr<QRhiGraphicsPipeline> graphicsPipeline; - std::unique_ptr<QRhiTexture> frameTextures[QVideoTextureHelper::TextureDescription::maxPlanes]; if (frame.size().isEmpty() || frame.pixelFormat() == QVideoFrameFormat::Format_Invalid) return {}; @@ -336,28 +311,23 @@ QImage qImageFromVideoFrame(const QVideoFrame &frame, QVideoFrame::RotationAngle if (frame.pixelFormat() == QVideoFrameFormat::Format_Jpeg) return convertJPEG(frame, rotation, mirrorX, mirrorY); + if (forceCpu) // For test purposes + return convertCPU(frame, rotation, mirrorX, mirrorY); + QRhi *rhi = nullptr; - QRhi::Implementation backend = QRhi::Null; - if (frame.videoBuffer()) { - rhi = frame.videoBuffer()->rhi(); - if (rhi) - backend = rhi->backend(); - } + if (QHwVideoBuffer *buffer = QVideoFramePrivate::hwBuffer(frame)) + rhi = buffer->rhi(); if (!rhi || rhi->thread() != QThread::currentThread()) - rhi = initializeRHI(backend); + rhi = initializeRHI(rhi); if (!rhi || rhi->isRecordingFrame()) return convertCPU(frame, rotation, mirrorX, mirrorY); // Do conversion using shaders - const int rotationIndex = (rotation / 90) % 4; - - QSize frameSize = frame.size(); - if (rotationIndex % 2) - frameSize.transpose(); + const QSize frameSize = qRotatedFrameSize(frame.size(), rotation); vertexBuffer.reset(rhi->newBuffer(QRhiBuffer::Immutable, QRhiBuffer::VertexBuffer, sizeof(g_quad))); vertexBuffer->create(); @@ -393,8 +363,15 @@ QImage qImageFromVideoFrame(const QVideoFrame &frame, QVideoFrame::RotationAngle rub->uploadStaticBuffer(vertexBuffer.get(), g_quad); - if (!updateTextures(rhi, rub, uniformBuffer, textureSampler, shaderResourceBindings, - graphicsPipeline, renderPass, frame, frameTextures)) { + QVideoFrame frameTmp = frame; + auto videoFrameTextures = QVideoTextureHelper::createTextures(frameTmp, rhi, rub, {}); + if (!videoFrameTextures) { + qCDebug(qLcVideoFrameConverter) << "Failed obtain textures. Using CPU conversion."; + return convertCPU(frame, rotation, mirrorX, mirrorY); + } + + if (!updateTextures(rhi, uniformBuffer, textureSampler, shaderResourceBindings, + graphicsPipeline, renderPass, frameTmp, videoFrameTextures)) { qCDebug(qLcVideoFrameConverter) << "Failed to update textures. Using CPU conversion."; return convertCPU(frame, rotation, mirrorX, mirrorY); } @@ -418,7 +395,8 @@ QImage qImageFromVideoFrame(const QVideoFrame &frame, QVideoFrame::RotationAngle cb->setViewport({ 0, 0, float(frameSize.width()), float(frameSize.height()) }); cb->setShaderResources(shaderResourceBindings.get()); - quint32 vertexOffset = quint32(sizeof(float)) * 16 * rotationIndex; + const int rotationIndex = (qToUnderlying(rotation) / 90) % 4; + const quint32 vertexOffset = quint32(sizeof(float)) * 16 * rotationIndex; const QRhiCommandBuffer::VertexInput vbufBinding(vertexBuffer.get(), vertexOffset); cb->setVertexInput(0, 1, &vbufBinding); cb->draw(4); @@ -441,19 +419,43 @@ QImage qImageFromVideoFrame(const QVideoFrame &frame, QVideoFrame::RotationAngle return convertCPU(frame, rotation, mirrorX, mirrorY); } - if (!qConverterForFormat(frame.pixelFormat())) { - qCDebug(qLcVideoFrameConverter) << "Unsupported pixel format" << frame.pixelFormat(); + QByteArray *imageData = new QByteArray(readResult.data); + + return QImage(reinterpret_cast<const uchar *>(imageData->constData()), + readResult.pixelSize.width(), readResult.pixelSize.height(), + QImage::Format_RGBA8888_Premultiplied, imageCleanupHandler, imageData); +} + +QImage videoFramePlaneAsImage(QVideoFrame &frame, int plane, QImage::Format targetFormat, + QSize targetSize) +{ + if (plane >= frame.planeCount()) + return {}; + + if (!frame.map(QtVideo::MapMode::ReadOnly)) { + qWarning() << "Cannot map a video frame in ReadOnly mode!"; return {}; } - QImage::Format format = pixelFormatHasAlpha(frame.pixelFormat()) ? - QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32; + auto frameHandle = QVideoFramePrivate::handle(frame); - QByteArray *imageData = new QByteArray(readResult.data); + // With incrementing the reference counter, we share the mapped QVideoFrame + // with the target QImage. The function imageCleanupFunction is going to adopt + // the frameHandle by QVideoFrame and dereference it upon the destruction. + frameHandle->ref.ref(); - return QImage(reinterpret_cast<const uchar *>(imageData->constData()), - readResult.pixelSize.width(), readResult.pixelSize.height(), - format, imageCleanupHandler, imageData); + auto imageCleanupFunction = [](void *data) { + QVideoFrame frame = reinterpret_cast<QVideoFramePrivate *>(data)->adoptThisByVideoFrame(); + Q_ASSERT(frame.isMapped()); + frame.unmap(); + }; + + const auto bytesPerLine = frame.bytesPerLine(plane); + const auto height = + bytesPerLine ? qMin(targetSize.height(), frame.mappedBytes(plane) / bytesPerLine) : 0; + + return QImage(reinterpret_cast<const uchar *>(frame.bits(plane)), targetSize.width(), height, + bytesPerLine, targetFormat, imageCleanupFunction, frameHandle); } QT_END_NAMESPACE diff --git a/src/multimedia/video/qvideoframeconverter_p.h b/src/multimedia/video/qvideoframeconverter_p.h index d912728fb..ad6cea9e4 100644 --- a/src/multimedia/video/qvideoframeconverter_p.h +++ b/src/multimedia/video/qvideoframeconverter_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2022 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) 2022 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 QVIDEOFRAMECONVERTER_H #define QVIDEOFRAMECONVERTER_H @@ -55,7 +19,16 @@ QT_BEGIN_NAMESPACE -Q_MULTIMEDIA_EXPORT QImage qImageFromVideoFrame(const QVideoFrame &frame, QVideoFrame::RotationAngle rotation = QVideoFrame::Rotation0, bool mirrorX = false, bool mirrorY = false); +Q_MULTIMEDIA_EXPORT QImage +qImageFromVideoFrame(const QVideoFrame &frame, QtVideo::Rotation rotation = QtVideo::Rotation::None, + bool mirrorX = false, bool mirrorY = false, bool forceCpu = false); + +/** + * @brief Maps the video frame and returns an image having a shared ownership for the video frame + * and referencing to its mapped data. + */ +Q_MULTIMEDIA_EXPORT QImage videoFramePlaneAsImage(QVideoFrame &frame, int plane, + QImage::Format targetFromat, QSize targetSize); QT_END_NAMESPACE diff --git a/src/multimedia/video/qvideoframeformat.cpp b/src/multimedia/video/qvideoframeformat.cpp index ead8a4655..b3177234f 100644 --- a/src/multimedia/video/qvideoframeformat.cpp +++ b/src/multimedia/video/qvideoframeformat.cpp @@ -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 #include "qvideoframeformat.h" #include "qvideotexturehelper_p.h" @@ -48,7 +12,7 @@ #include <qmatrix4x4.h> static void initResource() { - Q_INIT_RESOURCE(shaders); + Q_INIT_RESOURCE(qtmultimedia_shaders); } QT_BEGIN_NAMESPACE @@ -75,7 +39,8 @@ public: && viewport == other.viewport && frameRatesEqual(frameRate, other.frameRate) && colorSpace == other.colorSpace - && mirrored == other.mirrored) + && mirrored == other.mirrored + && rotation == other.rotation) return true; return false; @@ -96,6 +61,7 @@ public: float frameRate = 0.0; float maxLuminance = -1.; bool mirrored = false; + QtVideo::Rotation rotation = QtVideo::Rotation::None; }; QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QVideoFrameFormatPrivate); @@ -112,7 +78,7 @@ QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QVideoFrameFormatPrivate); A video sink presents a stream of video frames. QVideoFrameFormat describes the type of the frames and determines how they should be presented. - The core properties of a video stream required to setup a video sink are the pixel format + The core properties of a video stream required to set up a video sink are the pixel format given by pixelFormat(), and the frame dimensions given by frameSize(). The region of a frame that is actually displayed on a video surface is given by the viewport(). @@ -408,6 +374,12 @@ QVideoFrameFormat::QVideoFrameFormat(const QVideoFrameFormat &other) = default; */ /*! + \fn void QVideoFrameFormat::swap(QVideoFrameFormat &other) noexcept + + Swaps the current video frame format with the \a other. +*/ + +/*! Assigns the values of \a other to this object. */ QVideoFrameFormat &QVideoFrameFormat::operator =(const QVideoFrameFormat &other) = default; @@ -568,12 +540,13 @@ void QVideoFrameFormat::setScanLineDirection(Direction direction) d->scanLineDirection = direction; } +#if QT_DEPRECATED_SINCE(6, 8) /*! Returns the frame rate of a video stream in frames per second. */ qreal QVideoFrameFormat::frameRate() const { - return d->frameRate; + return streamFrameRate(); } /*! @@ -581,10 +554,28 @@ qreal QVideoFrameFormat::frameRate() const */ void QVideoFrameFormat::setFrameRate(qreal rate) { + setStreamFrameRate(rate); +} +#endif + +/*! + Returns the frame rate of a video stream in frames per second. +*/ +qreal QVideoFrameFormat::streamFrameRate() const +{ + return d->frameRate; +} + +/*! + Sets the frame \a rate of a video stream in frames per second. +*/ +void QVideoFrameFormat::setStreamFrameRate(qreal rate) +{ detach(); d->frameRate = rate; } +#if QT_DEPRECATED_SINCE(6, 4) /*! \deprecated Use colorSpace() instead @@ -606,6 +597,7 @@ void QVideoFrameFormat::setYCbCrColorSpace(QVideoFrameFormat::YCbCrColorSpace sp detach(); d->colorSpace = ColorSpace(space); } +#endif // QT_DEPRECATED_SINCE(6, 4) /*! Returns the color space of a video stream. @@ -693,6 +685,23 @@ void QVideoFrameFormat::setMirrored(bool mirrored) } /*! + Returns the rotation angle the matching video frame should be rotated clockwise before displaying. + */ +QtVideo::Rotation QVideoFrameFormat::rotation() const +{ + return d->rotation; +} + +/*! + Sets the \a rotation angle the matching video frame should be rotated clockwise before displaying. + */ +void QVideoFrameFormat::setRotation(QtVideo::Rotation rotation) +{ + detach(); + d->rotation = rotation; +} + +/*! \internal */ QString QVideoFrameFormat::vertexShaderFileName() const @@ -733,7 +742,9 @@ float QVideoFrameFormat::maxLuminance() const } return d->maxLuminance; } - +/*! + Sets the maximum luminance to the given value, \a lum. +*/ void QVideoFrameFormat::setMaxLuminance(float lum) { detach(); @@ -769,7 +780,9 @@ QVideoFrameFormat::PixelFormat QVideoFrameFormat::pixelFormatFromImageFormat(QIm case QImage::Format_RGBA8888: return QVideoFrameFormat::Format_RGBA8888; case QImage::Format_RGBA8888_Premultiplied: - return QVideoFrameFormat::Format_ARGB8888_Premultiplied; + // QVideoFrameFormat::Format_RGBA8888_Premultiplied is to be added in 6.8 + // Format_RGBX8888 suits the best as a workaround + return QVideoFrameFormat::Format_RGBX8888; case QImage::Format_RGBX8888: return QVideoFrameFormat::Format_RGBX8888; case QImage::Format_Grayscale8: @@ -925,6 +938,7 @@ QString QVideoFrameFormat::pixelFormatToString(QVideoFrameFormat::PixelFormat pi } #ifndef QT_NO_DEBUG_STREAM +# if QT_DEPRECATED_SINCE(6, 4) QDebug operator<<(QDebug dbg, QVideoFrameFormat::YCbCrColorSpace cs) { QDebugStateSaver saver(dbg); @@ -954,6 +968,7 @@ QDebug operator<<(QDebug dbg, QVideoFrameFormat::YCbCrColorSpace cs) } return dbg; } +# endif // QT_DEPRECATED_SINCE(6, 4) QDebug operator<<(QDebug dbg, QVideoFrameFormat::ColorSpace cs) { @@ -1006,7 +1021,7 @@ QDebug operator<<(QDebug dbg, const QVideoFrameFormat &f) << "\n frame size=" << f.frameSize() << "\n viewport=" << f.viewport() << "\n colorSpace=" << f.colorSpace() - << "\n frameRate=" << f.frameRate() + << "\n frameRate=" << f.streamFrameRate() << "\n mirrored=" << f.isMirrored(); return dbg; diff --git a/src/multimedia/video/qvideoframeformat.h b/src/multimedia/video/qvideoframeformat.h index 3925f10a2..9b3879108 100644 --- a/src/multimedia/video/qvideoframeformat.h +++ b/src/multimedia/video/qvideoframeformat.h @@ -1,46 +1,11 @@ -/**************************************************************************** -** -** 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 QVIDEOSURFACEFORMAT_H #define QVIDEOSURFACEFORMAT_H #include <QtMultimedia/qtmultimediaglobal.h> +#include <QtMultimedia/qtvideo.h> #include <QtCore/qlist.h> #include <QtCore/qmetatype.h> @@ -61,6 +26,7 @@ QT_DECLARE_QESDP_SPECIALIZATION_DTOR_WITH_EXPORT(QVideoFrameFormatPrivate, Q_MUL class Q_MULTIMEDIA_EXPORT QVideoFrameFormat { + Q_GADGET public: enum PixelFormat { @@ -101,6 +67,7 @@ public: Format_YUV420P10 }; + Q_ENUM(PixelFormat) #ifndef Q_QDOC static constexpr int NPixelFormats = Format_YUV420P10 + 1; #endif @@ -189,12 +156,21 @@ public: Direction scanLineDirection() const; void setScanLineDirection(Direction direction); +#if QT_DEPRECATED_SINCE(6, 8) + QT_DEPRECATED_VERSION_X_6_8("Use streamFrameRate()") qreal frameRate() const; + QT_DEPRECATED_VERSION_X_6_8("Use setStreamFrameRate()") void setFrameRate(qreal rate); +#endif + + qreal streamFrameRate() const; + void setStreamFrameRate(qreal rate); #if QT_DEPRECATED_SINCE(6, 4) - QT_DEPRECATED_VERSION_X_6_0("Use colorSpace()") YCbCrColorSpace yCbCrColorSpace() const; - QT_DEPRECATED_VERSION_X_6_0("Use setColorSpace()") void setYCbCrColorSpace(YCbCrColorSpace colorSpace); + QT_DEPRECATED_VERSION_X_6_4("Use colorSpace()") + YCbCrColorSpace yCbCrColorSpace() const; + QT_DEPRECATED_VERSION_X_6_4("Use setColorSpace()") + void setYCbCrColorSpace(YCbCrColorSpace colorSpace); #endif ColorSpace colorSpace() const; @@ -209,6 +185,9 @@ public: bool isMirrored() const; void setMirrored(bool mirrored); + QtVideo::Rotation rotation() const; + void setRotation(QtVideo::Rotation rotation); + QString vertexShaderFileName() const; QString fragmentShaderFileName() const; void updateUniformData(QByteArray *dst, const QVideoFrame &frame, const QMatrix4x4 &transform, float opacity) const; @@ -230,8 +209,10 @@ Q_DECLARE_SHARED(QVideoFrameFormat) #ifndef QT_NO_DEBUG_STREAM Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug, const QVideoFrameFormat &); Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug, QVideoFrameFormat::Direction); -QT_DEPRECATED_VERSION_X_6_0("Use QVideoFrameFormat::ColorSpace") +#if QT_DEPRECATED_SINCE(6, 4) +QT_DEPRECATED_VERSION_X_6_4("Use QVideoFrameFormat::ColorSpace") Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug, QVideoFrameFormat::YCbCrColorSpace); +#endif Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug, QVideoFrameFormat::ColorSpace); Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug, QVideoFrameFormat::PixelFormat); #endif diff --git a/src/multimedia/video/qvideooutputorientationhandler.cpp b/src/multimedia/video/qvideooutputorientationhandler.cpp index 86e6bd664..ff91bd7fb 100644 --- a/src/multimedia/video/qvideooutputorientationhandler.cpp +++ b/src/multimedia/video/qvideooutputorientationhandler.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Research In Motion -** 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 Research In Motion +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qvideooutputorientationhandler_p.h" @@ -54,8 +18,8 @@ QVideoOutputOrientationHandler::QVideoOutputOrientationHandler(QObject *parent) if (!screen) return; - connect(screen, SIGNAL(orientationChanged(Qt::ScreenOrientation)), - this, SLOT(screenOrientationChanged(Qt::ScreenOrientation))); + connect(screen, &QScreen::orientationChanged, this, + &QVideoOutputOrientationHandler::screenOrientationChanged); screenOrientationChanged(screen->orientation()); } @@ -84,3 +48,5 @@ void QVideoOutputOrientationHandler::screenOrientationChanged(Qt::ScreenOrientat } QT_END_NAMESPACE + +#include "moc_qvideooutputorientationhandler_p.cpp" diff --git a/src/multimedia/video/qvideooutputorientationhandler_p.h b/src/multimedia/video/qvideooutputorientationhandler_p.h index dc7702a1f..ae31f333b 100644 --- a/src/multimedia/video/qvideooutputorientationhandler_p.h +++ b/src/multimedia/video/qvideooutputorientationhandler_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Research In Motion -** 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 Research In Motion +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QVIDEOOUTPUTORIENTATIONHANDLER_P_H #define QVIDEOOUTPUTORIENTATIONHANDLER_P_H diff --git a/src/multimedia/video/qvideosink.cpp b/src/multimedia/video/qvideosink.cpp index f70763157..4551a8960 100644 --- a/src/multimedia/video/qvideosink.cpp +++ b/src/multimedia/video/qvideosink.cpp @@ -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 #include "qvideosink.h" @@ -58,7 +22,12 @@ public: QVideoSinkPrivate(QVideoSink *q) : q_ptr(q) { - videoSink = QPlatformMediaIntegration::instance()->createVideoSink(q); + auto maybeVideoSink = QPlatformMediaIntegration::instance()->createVideoSink(q); + if (maybeVideoSink) { + videoSink = maybeVideoSink.value(); + } else { + qWarning() << "Failed to create QVideoSink" << maybeVideoSink.error(); + } } ~QVideoSinkPrivate() { @@ -122,12 +91,12 @@ QVideoSink::QVideoSink(QObject *parent) */ QVideoSink::~QVideoSink() { + disconnect(this); d->unregisterSource(); delete d; } /*! - \internal Returns the QRhi instance being used to create texture data in the video frames. */ QRhi *QVideoSink::rhi() const @@ -145,7 +114,8 @@ void QVideoSink::setRhi(QRhi *rhi) if (d->rhi == rhi) return; d->rhi = rhi; - d->videoSink->setRhi(rhi); + if (d->videoSink) + d->videoSink->setRhi(rhi); } /*! @@ -161,23 +131,31 @@ QPlatformVideoSink *QVideoSink::platformVideoSink() const */ QVideoFrame QVideoSink::videoFrame() const { - return d->videoSink->currentVideoFrame(); + return d->videoSink ? d->videoSink->currentVideoFrame() : QVideoFrame{}; } /*! + \fn void QVideoSink::videoFrameChanged(const QVideoFrame &frame) const + + Signals when the video \a frame changes. +*/ +/*! Sets the current video \a frame. */ void QVideoSink::setVideoFrame(const QVideoFrame &frame) { - d->videoSink->setVideoFrame(frame); + if (d->videoSink) + d->videoSink->setVideoFrame(frame); } /*! + \property QVideoSink::subtitleText + Returns the current subtitle text. */ QString QVideoSink::subtitleText() const { - return d->videoSink->subtitleText(); + return d->videoSink ? d->videoSink->subtitleText() : QString{}; } /*! @@ -185,10 +163,13 @@ QString QVideoSink::subtitleText() const */ void QVideoSink::setSubtitleText(const QString &subtitle) { - d->videoSink->setSubtitleText(subtitle); + if (d->videoSink) + d->videoSink->setSubtitleText(subtitle); } /*! + \property QVideoSink::videoSize + Returns the size of the video currently being played back. If no video is being played, this method returns an invalid size. */ diff --git a/src/multimedia/video/qvideosink.h b/src/multimedia/video/qvideosink.h index 0e7f3d8cd..1a2e77834 100644 --- a/src/multimedia/video/qvideosink.h +++ b/src/multimedia/video/qvideosink.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 QABSTRACTVIDEOSINK_H #define QABSTRACTVIDEOSINK_H @@ -57,6 +21,8 @@ class QRhi; class Q_MULTIMEDIA_EXPORT QVideoSink : public QObject { Q_OBJECT + Q_PROPERTY(QString subtitleText READ subtitleText WRITE setSubtitleText NOTIFY subtitleTextChanged) + Q_PROPERTY(QSize videoSize READ videoSize NOTIFY videoSizeChanged) public: QVideoSink(QObject *parent = nullptr); ~QVideoSink(); @@ -74,9 +40,8 @@ public: QPlatformVideoSink *platformVideoSink() const; Q_SIGNALS: - void videoFrameChanged(const QVideoFrame &frame) const; - void subtitleTextChanged(const QString &subtitleText) const; - + void videoFrameChanged(const QVideoFrame &frame) QT6_ONLY(const); + void subtitleTextChanged(const QString &subtitleText) QT6_ONLY(const); void videoSizeChanged(); private: diff --git a/src/multimedia/video/qvideotexturehelper.cpp b/src/multimedia/video/qvideotexturehelper.cpp index 48d328b51..093989654 100644 --- a/src/multimedia/video/qvideotexturehelper.cpp +++ b/src/multimedia/video/qvideotexturehelper.cpp @@ -1,53 +1,17 @@ -/**************************************************************************** -** -** 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 "qabstractvideobuffer.h" #include "qvideotexturehelper_p.h" -#include "qvideoframe.h" -#include "qabstractvideobuffer_p.h" +#include "qvideoframeconverter_p.h" +#include "qvideoframe_p.h" #include <qpainter.h> #include <qloggingcategory.h> QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(qLcVideoTextureHelper, "qt.multimedia.video.texturehelper") - namespace QVideoTextureHelper { @@ -138,7 +102,7 @@ static const TextureDescription descriptions[QVideoFrameFormat::NPixelFormats] = }, // Format_YUV422P { 3, 1, - [](int stride, int height) { return stride * ((height * 3 / 2 + 1) & ~1); }, + [](int stride, int height) { return stride * height * 2; }, { QRhiTexture::R8, QRhiTexture::R8, QRhiTexture::R8 }, { { 1, 1 }, { 2, 1 }, { 2, 1 } } }, @@ -251,7 +215,7 @@ static const TextureDescription descriptions[QVideoFrameFormat::NPixelFormats] = { { 1, 1 }, { 1, 1 }, { 1, 1 } } }, // Format_YUV420P10 - { 3, 1, + { 3, 2, [](int stride, int height) { return stride * ((height * 3 / 2 + 1) & ~1); }, { QRhiTexture::R16, QRhiTexture::R16, QRhiTexture::R16 }, { { 1, 1 }, { 2, 2 }, { 2, 2 } } @@ -408,6 +372,8 @@ QString fragmentShaderFileName(const QVideoFrameFormat &format, QRhiSwapChain::F // d = 1.42 // e = 1.772 // + +// clang-format off static QMatrix4x4 colorMatrix(const QVideoFrameFormat &format) { auto colorSpace = format.colorSpace(); @@ -421,86 +387,60 @@ static QMatrix4x4 colorMatrix(const QVideoFrameFormat &format) } switch (colorSpace) { case QVideoFrameFormat::ColorSpace_AdobeRgb: - return QMatrix4x4( + return { 1.0f, 0.000f, 1.402f, -0.701f, 1.0f, -0.344f, -0.714f, 0.529f, 1.0f, 1.772f, 0.000f, -0.886f, - 0.0f, 0.000f, 0.000f, 1.0000f); + 0.0f, 0.000f, 0.000f, 1.000f + }; default: case QVideoFrameFormat::ColorSpace_BT709: if (format.colorRange() == QVideoFrameFormat::ColorRange_Full) - return QMatrix4x4( - 1.f, 0.000f, 1.5748f, -0.8774f, - 1.f, -0.187324f, -0.468124f, 0.327724f, - 1.f, 1.8556f, 0.000f, -0.9278f, - 0.0f, 0.000f, 0.000f, 1.0000f); - return QMatrix4x4( - 1.1644f, 0.000f, 1.7928f, -0.9731f, - 1.1644f, -0.5329f, -0.2132f, 0.3015f, - 1.1644f, 2.1124f, 0.000f, -1.1335f, - 0.0f, 0.000f, 0.000f, 1.0000f); + return { + 1.0f, 0.0f, 1.5748f, -0.790488f, + 1.0f, -0.187324f, -0.468124f, 0.329010f, + 1.0f, 1.855600f, 0.0f, -0.931439f, + 0.0f, 0.0f, 0.0f, 1.0f + }; + return { + 1.1644f, 0.0000f, 1.7927f, -0.9729f, + 1.1644f, -0.2132f, -0.5329f, 0.3015f, + 1.1644f, 2.1124f, 0.0000f, -1.1334f, + 0.0000f, 0.0000f, 0.0000f, 1.0000f + }; case QVideoFrameFormat::ColorSpace_BT2020: if (format.colorRange() == QVideoFrameFormat::ColorRange_Full) - return QMatrix4x4( - 1.f, 0.000f, 1.4746f, -0.7373f, - 1.f, -0.2801f, -0.91666f, 0.5984f, - 1.f, 1.8814f, 0.000f, -0.9407f, - 0.0f, 0.000f, 0.000f, 1.0000f); - return QMatrix4x4( - 1.1644f, 0.000f, 1.6787f, -0.9158f, - 1.1644f, -0.1874f, -0.6511f, 0.3478f, - 1.1644f, 2.1418f, 0.000f, -1.1483f, - 0.0f, 0.000f, 0.000f, 1.0000f); + return { + 1.f, 0.0000f, 1.4746f, -0.7402f, + 1.f, -0.1646f, -0.5714f, 0.3694f, + 1.f, 1.8814f, 0.000f, -0.9445f, + 0.0f, 0.0000f, 0.000f, 1.0000f + }; + return { + 1.1644f, 0.000f, 1.6787f, -0.9157f, + 1.1644f, -0.1874f, -0.6504f, 0.3475f, + 1.1644f, 2.1418f, 0.0000f, -1.1483f, + 0.0000f, 0.0000f, 0.0000f, 1.0000f + }; case QVideoFrameFormat::ColorSpace_BT601: // Corresponds to the primaries used by NTSC BT601. For PAL BT601, we use the BT709 conversion // as those are very close. if (format.colorRange() == QVideoFrameFormat::ColorRange_Full) - return QMatrix4x4( - 1.f, 0.000f, 1.772f, -0.886f, + return { + 1.f, 0.000f, 1.772f, -0.886f, 1.f, -0.1646f, -0.57135f, 0.36795f, - 1.f, 1.42f, 0.000f, -0.71f, - 0.0f, 0.000f, 0.000f, 1.0000f); - return QMatrix4x4( + 1.f, 1.42f, 0.000f, -0.71f, + 0.0f, 0.000f, 0.000f, 1.0000f + }; + return { 1.164f, 0.000f, 1.596f, -0.8708f, 1.164f, -0.392f, -0.813f, 0.5296f, - 1.164f, 2.017f, 0.000f, -1.081f, - 0.0f, 0.000f, 0.000f, 1.0000f); + 1.164f, 2.017f, 0.000f, -1.0810f, + 0.000f, 0.000f, 0.000f, 1.0000f + }; } } - -#if 0 -static QMatrix4x4 yuvColorCorrectionMatrix(float brightness, float contrast, float hue, float saturation) -{ - // Color correction in YUV space is done as follows: - - // The formulas assumes values in range 0-255, and a blackpoint of Y=16, whitepoint of Y=235 - // - // Bightness: b - // Contrast: c - // Hue: h - // Saturation: s - // - // Y' = (Y - 16)*c + b + 16 - // U' = ((U - 128)*cos(h) + (V - 128)*sin(h))*c*s + 128 - // V' = ((V - 128)*cos(h) - (U - 128)*sin(h))*c*s + 128 - // - // For normalized YUV values (0-1 range) as we have them in the pixel shader, this translates to: - // - // Y' = (Y - .0625)*c + b + .0625 - // U' = ((U - .5)*cos(h) + (V - .5)*sin(h))*c*s + .5 - // V' = ((V - .5)*cos(h) - (U - .5)*sin(h))*c*s + .5 - // - // The values need to be clamped to 0-1 after the correction and before converting to RGB - // The transformation can be encoded in a 4x4 matrix assuming we have an A component of 1 - - float chcs = cos(hue)*contrast*saturation; - float shcs = sin(hue)*contrast*saturation; - return QMatrix4x4(contrast, 0, 0, .0625*(1 - contrast) + brightness, - 0, chcs, shcs, .5*(1 - chcs - shcs), - 0, -shcs, chcs, .5*(1 + shcs - chcs), - 0, 0, 0, 1); -} -#endif +// clang-format on // PQ transfer function, see also https://en.wikipedia.org/wiki/Perceptual_quantizer // or https://ieeexplore.ieee.org/document/7291452 @@ -582,7 +522,8 @@ void updateUniformData(QByteArray *dst, const QVideoFrameFormat &format, const Q break; case QVideoFrameFormat::Format_SamplerExternalOES: // get Android specific transform for the externalsampler texture - cmat = frame.videoBuffer()->externalTextureMatrix(); + if (auto hwBuffer = QVideoFramePrivate::hwBuffer(frame)) + cmat = hwBuffer->externalTextureMatrix(); break; case QVideoFrameFormat::Format_SamplerRect: { @@ -623,12 +564,17 @@ void updateUniformData(QByteArray *dst, const QVideoFrameFormat &format, const Q ud->maxLum = fromLinear(float(maxNits)/100.f); } -static bool updateTextureWithMap(QVideoFrame frame, QRhi *rhi, QRhiResourceUpdateBatch *rub, int plane, std::unique_ptr<QRhiTexture> &tex) +enum class UpdateTextureWithMapResult : uint8_t { + Failed, + UpdatedWithDataCopy, + UpdatedWithDataReference +}; + +static UpdateTextureWithMapResult updateTextureWithMap(const QVideoFrame &frame, QRhi *rhi, + QRhiResourceUpdateBatch *rub, int plane, + std::unique_ptr<QRhiTexture> &tex) { - if (!frame.map(QVideoFrame::ReadOnly)) { - qWarning() << "could not map data of QVideoFrame for upload"; - return false; - } + Q_ASSERT(frame.isMapped()); QVideoFrameFormat fmt = frame.surfaceFormat(); QVideoFrameFormat::PixelFormat pixelFormat = fmt.pixelFormat(); @@ -642,7 +588,7 @@ static bool updateTextureWithMap(QVideoFrame frame, QRhi *rhi, QRhiResourceUpdat tex.reset(rhi->newTexture(texDesc.textureFormat[plane], planeSize, 1, {})); if (!tex) { qWarning("Failed to create new texture (size %dx%d)", planeSize.width(), planeSize.height()); - return false; + return UpdateTextureWithMapResult::Failed; } } @@ -651,31 +597,44 @@ static bool updateTextureWithMap(QVideoFrame frame, QRhi *rhi, QRhiResourceUpdat tex->setPixelSize(planeSize); if (!tex->create()) { qWarning("Failed to create texture (size %dx%d)", planeSize.width(), planeSize.height()); - return false; + return UpdateTextureWithMapResult::Failed; } } + auto result = UpdateTextureWithMapResult::UpdatedWithDataCopy; + QRhiTextureSubresourceUploadDescription subresDesc; - QImage image; + if (pixelFormat == QVideoFrameFormat::Format_Jpeg) { + Q_ASSERT(plane == 0); + + QImage image; + + // calling QVideoFrame::toImage is not accurate. To be fixed. image = frame.toImage(); image.convertTo(QImage::Format_ARGB32); - subresDesc.setData(QByteArray((const char *)image.bits(), image.bytesPerLine()*image.height())); - subresDesc.setDataStride(image.bytesPerLine()); + subresDesc.setImage(image); + } else { - subresDesc.setData(QByteArray::fromRawData((const char *)frame.bits(plane), frame.mappedBytes(plane))); + // Note, QByteArray::fromRawData creare QByteArray as a view without data copying + subresDesc.setData(QByteArray::fromRawData( + reinterpret_cast<const char *>(frame.bits(plane)), frame.mappedBytes(plane))); subresDesc.setDataStride(frame.bytesPerLine(plane)); + result = UpdateTextureWithMapResult::UpdatedWithDataReference; } QRhiTextureUploadEntry entry(0, 0, subresDesc); QRhiTextureUploadDescription desc({ entry }); rub->uploadTexture(tex.get(), desc); - return true; + return result; } -static bool updateTextureWithHandle(QVideoFrame frame, QRhi *rhi, int plane, std::unique_ptr<QRhiTexture> &tex) +static std::unique_ptr<QRhiTexture> createTextureFromHandle(const QVideoFrame &frame, QRhi *rhi, int plane) { + QHwVideoBuffer *hwBuffer = QVideoFramePrivate::hwBuffer(frame); + Q_ASSERT(hwBuffer); + QVideoFrameFormat fmt = frame.surfaceFormat(); QVideoFrameFormat::PixelFormat pixelFormat = fmt.pixelFormat(); QSize size = fmt.frameSize(); @@ -697,38 +656,104 @@ static bool updateTextureWithHandle(QVideoFrame frame, QRhi *rhi, int plane, std #endif } - if (quint64 handle = frame.textureHandle(plane); handle) { - tex.reset(rhi->newTexture(texDesc.textureFormat[plane], planeSize, 1, textureFlags)); - if (!tex->createFrom({handle, 0})) { - qWarning("Failed to initialize QRhiTexture wrapper for native texture object %llu",handle); - return false; - } - } else { - qCDebug(qLcVideoTextureHelper) << "Incorrect texture handle from QVideoFrame, trying to map and upload texture"; - return false; + if (quint64 handle = hwBuffer->textureHandle(rhi, plane); handle) { + std::unique_ptr<QRhiTexture> tex(rhi->newTexture(texDesc.textureFormat[plane], planeSize, 1, textureFlags)); + if (tex->createFrom({handle, 0})) + return tex; + + qWarning("Failed to initialize QRhiTexture wrapper for native texture object %llu",handle); } - return true; + return {}; } -void updateRhiTexture(QVideoFrame frame, QRhi *rhi, QRhiResourceUpdateBatch *rub, int plane, std::unique_ptr<QRhiTexture> &tex) +class QVideoFrameTexturesArray : public QVideoFrameTextures +{ +public: + using TextureArray = std::array<std::unique_ptr<QRhiTexture>, TextureDescription::maxPlanes>; + QVideoFrameTexturesArray(TextureArray &&textures, QVideoFrame mappedFrame = {}) + : m_textures(std::move(textures)), m_mappedFrame(std::move(mappedFrame)) + { + Q_ASSERT(!m_mappedFrame.isValid() || m_mappedFrame.isReadable()); + } + + // We keep the source frame mapped during the target texture lifetime. + // Alternatively, we may use setting a custom image to QRhiTextureSubresourceUploadDescription, + // unsig videoFramePlaneAsImage, however, the OpenGL rendering pipeline in QRhi + // may keep QImage, and consequently the mapped QVideoFrame, + // even after the target texture is deleted: QTBUG-123174. + ~QVideoFrameTexturesArray() { m_mappedFrame.unmap(); } + + QRhiTexture *texture(uint plane) const override + { + return plane < std::size(m_textures) ? m_textures[plane].get() : nullptr; + } + + TextureArray takeTextures() { return std::move(m_textures); } + +private: + TextureArray m_textures; + QVideoFrame m_mappedFrame; +}; + +static std::unique_ptr<QVideoFrameTextures> createTexturesFromHandles(const QVideoFrame &frame, QRhi *rhi) { const TextureDescription &texDesc = descriptions[frame.surfaceFormat().pixelFormat()]; - if (plane >= texDesc.nplanes) { - tex.reset(); - return; + bool ok = true; + QVideoFrameTexturesArray::TextureArray textures; + for (quint8 plane = 0; plane < texDesc.nplanes; ++plane) { + textures[plane] = QVideoTextureHelper::createTextureFromHandle(frame, rhi, plane); + ok &= bool(textures[plane]); } + if (ok) + return std::make_unique<QVideoFrameTexturesArray>(std::move(textures)); + else + return {}; +} - if (frame.handleType() == QVideoFrame::RhiTextureHandle) { - if (std::unique_ptr<QRhiTexture> ftex = frame.rhiTexture(plane); ftex) { - tex = std::move(ftex); - return; - } +static std::unique_ptr<QVideoFrameTextures> createTexturesFromMemory(QVideoFrame frame, QRhi *rhi, QRhiResourceUpdateBatch *rub, QVideoFrameTextures *old) +{ + const TextureDescription &texDesc = descriptions[frame.surfaceFormat().pixelFormat()]; + QVideoFrameTexturesArray::TextureArray textures; + auto oldArray = dynamic_cast<QVideoFrameTexturesArray *>(old); + if (oldArray) + textures = oldArray->takeTextures(); + + if (!frame.map(QtVideo::MapMode::ReadOnly)) { + qWarning() << "Cannot map a video frame in ReadOnly mode!"; + return {}; + } + + auto unmapFrameGuard = qScopeGuard([&frame] { frame.unmap(); }); + + bool shouldKeepMapping = false; + for (quint8 plane = 0; plane < texDesc.nplanes; ++plane) { + const auto result = updateTextureWithMap(frame, rhi, rub, plane, textures[plane]); + if (result == UpdateTextureWithMapResult::Failed) + return {}; + + if (result == UpdateTextureWithMapResult::UpdatedWithDataReference) + shouldKeepMapping = true; + } + + // as QVideoFrame::unmap does nothing with null frames, we just move the frame to the result + return std::make_unique<QVideoFrameTexturesArray>( + std::move(textures), shouldKeepMapping ? std::move(frame) : QVideoFrame()); +} + +std::unique_ptr<QVideoFrameTextures> createTextures(QVideoFrame &frame, QRhi *rhi, QRhiResourceUpdateBatch *rub, std::unique_ptr<QVideoFrameTextures> &&oldTextures) +{ + if (!frame.isValid()) + return {}; + + if (QHwVideoBuffer *hwBuffer = QVideoFramePrivate::hwBuffer(frame)) { + if (auto textures = hwBuffer->mapTextures(rhi)) + return textures; - if (QVideoTextureHelper::updateTextureWithHandle(frame, rhi, plane, tex)) - return; + if (auto textures = createTexturesFromHandles(frame, rhi)) + return textures; } - QVideoTextureHelper::updateTextureWithMap(frame, rhi, rub, plane, tex); + return createTexturesFromMemory(frame, rhi, rub, oldTextures.get()); } bool SubtitleLayout::update(const QSize &frameSize, QString text) diff --git a/src/multimedia/video/qvideotexturehelper_p.h b/src/multimedia/video/qvideotexturehelper_p.h index 8ec49c77c..982c1b48a 100644 --- a/src/multimedia/video/qvideotexturehelper_p.h +++ b/src/multimedia/video/qvideotexturehelper_p.h @@ -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 #ifndef QVIDEOTEXTUREHELPER_H #define QVIDEOTEXTUREHELPER_H @@ -52,7 +16,7 @@ // #include <qvideoframeformat.h> -#include <private/qrhi_p.h> +#include <rhi/qrhi.h> #include <QtGui/qtextlayout.h> @@ -60,6 +24,7 @@ QT_BEGIN_NAMESPACE class QVideoFrame; class QTextLayout; +class QVideoFrameTextures; namespace QVideoTextureHelper { @@ -99,7 +64,7 @@ Q_MULTIMEDIA_EXPORT QString vertexShaderFileName(const QVideoFrameFormat &format Q_MULTIMEDIA_EXPORT QString fragmentShaderFileName(const QVideoFrameFormat &format, QRhiSwapChain::Format surfaceFormat = QRhiSwapChain::SDR); Q_MULTIMEDIA_EXPORT void updateUniformData(QByteArray *dst, const QVideoFrameFormat &format, const QVideoFrame &frame, const QMatrix4x4 &transform, float opacity, float maxNits = 100); -Q_MULTIMEDIA_EXPORT void updateRhiTexture(QVideoFrame frame, QRhi *rhi, QRhiResourceUpdateBatch *rub, int plane, std::unique_ptr<QRhiTexture> &tex); +Q_MULTIMEDIA_EXPORT std::unique_ptr<QVideoFrameTextures> createTextures(QVideoFrame &frame, QRhi *rhi, QRhiResourceUpdateBatch *rub, std::unique_ptr<QVideoFrameTextures> &&oldTextures); struct UniformData { float transformMatrix[4][4]; diff --git a/src/multimedia/video/qvideowindow.cpp b/src/multimedia/video/qvideowindow.cpp index 2741313b4..9b88a86df 100644 --- a/src/multimedia/video/qvideowindow.cpp +++ b/src/multimedia/video/qvideowindow.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 "qvideowindow_p.h" #include <QPlatformSurfaceEvent> @@ -43,6 +7,9 @@ #include <qpainter.h> #include <private/qguiapplication_p.h> #include <private/qmemoryvideobuffer_p.h> +#include <private/qhwvideobuffer_p.h> +#include <private/qmultimediautils_p.h> +#include <private/qvideoframe_p.h> #include <qpa/qplatformintegration.h> QT_BEGIN_NAMESPACE @@ -109,7 +76,7 @@ QVideoWindowPrivate::~QVideoWindowPrivate() q, &QVideoWindow::setVideoFrame); } -static const float g_quad[] = { +static const float g_vw_quad[] = { // 4 clockwise rotation of texture vertexes (the second pair) // Rotation 0 -1.f, -1.f, 0.f, 0.f, @@ -134,7 +101,7 @@ static const float g_quad[] = { 1.f, 1.f, 0.f, 1.f }; -static QShader getShader(const QString &name) +static QShader vwGetShader(const QString &name) { QFile f(name); if (f.open(QIODevice::ReadOnly)) @@ -188,13 +155,11 @@ void QVideoWindowPrivate::initRhi() return; m_swapChain.reset(m_rhi->newSwapChain()); - if (m_swapChain->isFormatSupported(QRhiSwapChain::HDRExtendedSrgbLinear)) - m_swapChain->setFormat(QRhiSwapChain::HDRExtendedSrgbLinear); m_swapChain->setWindow(q); m_renderPass.reset(m_swapChain->newCompatibleRenderPassDescriptor()); m_swapChain->setRenderPassDescriptor(m_renderPass.get()); - m_vertexBuf.reset(m_rhi->newBuffer(QRhiBuffer::Immutable, QRhiBuffer::VertexBuffer, sizeof(g_quad))); + m_vertexBuf.reset(m_rhi->newBuffer(QRhiBuffer::Immutable, QRhiBuffer::VertexBuffer, sizeof(g_vw_quad))); m_vertexBuf->create(); m_vertexBufReady = false; @@ -218,9 +183,9 @@ void QVideoWindowPrivate::setupGraphicsPipeline(QRhiGraphicsPipeline *pipeline, { pipeline->setTopology(QRhiGraphicsPipeline::TriangleStrip); - QShader vs = getShader(QVideoTextureHelper::vertexShaderFileName(fmt)); + QShader vs = vwGetShader(QVideoTextureHelper::vertexShaderFileName(fmt)); Q_ASSERT(vs.isValid()); - QShader fs = getShader(QVideoTextureHelper::fragmentShaderFileName(fmt, m_swapChain->format())); + QShader fs = vwGetShader(QVideoTextureHelper::fragmentShaderFileName(fmt, m_swapChain->format())); Q_ASSERT(fs.isValid()); pipeline->setShaderStages({ { QRhiShaderStage::Vertex, vs }, @@ -246,11 +211,13 @@ void QVideoWindowPrivate::updateTextures(QRhiResourceUpdateBatch *rub) // We render a 1x1 black pixel when we don't have a video if (!m_currentFrame.isValid()) - m_currentFrame = QVideoFrame(new QMemoryVideoBuffer(QByteArray{4, 0}, 4), - QVideoFrameFormat(QSize(1,1), QVideoFrameFormat::Format_RGBA8888)); + m_currentFrame = QVideoFramePrivate::createFrame( + std::make_unique<QMemoryVideoBuffer>(QByteArray{ 4, 0 }, 4), + QVideoFrameFormat(QSize(1, 1), QVideoFrameFormat::Format_RGBA8888)); - for (int i = 0; i < QVideoTextureHelper::TextureDescription::maxPlanes; ++i) - QVideoTextureHelper::updateRhiTexture(m_currentFrame, m_rhi.get(), rub, i, m_frameTextures[i]); + m_frameTextures = QVideoTextureHelper::createTextures(m_currentFrame, m_rhi.get(), rub, std::move(m_frameTextures)); + if (!m_frameTextures) + return; QRhiShaderResourceBinding bindings[4]; auto *b = bindings; @@ -262,7 +229,7 @@ void QVideoWindowPrivate::updateTextures(QRhiResourceUpdateBatch *rub) for (int i = 0; i < textureDesc->nplanes; ++i) (*b++) = QRhiShaderResourceBinding::sampledTexture(i + 1, QRhiShaderResourceBinding::FragmentStage, - m_frameTextures[i].get(), m_textureSampler.get()); + m_frameTextures->texture(i), m_textureSampler.get()); m_shaderResourceBindings->setBindings(bindings, b); m_shaderResourceBindings->create(); @@ -367,7 +334,7 @@ void QVideoWindowPrivate::render() return; } - int frameRotationIndex = (m_currentFrame.rotationAngle() / 90) % 4; + const int frameRotationIndex = (static_cast<int>(m_currentFrame.rotation()) / 90) % 4; QSize frameSize = m_currentFrame.size(); if (frameRotationIndex % 2) frameSize.transpose(); @@ -376,9 +343,17 @@ void QVideoWindowPrivate::render() videoRect.moveCenter(rect.center()); QRect subtitleRect = videoRect.intersected(rect); - if (m_swapChain->currentPixelSize() != m_swapChain->surfacePixelSize()) + if (!m_hasSwapChain || (m_swapChain->currentPixelSize() != m_swapChain->surfacePixelSize())) resizeSwapChain(); + const auto requiredSwapChainFormat = + qGetRequiredSwapChainFormat(m_currentFrame.surfaceFormat()); + if (qShouldUpdateSwapChainFormat(m_swapChain.get(), requiredSwapChainFormat)) { + releaseSwapChain(); + m_swapChain->setFormat(requiredSwapChainFormat); + resizeSwapChain(); + } + if (!m_hasSwapChain) return; @@ -403,7 +378,7 @@ void QVideoWindowPrivate::render() if (!m_vertexBufReady) { m_vertexBufReady = true; - rub->uploadStaticBuffer(m_vertexBuf.get(), g_quad); + rub->uploadStaticBuffer(m_vertexBuf.get(), g_vw_quad); } if (m_texturesDirty) @@ -522,7 +497,7 @@ bool QVideoWindow::event(QEvent *e) case QEvent::Expose: d->isExposed = isExposed(); if (d->isExposed) - requestUpdate(); + d->render(); return true; default: @@ -552,3 +527,5 @@ void QVideoWindow::setVideoFrame(const QVideoFrame &frame) } QT_END_NAMESPACE + +#include "moc_qvideowindow_p.cpp" diff --git a/src/multimedia/video/qvideowindow_p.h b/src/multimedia/video/qvideowindow_p.h index 68a47062b..3305d3b40 100644 --- a/src/multimedia/video/qvideowindow_p.h +++ b/src/multimedia/video/qvideowindow_p.h @@ -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 #ifndef QVIDEOWINDOW_P_H #define QVIDEOWINDOW_P_H @@ -52,23 +16,9 @@ // #include <QWindow> -#include <qtextlayout.h> - -#include <QtGui/private/qrhinull_p.h> -#if QT_CONFIG(opengl) -#include <QtGui/private/qrhigles2_p.h> #include <QOffscreenSurface> -#endif -#if QT_CONFIG(vulkan) -#include <QtGui/private/qrhivulkan_p.h> -#endif -#ifdef Q_OS_WIN -#include <QtGui/private/qrhid3d11_p.h> -#endif -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) -#include <QtGui/private/qrhimetal_p.h> -#endif - +#include <qtextlayout.h> +#include <rhi/qrhi.h> #include <qvideoframe.h> #include <private/qplatformvideosink_p.h> #include <private/qvideotexturehelper_p.h> @@ -114,7 +64,7 @@ public: std::unique_ptr<QRhiBuffer> m_vertexBuf; bool m_vertexBufReady = false; std::unique_ptr<QRhiBuffer> m_uniformBuf; - std::unique_ptr<QRhiTexture> m_frameTextures[3]; + std::unique_ptr<QVideoFrameTextures> m_frameTextures; std::unique_ptr<QRhiSampler> m_textureSampler; std::unique_ptr<QRhiShaderResourceBindings> m_shaderResourceBindings; std::unique_ptr<QRhiGraphicsPipeline> m_graphicsPipeline; diff --git a/src/multimedia/wasm/qwasmaudiodevice.cpp b/src/multimedia/wasm/qwasmaudiodevice.cpp index 5eb6a3816..c87a0ad54 100644 --- a/src/multimedia/wasm/qwasmaudiodevice.cpp +++ b/src/multimedia/wasm/qwasmaudiodevice.cpp @@ -1,44 +1,11 @@ -/**************************************************************************** -** -** 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 "qwasmaudiodevice_p.h" #include <emscripten.h> +#include <emscripten/val.h> +#include <emscripten/bind.h> + #include <AL/al.h> #include <AL/alc.h> @@ -48,12 +15,12 @@ QWasmAudioDevice::QWasmAudioDevice(const char *device, const char *desc, bool is : QAudioDevicePrivate(device, mode) { description = QString::fromUtf8(desc); - isDefault = isDef; + isDefault = isDef; minimumChannelCount = 1; maximumChannelCount = 2; - minimumSampleRate = 1; - maximumSampleRate = 192'000; + minimumSampleRate = 8000; + maximumSampleRate = 96000; // js AudioContext max according to docs // native openAL formats supportedSampleFormats.append(QAudioFormat::UInt8); @@ -65,13 +32,19 @@ QWasmAudioDevice::QWasmAudioDevice(const char *device, const char *desc, bool is preferredFormat.setChannelCount(2); - preferredFormat.setSampleRate(EM_ASM_INT({ - var AudioContext = window.AudioContext || window.webkitAudioContext; - var ctx = new AudioContext(); - var sr = ctx.sampleRate; - ctx.close(); - return sr; - })); + // FIXME: firefox + // An AudioContext was prevented from starting automatically. + // It must be created or resumed after a user gesture on the page. + emscripten::val audioContext = emscripten::val::global("window")["AudioContext"].new_(); + if (audioContext == emscripten::val::undefined()) + audioContext = emscripten::val::global("window")["webkitAudioContext"].new_(); + + if (audioContext != emscripten::val::undefined()) { + audioContext.call<void>("resume"); + int sRate = audioContext["sampleRate"].as<int>(); + audioContext.call<void>("close"); + preferredFormat.setSampleRate(sRate); + } auto f = QAudioFormat::Float; diff --git a/src/multimedia/wasm/qwasmaudiodevice_p.h b/src/multimedia/wasm/qwasmaudiodevice_p.h index 1b8bc7571..cc86c1575 100644 --- a/src/multimedia/wasm/qwasmaudiodevice_p.h +++ b/src/multimedia/wasm/qwasmaudiodevice_p.h @@ -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 #ifndef QWASMAUDIODEVICEINFO_H #define QWASMAUDIODEVICEINFO_H diff --git a/src/multimedia/wasm/qwasmaudiosink.cpp b/src/multimedia/wasm/qwasmaudiosink.cpp index 82456e0b6..d1068e744 100644 --- a/src/multimedia/wasm/qwasmaudiosink.cpp +++ b/src/multimedia/wasm/qwasmaudiosink.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 "qwasmaudiosink_p.h" @@ -77,11 +41,14 @@ protected: qint64 writeData(const char *data, qint64 len) override; }; -QWasmAudioSink::QWasmAudioSink(const QByteArray &device) : m_name(device) +QWasmAudioSink::QWasmAudioSink(const QByteArray &device, QObject *parent) + : QPlatformAudioSink(parent), + m_name(device), + m_timer(new QTimer(this)) { - m_timer.setSingleShot(false); + m_timer->setSingleShot(false); aldata = new ALData(); - connect(&m_timer, &QTimer::timeout, this, [this](){ + connect(m_timer, &QTimer::timeout, this, [this](){ if (m_pullMode) nextALBuffers(); else { @@ -177,7 +144,6 @@ void QWasmAudioSink::start(bool mode) } alcMakeContextCurrent(aldata->context); - alGenSources(1, &aldata->source); if (m_bufferSize > 0) @@ -192,8 +158,8 @@ void QWasmAudioSink::start(bool mode) alSourcef(aldata->source, AL_GAIN, m_volume); if (m_pullMode) loadALBuffers(); - m_timer.setInterval(DEFAULT_BUFFER_DURATION / 3000); - m_timer.start(); + m_timer->setInterval(DEFAULT_BUFFER_DURATION / 3000); + m_timer->start(); if (m_pullMode) alSourcePlay(aldata->source); m_running = true; @@ -208,7 +174,7 @@ void QWasmAudioSink::stop() m_elapsedTimer.invalidate(); alSourceStop(aldata->source); alSourceRewind(aldata->source); - m_timer.stop(); + m_timer->stop(); m_bufferFragmentsBusyCount = 0; alDeleteSources(1, &aldata->source); alDeleteBuffers(m_bufferFragmentsCount, aldata->buffers); @@ -234,6 +200,7 @@ void QWasmAudioSink::suspend() if (!m_running) return; + m_suspendedInState = m_state; alSourcePause(aldata->source); } @@ -245,15 +212,15 @@ void QWasmAudioSink::resume() alSourcePlay(aldata->source); } -int QWasmAudioSink::bytesFree() const +qsizetype QWasmAudioSink::bytesFree() const { int processed; alGetSourcei(aldata->source, AL_BUFFERS_PROCESSED, &processed); return m_running ? m_bufferFragmentSize * (m_bufferFragmentsCount - m_bufferFragmentsBusyCount - + processed) : 0; + + (qsizetype)processed) : 0; } -void QWasmAudioSink::setBufferSize(int value) +void QWasmAudioSink::setBufferSize(qsizetype value) { if (m_running) return; @@ -261,7 +228,7 @@ void QWasmAudioSink::setBufferSize(int value) m_bufferSize = value; } -int QWasmAudioSink::bufferSize() const +qsizetype QWasmAudioSink::bufferSize() const { return m_bufferSize; } @@ -334,8 +301,12 @@ void QWasmAudioSink::loadALBuffers() if (m_bufferFragmentsBusyCount == m_bufferFragmentsCount) return; + if (m_device->bytesAvailable() == 0) { + return; + } + auto size = m_device->read(m_tmpData + m_tmpDataOffset, m_bufferFragmentSize - - m_tmpDataOffset); + m_tmpDataOffset); m_tmpDataOffset += size; if (!m_tmpDataOffset || (m_tmpDataOffset != m_bufferFragmentSize && m_bufferFragmentsBusyCount >= m_bufferFragmentsCount * 2 / 3)) @@ -393,7 +364,7 @@ void QWasmAudioSink::nextALBuffers() loadALBuffers(); ALint state; alGetSourcei(aldata->source, AL_SOURCE_STATE, &state); - if (state != AL_PLAYING) + if (state != AL_PLAYING && m_error == QAudio::NoError) alSourcePlay(aldata->source); updateState(); } @@ -405,7 +376,7 @@ void QWasmAudioSink::updateState() return; m_state = current; - if (m_state == QAudio::IdleState && m_running) + if (m_state == QAudio::IdleState && m_running && m_device->bytesAvailable() == 0) setError(QAudio::UnderrunError); emit stateChanged(m_state); @@ -417,10 +388,16 @@ void QWasmAudioSink::setError(QAudio::Error error) if (error == m_error) return; m_error = error; + if (error != QAudio::NoError) { + m_timer->stop(); + alSourceRewind(aldata->source); + } + emit errorChanged(error); } -QWasmAudioSinkDevice::QWasmAudioSinkDevice(QWasmAudioSink *parent) : QIODevice(parent), +QWasmAudioSinkDevice::QWasmAudioSinkDevice(QWasmAudioSink *parent) + : QIODevice(parent), m_out(parent) { } diff --git a/src/multimedia/wasm/qwasmaudiosink_p.h b/src/multimedia/wasm/qwasmaudiosink_p.h index 1c75ec258..975b7f6cc 100644 --- a/src/multimedia/wasm/qwasmaudiosink_p.h +++ b/src/multimedia/wasm/qwasmaudiosink_p.h @@ -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 #ifndef QWASMAUDIOSINK_H #define QWASMAUDIOSINK_H @@ -66,12 +30,13 @@ class QWasmAudioSink : public QPlatformAudioSink QByteArray m_name; ALData *aldata = nullptr; - QTimer m_timer; + QTimer *m_timer = nullptr; QIODevice *m_device = nullptr; QAudioFormat m_format; QAudio::Error m_error = QAudio::NoError; bool m_running = false; QAudio::State m_state = QAudio::StoppedState; + QAudio::State m_suspendedInState = QAudio::SuspendedState; int m_bufferSize = 0; quint64 m_processed = 0; QElapsedTimer m_elapsedTimer; @@ -94,7 +59,7 @@ private slots: void setError(QAudio::Error); public: - QWasmAudioSink(const QByteArray &device); + QWasmAudioSink(const QByteArray &device, QObject *parent); ~QWasmAudioSink(); public: @@ -105,9 +70,9 @@ public: void reset() override; void suspend() override; void resume() override; - int bytesFree() const override; - void setBufferSize(int value) override; - int bufferSize() const override; + qsizetype bytesFree() const override; + void setBufferSize(qsizetype value) override; + qsizetype bufferSize() const override; qint64 processedUSecs() const override; QAudio::Error error() const override; QAudio::State state() const override; diff --git a/src/multimedia/wasm/qwasmaudiosource.cpp b/src/multimedia/wasm/qwasmaudiosource.cpp index 981eeefc0..81f222c4b 100644 --- a/src/multimedia/wasm/qwasmaudiosource.cpp +++ b/src/multimedia/wasm/qwasmaudiosource.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 "qwasmaudiosource_p.h" @@ -100,18 +64,21 @@ void QWasmAudioSource::writeBuffer() m_device->write(m_tmpData,bytes); } -QWasmAudioSource::QWasmAudioSource(const QByteArray &device) - : QPlatformAudioSource(), m_name(device) +QWasmAudioSource::QWasmAudioSource(const QByteArray &device , QObject *parent) + : QPlatformAudioSource(parent), + m_name(device), + m_timer(new QTimer(this)) { - aldata = new ALData(); - connect(&m_timer, &QTimer::timeout, this, [this](){ - Q_ASSERT(m_running); - if (m_pullMode) - writeBuffer(); - else - if (bytesReady() > 0) + if (device.contains("Emscripten")) { + aldata = new ALData(); + connect(m_timer, &QTimer::timeout, this, [this](){ + Q_ASSERT(m_running); + if (m_pullMode) + writeBuffer(); + else if (bytesReady() > 0) emit m_device->readyRead(); - }); + }); + } } void QWasmAudioSource::start(QIODevice *device) @@ -182,8 +149,10 @@ void QWasmAudioSource::start(bool mode) m_tmpData = new char[m_bufferSize]; else m_tmpData = nullptr; - m_timer.setInterval(m_format.durationForBytes(m_bufferSize) / 3'000); + m_timer->setInterval(m_format.durationForBytes(m_bufferSize) / 3000); + m_timer->start(); + alcGetError(aldata->device); // clear error state aldata->device = alcCaptureOpenDevice(m_name.data(), m_format.sampleRate(), format, m_format.framesForBytes(m_bufferSize)); @@ -201,7 +170,6 @@ void QWasmAudioSource::start(bool mode) } m_processed = 0; m_running = true; - m_timer.start(); } void QWasmAudioSource::stop() @@ -217,7 +185,7 @@ void QWasmAudioSource::stop() } if (!m_pullMode) m_device->deleteLater(); - m_timer.stop(); + m_timer->stop(); m_running = false; } @@ -251,7 +219,7 @@ void QWasmAudioSource::resume() alcCaptureStart(aldata->device); } -int QWasmAudioSource::bytesReady() const +qsizetype QWasmAudioSource::bytesReady() const { if (!m_running) return 0; @@ -260,14 +228,14 @@ int QWasmAudioSource::bytesReady() const return m_format.bytesForFrames(samples); } -void QWasmAudioSource::setBufferSize(int value) +void QWasmAudioSource::setBufferSize(qsizetype value) { if (!m_running) return; m_bufferSize = value; } -int QWasmAudioSource::bufferSize() const +qsizetype QWasmAudioSource::bufferSize() const { return m_bufferSize; } diff --git a/src/multimedia/wasm/qwasmaudiosource_p.h b/src/multimedia/wasm/qwasmaudiosource_p.h index aef81d75b..97b4ec52a 100644 --- a/src/multimedia/wasm/qwasmaudiosource_p.h +++ b/src/multimedia/wasm/qwasmaudiosource_p.h @@ -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 #ifndef QWASMAUDIOSOURCE_H #define QWASMAUDIOSOURCE_H @@ -65,11 +29,11 @@ class QWasmAudioSource : public QPlatformAudioSource QByteArray m_name; ALData *aldata = nullptr; - QTimer m_timer; + QTimer *m_timer = nullptr; QIODevice *m_device = nullptr; QAudioFormat m_format; qreal m_volume = 1; - int m_bufferSize; + qsizetype m_bufferSize; bool m_running = false; bool m_suspended = false; QAudio::Error m_error; @@ -81,7 +45,7 @@ class QWasmAudioSource : public QPlatformAudioSource void writeBuffer(); public: - QWasmAudioSource(const QByteArray &device); + QWasmAudioSource(const QByteArray &device, QObject *parent); public: void start(QIODevice *device) override; @@ -91,9 +55,9 @@ public: void reset() override; void suspend() override; void resume() override; - int bytesReady() const override; - void setBufferSize(int value) override; - int bufferSize() const override; + qsizetype bytesReady() const override; + void setBufferSize(qsizetype value) override; + qsizetype bufferSize() const override; qint64 processedUSecs() const override; QAudio::Error error() const override; QAudio::State state() const override; diff --git a/src/multimedia/wasm/qwasmmediadevices.cpp b/src/multimedia/wasm/qwasmmediadevices.cpp index 825e19ba2..4e59fd161 100644 --- a/src/multimedia/wasm/qwasmmediadevices.cpp +++ b/src/multimedia/wasm/qwasmmediadevices.cpp @@ -1,92 +1,276 @@ -/**************************************************************************** -** -** 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 "qwasmmediadevices_p.h" #include "private/qcameradevice_p.h" - +#include "private/qplatformmediaintegration_p.h" #include "qwasmaudiosource_p.h" #include "qwasmaudiosink_p.h" #include "qwasmaudiodevice_p.h" #include <AL/al.h> #include <AL/alc.h> +#include <QMap> +#include <QDebug> + QT_BEGIN_NAMESPACE +Q_LOGGING_CATEGORY(qWasmMediaDevices, "qt.multimedia.wasm.mediadevices") + +QWasmCameraDevices::QWasmCameraDevices(QPlatformMediaIntegration *integration) + : QPlatformVideoDevices(integration) +{ + m_mediaDevices = QPlatformMediaIntegration::instance()->mediaDevices(); +} + +QList<QCameraDevice> QWasmCameraDevices::videoDevices() const +{ + QWasmMediaDevices *wasmMediaDevices = reinterpret_cast<QWasmMediaDevices *>(m_mediaDevices); + return wasmMediaDevices ? wasmMediaDevices->videoInputs() : QList<QCameraDevice>(); +} + QWasmMediaDevices::QWasmMediaDevices() - : QPlatformMediaDevices() { - auto capture = alcGetString(nullptr, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER); - // present even if there is no capture device - if (capture) - m_ins.append((new QWasmAudioDevice(capture, "WebAssembly audio capture device", true, - QAudioDevice::Input))->create()); + initDevices(); +} - auto playback = alcGetString(nullptr, ALC_DEFAULT_DEVICE_SPECIFIER); - // present even if there is no playback device - if (playback) - m_outs.append((new QWasmAudioDevice(playback, "WebAssembly audio playback device", true, - QAudioDevice::Output))->create()); +void QWasmMediaDevices::initDevices() +{ + if (m_initDone) + return; + + m_initDone = true; + getOpenALAudioDevices(); + getMediaDevices(); // asynchronous } QList<QAudioDevice> QWasmMediaDevices::audioInputs() const { - return m_ins; + return m_audioInputs.values(); } QList<QAudioDevice> QWasmMediaDevices::audioOutputs() const { - return m_outs; + return m_audioOutputs.values(); } QList<QCameraDevice> QWasmMediaDevices::videoInputs() const { - return {}; + return m_cameraDevices.values(); +} + +QPlatformAudioSource *QWasmMediaDevices::createAudioSource(const QAudioDevice &deviceInfo, + QObject *parent) +{ + return new QWasmAudioSource(deviceInfo.id(), parent); } -QPlatformAudioSource *QWasmMediaDevices::createAudioSource(const QAudioDevice &deviceInfo) +QPlatformAudioSink *QWasmMediaDevices::createAudioSink(const QAudioDevice &deviceInfo, + QObject *parent) { - return new QWasmAudioSource(deviceInfo.id()); + return new QWasmAudioSink(deviceInfo.id(), parent); } -QPlatformAudioSink *QWasmMediaDevices::createAudioSink(const QAudioDevice &deviceInfo) +void QWasmMediaDevices::parseDevices(emscripten::val devices) { - return new QWasmAudioSink(deviceInfo.id()); + if (devices.isNull() || devices.isUndefined()) { + qWarning() << "Something went wrong enumerating devices"; + return; + } + + QList<std::string> cameraDevicesToRemove = m_cameraDevices.keys(); + QList<std::string> audioOutputsToRemove; + QList<std::string> audioInputsToRemove; + + if (m_firstInit) { + m_firstInit = false; + qWarning() << "m_audioInputs count" << m_audioInputs.count(); + + } else { + audioOutputsToRemove = m_audioOutputs.keys(); + audioInputsToRemove = m_audioInputs.keys(); + m_audioInputsAdded = false; + m_audioOutputsAdded = false; + } + m_videoInputsAdded = false; + + bool m_videoInputsRemoved = false; + bool m_audioInputsRemoved = false; + bool m_audioOutputsRemoved = false; + + for (int i = 0; i < devices["length"].as<int>(); i++) { + + emscripten::val mediaDevice = devices[i]; + + std::string defaultDeviceLabel = ""; + + const std::string deviceKind = mediaDevice["kind"].as<std::string>(); + const std::string label = mediaDevice["label"].as<std::string>(); + const std::string deviceId = mediaDevice["deviceId"].as<std::string>(); + + qCDebug(qWasmMediaDevices) << QString::fromStdString(deviceKind) + << QString::fromStdString(deviceId) + << QString::fromStdString(label); + + if (deviceKind.empty()) + continue; + + if (deviceId == std::string("default")) { + // chrome specifies the default device with this as deviceId + // and then prepends "Default - " with the name of the device + // in the label + if (label.empty()) + continue; + + defaultDeviceLabel = label; + continue; + } + + const bool isDefault = false; // FIXME + // (defaultDeviceLabel.find(label) != std::string::npos); + + if (deviceKind == std::string("videoinput")) { + if (!m_cameraDevices.contains(deviceId)) { + QCameraDevicePrivate *camera = new QCameraDevicePrivate; // QSharedData + camera->id = QString::fromStdString(deviceId).toUtf8(); + camera->description = QString::fromUtf8(label.c_str()); + camera->isDefault = isDefault; + + m_cameraDevices.insert(deviceId, camera->create()); + m_videoInputsAdded = true; + } + cameraDevicesToRemove.removeOne(deviceId); + } else if (deviceKind == std::string("audioinput")) { + if (!m_audioInputs.contains(deviceId)) { + m_audioInputs.insert(deviceId, + (new QWasmAudioDevice(deviceId.c_str(), label.c_str(), + isDefault, QAudioDevice::Input)) + ->create()); + + m_audioInputsAdded = true; + } + audioInputsToRemove.removeOne(deviceId); + } else if (deviceKind == std::string("audiooutput")) { + if (!m_audioOutputs.contains(deviceId)) { + m_audioOutputs.insert(deviceId, + (new QWasmAudioDevice(deviceId.c_str(), label.c_str(), + isDefault, QAudioDevice::Input)) + ->create()); + + m_audioOutputsAdded = true; + } + audioOutputsToRemove.removeOne(deviceId); + } + // if permissions are given label will hold the actual + // camera name, such as "Live! Cam Sync 1080p (041e:409d)" + } + if (!m_firstInit) + getOpenALAudioDevices(); + + // any left here were removed + int j = 0; + for (; j < cameraDevicesToRemove.count(); j++) { + m_cameraDevices.remove(cameraDevicesToRemove.at(j)); + } + m_videoInputsRemoved = !cameraDevicesToRemove.isEmpty(); + + for (j = 0; j < audioInputsToRemove.count(); j++) { + m_audioInputs.remove(audioInputsToRemove.at(j)); + } + m_audioInputsRemoved = !audioInputsToRemove.isEmpty(); + + for (j = 0; j < audioOutputsToRemove.count(); j++) { + m_audioOutputs.remove(audioOutputsToRemove.at(j)); + } + m_audioOutputsRemoved = !audioOutputsToRemove.isEmpty(); + + if (m_videoInputsAdded || m_videoInputsRemoved) + emit videoInputsChanged(); + if (m_audioInputsAdded || m_audioInputsRemoved) + emit audioInputsChanged(); + if (m_audioOutputsAdded || m_audioOutputsRemoved) + emit audioOutputsChanged(); + + m_firstInit = false; + +} + +void QWasmMediaDevices::getMediaDevices() +{ + emscripten::val navigator = emscripten::val::global("navigator"); + m_jsMediaDevicesInterface = navigator["mediaDevices"]; + + if (m_jsMediaDevicesInterface.isNull() || m_jsMediaDevicesInterface.isUndefined()) { + qWarning() << "No media devices found"; + return; + } + + if (qstdweb::haveAsyncify()) { +#ifdef QT_HAVE_EMSCRIPTEN_ASYNCIFY + emscripten::val devicesList = m_jsMediaDevicesInterface.call<emscripten::val>("enumerateDevices").await(); + if (devicesList.isNull() || devicesList.isUndefined()) { + qWarning() << "devices list error"; + return; + } + + parseDevices(devicesList); +#endif + } else { + qstdweb::PromiseCallbacks enumerateDevicesCallback{ + .thenFunc = + [&](emscripten::val devices) { + parseDevices(devices); + }, + .catchFunc = + [this](emscripten::val error) { + qWarning() << "mediadevices enumerateDevices fail" + << QString::fromStdString(error["name"].as<std::string>()) + << QString::fromStdString(error["message"].as<std::string>()); + m_initDone = false; + } + }; + + qstdweb::Promise::make(m_jsMediaDevicesInterface, + QStringLiteral("enumerateDevices"), + std::move(enumerateDevicesCallback)); + + // setup devicechange monitor + m_deviceChangedCallback = std::make_unique<qstdweb::EventCallback>( + m_jsMediaDevicesInterface, "devicechange", + [this, enumerateDevicesCallback](emscripten::val) { + qstdweb::Promise::make(m_jsMediaDevicesInterface, + QStringLiteral("enumerateDevices"), + std::move(enumerateDevicesCallback)); + }); + } + +} + +void QWasmMediaDevices::getOpenALAudioDevices() +{ + // VM3959:4 The AudioContext was not allowed to start. + // It must be resumed (or created) after a user gesture on the page. https://goo.gl/7K7WLu + auto capture = alcGetString(nullptr, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER); + // present even if there is no capture device + if (capture && !m_audioOutputs.contains(capture)) { + m_audioInputs.insert(capture, + (new QWasmAudioDevice(capture, "WebAssembly audio capture device", + true, QAudioDevice::Input)) + ->create()); + m_audioInputsAdded = true; + emit audioInputsChanged(); + } + + auto playback = alcGetString(nullptr, ALC_DEFAULT_DEVICE_SPECIFIER); + // present even if there is no playback device + if (playback && !m_audioOutputs.contains(capture)) { + m_audioOutputs.insert(playback, + (new QWasmAudioDevice(playback, "WebAssembly audio playback device", + true, QAudioDevice::Output)) + ->create()); + emit audioOutputsChanged(); + } + m_firstInit = true; } QT_END_NAMESPACE diff --git a/src/multimedia/wasm/qwasmmediadevices_p.h b/src/multimedia/wasm/qwasmmediadevices_p.h index 63fa05476..b97036f97 100644 --- a/src/multimedia/wasm/qwasmmediadevices_p.h +++ b/src/multimedia/wasm/qwasmmediadevices_p.h @@ -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 #ifndef QWASMMEDIADEVICES_H #define QWASMMEDIADEVICES_H @@ -52,14 +16,38 @@ // #include <private/qplatformmediadevices_p.h> -#include <qset.h> + +#include <private/qplatformvideodevices_p.h> + +#include <QtCore/private/qstdweb_p.h> #include <qaudio.h> #include <qaudiodevice.h> +#include <qcameradevice.h> +#include <qset.h> +#include <QtCore/qloggingcategory.h> +#include <emscripten.h> +#include <emscripten/val.h> +#include <emscripten/bind.h> +#include <QMapIterator> QT_BEGIN_NAMESPACE +Q_DECLARE_LOGGING_CATEGORY(qWasmMediaDevices) + class QWasmAudioEngine; +class QWasmCameraDevices : public QPlatformVideoDevices +{ + Q_OBJECT +public: + QWasmCameraDevices(QPlatformMediaIntegration *integration); + + QList<QCameraDevice> videoDevices() const override; +private: + // weak + QPlatformMediaDevices *m_mediaDevices; +}; + class QWasmMediaDevices : public QPlatformMediaDevices { public: @@ -67,13 +55,33 @@ public: QList<QAudioDevice> audioInputs() const override; QList<QAudioDevice> audioOutputs() const override; - QList<QCameraDevice> videoInputs() const override; - QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo) override; - QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo) override; + QList<QCameraDevice> videoInputs() const; + + QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo, + QObject *parent) override; + QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo, + QObject *parent) override; + void initDevices(); private: - QList<QAudioDevice> m_outs; - QList<QAudioDevice> m_ins; + void updateCameraDevices(); + void getMediaDevices(); + void getOpenALAudioDevices(); + void parseDevices(emscripten::val devices); + + QMap <std::string, QAudioDevice> m_audioOutputs; + QMap <std::string, QAudioDevice> m_audioInputs; + QMap <std::string, QCameraDevice> m_cameraDevices; + + + std::unique_ptr<qstdweb::EventCallback> m_deviceChangedCallback; + + bool m_videoInputsAdded = false; + bool m_audioInputsAdded = false; + bool m_audioOutputsAdded = false; + emscripten::val m_jsMediaDevicesInterface = emscripten::val::undefined(); + bool m_initDone = false; + bool m_firstInit = false; }; QT_END_NAMESPACE diff --git a/src/multimedia/windows/qcomptr_p.h b/src/multimedia/windows/qcomptr_p.h new file mode 100644 index 000000000..befc97f11 --- /dev/null +++ b/src/multimedia/windows/qcomptr_p.h @@ -0,0 +1,33 @@ +// 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 + +#ifndef QCOMPTR_P_H +#define QCOMPTR_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <qt_windows.h> +#include <wrl/client.h> + +using Microsoft::WRL::ComPtr; + +template<typename T, typename... Args> +ComPtr<T> makeComObject(Args &&...args) +{ + ComPtr<T> p; + // Don't use Attach because of MINGW64 bug + // #892 Microsoft::WRL::ComPtr::Attach leaks references + *p.GetAddressOf() = new T(std::forward<Args>(args)...); + return p; +} + +#endif diff --git a/src/multimedia/windows/qcomtaskresource_p.h b/src/multimedia/windows/qcomtaskresource_p.h new file mode 100644 index 000000000..90554da5e --- /dev/null +++ b/src/multimedia/windows/qcomtaskresource_p.h @@ -0,0 +1,152 @@ +// Copyright (C) 2023 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 + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#ifndef QCOMTASKRESOURCE_P_H +#define QCOMTASKRESOURCE_P_H + +#include <QtCore/qassert.h> + +#include <objbase.h> +#include <algorithm> +#include <type_traits> +#include <utility> + +class QEmptyDeleter final +{ +public: + template<typename T> + void operator()(T /*element*/) const + { + } +}; + +class QComDeleter final +{ +public: + template<typename T> + void operator()(T element) const + { + element->Release(); + } +}; + +template<typename T> +class QComTaskResourceBase +{ +public: + QComTaskResourceBase(const QComTaskResourceBase<T> &source) = delete; + QComTaskResourceBase &operator=(const QComTaskResourceBase<T> &right) = delete; + + explicit operator bool() const { return m_resource != nullptr; } + + T *get() const { return m_resource; } + +protected: + QComTaskResourceBase() = default; + explicit QComTaskResourceBase(T *const resource) : m_resource(resource) { } + + T *release() { return std::exchange(m_resource, nullptr); } + + void reset(T *const resource = nullptr) + { + if (m_resource != resource) { + if (m_resource) + CoTaskMemFree(m_resource); + m_resource = resource; + } + } + + T *m_resource = nullptr; +}; + +template<typename T, typename TElementDeleter = QEmptyDeleter> +class QComTaskResource final : public QComTaskResourceBase<T> +{ + using Base = QComTaskResourceBase<T>; + +public: + using Base::QComTaskResourceBase; + + ~QComTaskResource() { reset(); } + + T *operator->() const { return m_resource; } + T &operator*() const { return *m_resource; } + + T **address() + { + Q_ASSERT(m_resource == nullptr); + return &m_resource; + } + + using Base::release; + using Base::reset; + +private: + using Base::m_resource; +}; + +template<typename T, typename TElementDeleter> +class QComTaskResource<T[], TElementDeleter> final : public QComTaskResourceBase<T> +{ + using Base = QComTaskResourceBase<T>; + +public: + QComTaskResource() = default; + explicit QComTaskResource(T *const resource, const std::size_t size) + : Base(resource), m_size(size) + { + } + + ~QComTaskResource() { reset(); } + + T &operator[](const std::size_t index) const + { + Q_ASSERT(index < m_size); + return m_resource[index]; + } + + T *release() + { + m_size = 0; + + return Base::release(); + } + + void reset() { reset(nullptr, 0); } + + void reset(T *const resource, const std::size_t size) + { + if (m_resource != resource) { + resetElements(); + + Base::reset(resource); + + m_size = size; + } + } + +private: + void resetElements() + { + if constexpr (!std::is_same_v<TElementDeleter, QEmptyDeleter>) { + std::for_each(m_resource, m_resource + m_size, TElementDeleter()); + } + } + + std::size_t m_size = 0; + + using Base::m_resource; +}; + +#endif diff --git a/src/multimedia/windows/qwindowsaudiodevice.cpp b/src/multimedia/windows/qwindowsaudiodevice.cpp index ea9108113..f22567cbf 100644 --- a/src/multimedia/windows/qwindowsaudiodevice.cpp +++ b/src/multimedia/windows/qwindowsaudiodevice.cpp @@ -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 // // W A R N I N G @@ -48,28 +12,47 @@ // INTERNAL USE ONLY: Do NOT use for any other purpose. // +#include "qwindowsaudiodevice_p.h" +#include "qwindowsaudioutils_p.h" #include <QtCore/qt_windows.h> #include <QtCore/QDataStream> #include <QtCore/QIODevice> -#include <utility> + +#include <audioclient.h> #include <mmsystem.h> + #include <initguid.h> +#include <wtypes.h> +#include <propkeydef.h> #include <mmdeviceapi.h> -#include "qwindowsaudiodevice_p.h" -#include "qwindowsaudioutils_p.h" QT_BEGIN_NAMESPACE -QWindowsAudioDeviceInfo::QWindowsAudioDeviceInfo(QByteArray dev, QWindowsIUPointer<IMMDevice> immDev, int waveID, const QString &description, QAudioDevice::Mode mode) +QWindowsAudioDeviceInfo::QWindowsAudioDeviceInfo(QByteArray dev, ComPtr<IMMDevice> immDev, int waveID, const QString &description, QAudioDevice::Mode mode) : QAudioDevicePrivate(dev, mode), m_devId(waveID), m_immDev(std::move(immDev)) { + Q_ASSERT(m_immDev); + this->description = description; - preferredFormat.setSampleRate(44100); - preferredFormat.setChannelCount(2); - preferredFormat.setSampleFormat(QAudioFormat::Int16); + + ComPtr<IAudioClient> audioClient; + HRESULT hr = m_immDev->Activate(__uuidof(IAudioClient), CLSCTX_INPROC_SERVER, nullptr, + (void **)audioClient.GetAddressOf()); + if (SUCCEEDED(hr)) { + WAVEFORMATEX *pwfx = nullptr; + hr = audioClient->GetMixFormat(&pwfx); + if (SUCCEEDED(hr)) + preferredFormat = QWindowsAudioUtils::waveFormatExToFormat(*pwfx); + } + + if (!preferredFormat.isValid()) { + preferredFormat.setSampleRate(44100); + preferredFormat.setChannelCount(2); + preferredFormat.setSampleFormat(QAudioFormat::Int16); + } DWORD fmt = 0; @@ -211,16 +194,14 @@ QWindowsAudioDeviceInfo::QWindowsAudioDeviceInfo(QByteArray dev, QWindowsIUPoint channelConfiguration = QAudioFormat::defaultChannelConfigForChannelCount(maximumChannelCount); - QWindowsIUPointer<IPropertyStore> props; - if (m_immDev) { - HRESULT hr = m_immDev->OpenPropertyStore(STGM_READ, props.address()); - if (SUCCEEDED(hr)) { - PROPVARIANT var; - PropVariantInit(&var); - hr = props->GetValue(PKEY_AudioEndpoint_PhysicalSpeakers, &var); - if (SUCCEEDED(hr) && var.uintVal != 0) - channelConfiguration = QWindowsAudioUtils::maskToChannelConfig(var.uintVal, maximumChannelCount); - } + ComPtr<IPropertyStore> props; + hr = m_immDev->OpenPropertyStore(STGM_READ, props.GetAddressOf()); + if (SUCCEEDED(hr)) { + PROPVARIANT var; + PropVariantInit(&var); + hr = props->GetValue(PKEY_AudioEndpoint_PhysicalSpeakers, &var); + if (SUCCEEDED(hr) && var.uintVal != 0) + channelConfiguration = QWindowsAudioUtils::maskToChannelConfig(var.uintVal, maximumChannelCount); } } diff --git a/src/multimedia/windows/qwindowsaudiodevice_p.h b/src/multimedia/windows/qwindowsaudiodevice_p.h index 6c83de5ad..b2af4bfe0 100644 --- a/src/multimedia/windows/qwindowsaudiodevice_p.h +++ b/src/multimedia/windows/qwindowsaudiodevice_p.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 // // W A R N I N G @@ -60,7 +24,7 @@ #include <QtMultimedia/qaudiodevice.h> #include <private/qaudiosystem_p.h> #include <private/qaudiodevice_p.h> -#include <qwindowsiupointer_p.h> +#include <qcomptr_p.h> struct IMMDevice; @@ -72,7 +36,7 @@ const unsigned int SAMPLE_RATES[] = { 8000, 11025, 22050, 44100, 48000 }; class QWindowsAudioDeviceInfo : public QAudioDevicePrivate { public: - QWindowsAudioDeviceInfo(QByteArray dev, QWindowsIUPointer<IMMDevice> immdev, int waveID, const QString &description, QAudioDevice::Mode mode); + QWindowsAudioDeviceInfo(QByteArray dev, ComPtr<IMMDevice> immdev, int waveID, const QString &description, QAudioDevice::Mode mode); ~QWindowsAudioDeviceInfo(); bool open(); @@ -81,11 +45,11 @@ public: bool testSettings(const QAudioFormat& format) const; int waveId() const { return m_devId; } - QWindowsIUPointer<IMMDevice> immDev() const { return m_immDev; } + ComPtr<IMMDevice> immDev() const { return m_immDev; } private: quint32 m_devId; - QWindowsIUPointer<IMMDevice> m_immDev; + ComPtr<IMMDevice> m_immDev; }; diff --git a/src/multimedia/windows/qwindowsaudiosink.cpp b/src/multimedia/windows/qwindowsaudiosink.cpp index 5d41e6ed6..404496970 100644 --- a/src/multimedia/windows/qwindowsaudiosink.cpp +++ b/src/multimedia/windows/qwindowsaudiosink.cpp @@ -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 // // W A R N I N G @@ -49,33 +13,31 @@ // #include "qwindowsaudiosink_p.h" -#include "qwindowsaudiodevice_p.h" #include "qwindowsaudioutils_p.h" -#include <QtEndian> +#include "qwindowsmultimediautils_p.h" +#include "qcomtaskresource_p.h" + #include <QtCore/QDataStream> #include <QtCore/qtimer.h> +#include <QtCore/qloggingcategory.h> +#include <QtCore/qpointer.h> #include <private/qaudiohelpers_p.h> -#include <qloggingcategory.h> - -#include <system_error> #include <audioclient.h> #include <mmdeviceapi.h> - QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(qLcAudioOutput, "qt.multimedia.audiooutput") +static Q_LOGGING_CATEGORY(qLcAudioOutput, "qt.multimedia.audiooutput") -const IID IID_IAudioClient = __uuidof(IAudioClient); -const IID IID_IAudioRenderClient = __uuidof(IAudioRenderClient); +using namespace QWindowsMultimediaUtils; class OutputPrivate : public QIODevice { Q_OBJECT public: - OutputPrivate(QWindowsAudioSink& audio) : audioDevice(audio) {} + OutputPrivate(QWindowsAudioSink &audio) : QIODevice(&audio), audioDevice(audio) {} ~OutputPrivate() override = default; qint64 readData(char *, qint64) override { return 0; } @@ -85,41 +47,25 @@ private: QWindowsAudioSink &audioDevice; }; -std::optional<quint32> audioClientFramesInUse(IAudioClient *client) -{ - Q_ASSERT(client); - UINT32 framesPadding = 0; - if (SUCCEEDED(client->GetCurrentPadding(&framesPadding))) - return framesPadding; - return {}; -} - -std::optional<quint32> audioClientFramesAllocated(IAudioClient *client) -{ - Q_ASSERT(client); - UINT32 bufferFrameCount = 0; - if (SUCCEEDED(client->GetBufferSize(&bufferFrameCount))) - return bufferFrameCount; - return {}; -} - std::optional<quint32> audioClientFramesAvailable(IAudioClient *client) { - auto framesAllocated = audioClientFramesAllocated(client); - auto framesInUse = audioClientFramesInUse(client); + auto framesAllocated = QWindowsAudioUtils::audioClientFramesAllocated(client); + auto framesInUse = QWindowsAudioUtils::audioClientFramesInUse(client); if (framesAllocated && framesInUse) return *framesAllocated - *framesInUse; return {}; } -QWindowsAudioSink::QWindowsAudioSink(QWindowsIUPointer<IMMDevice> device) : +QWindowsAudioSink::QWindowsAudioSink(ComPtr<IMMDevice> device, QObject *parent) : + QPlatformAudioSink(parent), + m_timer(new QTimer(this)), m_pushSource(new OutputPrivate(*this)), m_device(std::move(device)) { m_pushSource->open(QIODevice::WriteOnly|QIODevice::Unbuffered); - m_timer.setSingleShot(true); - m_timer.setTimerType(Qt::PreciseTimer); + m_timer->setSingleShot(true); + m_timer->setTimerType(Qt::PreciseTimer); } QWindowsAudioSink::~QWindowsAudioSink() @@ -129,7 +75,7 @@ QWindowsAudioSink::~QWindowsAudioSink() qint64 QWindowsAudioSink::remainingPlayTimeUs() { - auto framesInUse = audioClientFramesInUse(m_audioClient.get()); + auto framesInUse = QWindowsAudioUtils::audioClientFramesInUse(m_audioClient.Get()); return m_resampler.outputFormat().durationForFrames(framesInUse ? *framesInUse : 0); } @@ -141,13 +87,16 @@ void QWindowsAudioSink::deviceStateChange(QAudio::State state, QAudio::Error err qCDebug(qLcAudioOutput) << "Audio client started"; } else if (deviceState == QAudio::ActiveState) { - m_timer.stop(); + m_timer->stop(); m_audioClient->Stop(); qCDebug(qLcAudioOutput) << "Audio client stopped"; } + QPointer<QWindowsAudioSink> thisGuard(this); deviceState = state; emit stateChanged(deviceState); + if (!thisGuard) + return; } if (error != errorState) { @@ -190,7 +139,7 @@ void QWindowsAudioSink::pullSource() deviceStateChange(QAudio::IdleState, m_pullSource->atEnd() ? QAudio::NoError : QAudio::UnderrunError); } else { deviceStateChange(QAudio::ActiveState, QAudio::NoError); - m_timer.start(playTimeUs / 2000); + m_timer->start(playTimeUs / 2000); } } @@ -200,6 +149,9 @@ void QWindowsAudioSink::start(QIODevice* device) if (deviceState != QAudio::StoppedState) close(); + if (device == nullptr) + return; + if (!open()) { errorState = QAudio::OpenError; emit errorChanged(QAudio::OpenError); @@ -209,9 +161,9 @@ void QWindowsAudioSink::start(QIODevice* device) m_pullSource = device; connect(device, &QIODevice::readyRead, this, &QWindowsAudioSink::pullSource); - m_timer.disconnect(); - m_timer.callOnTimeout(this, &QWindowsAudioSink::pullSource); - m_timer.start(0); + m_timer->disconnect(); + m_timer->callOnTimeout(this, &QWindowsAudioSink::pullSource); + pullSource(); } qint64 QWindowsAudioSink::push(const char *data, qint64 len) @@ -222,7 +174,7 @@ qint64 QWindowsAudioSink::push(const char *data, qint64 len) qint64 written = write(data, len); if (written > 0) { deviceStateChange(QAudio::ActiveState, QAudio::NoError); - m_timer.start(remainingPlayTimeUs() /1000); + m_timer->start(remainingPlayTimeUs() /1000); } return written; @@ -242,8 +194,8 @@ QIODevice* QWindowsAudioSink::start() deviceStateChange(QAudio::IdleState, QAudio::NoError); - m_timer.disconnect(); - m_timer.callOnTimeout([&](){ + m_timer->disconnect(); + m_timer->callOnTimeout(this, [this](){ deviceStateChange(QAudio::IdleState, QAudio::UnderrunError); }); @@ -252,23 +204,27 @@ QIODevice* QWindowsAudioSink::start() bool QWindowsAudioSink::open() { - HRESULT hr = m_device->Activate(IID_IAudioClient, CLSCTX_INPROC_SERVER, - nullptr, (void**)m_audioClient.address()); + if (m_audioClient) + return true; + + HRESULT hr = m_device->Activate(__uuidof(IAudioClient), CLSCTX_INPROC_SERVER, + nullptr, (void**)m_audioClient.GetAddressOf()); if (FAILED(hr)) { - qCWarning(qLcAudioOutput) << "Failed to activate audio device"; + qCWarning(qLcAudioOutput) << "Failed to activate audio device" << errorString(hr); return false; } - WAVEFORMATEX *pwfx = nullptr; - hr = m_audioClient->GetMixFormat(&pwfx); + auto resetClient = qScopeGuard([this](){ m_audioClient.Reset(); }); + + QComTaskResource<WAVEFORMATEX> pwfx; + hr = m_audioClient->GetMixFormat(pwfx.address()); if (FAILED(hr)) { - qCWarning(qLcAudioOutput) << "Format unsupported" << hr; + qCWarning(qLcAudioOutput) << "Format unsupported" << errorString(hr); return false; } if (!m_resampler.setup(m_format, QWindowsAudioUtils::waveFormatExToFormat(*pwfx))) { - qCWarning(qLcAudioOutput) << "Failed to setup resampler"; - CoTaskMemFree(pwfx); + qCWarning(qLcAudioOutput) << "Failed to set up resampler"; return false; } @@ -277,22 +233,15 @@ bool QWindowsAudioSink::open() REFERENCE_TIME requestedDuration = m_format.durationForBytes(m_bufferSize) * 10; - hr = m_audioClient->Initialize( - AUDCLNT_SHAREMODE_SHARED, - 0, - requestedDuration, - 0, - pwfx, - nullptr); - - CoTaskMemFree(pwfx); + hr = m_audioClient->Initialize(AUDCLNT_SHAREMODE_SHARED, 0, requestedDuration, 0, pwfx.get(), + nullptr); if (FAILED(hr)) { - qCWarning(qLcAudioOutput) << "Failed to initialize audio client" << hr; + qCWarning(qLcAudioOutput) << "Failed to initialize audio client" << errorString(hr); return false; } - auto framesAllocated = audioClientFramesAllocated(m_audioClient.get()); + auto framesAllocated = QWindowsAudioUtils::audioClientFramesAllocated(m_audioClient.Get()); if (!framesAllocated) { qCWarning(qLcAudioOutput) << "Failed to get audio client buffer size"; return false; @@ -301,12 +250,15 @@ bool QWindowsAudioSink::open() m_bufferSize = m_format.bytesForDuration( m_resampler.outputFormat().durationForFrames(*framesAllocated)); - hr = m_audioClient->GetService(IID_IAudioRenderClient, (void**)m_renderClient.address()); + hr = m_audioClient->GetService(__uuidof(IAudioRenderClient), (void**)m_renderClient.GetAddressOf()); if (FAILED(hr)) { - qCWarning(qLcAudioOutput) << "Failed to obtain audio client rendering service" << hr; + qCWarning(qLcAudioOutput) << "Failed to obtain audio client rendering service" + << errorString(hr); return false; } + resetClient.dismiss(); + return true; } @@ -320,8 +272,8 @@ void QWindowsAudioSink::close() if (m_pullSource) disconnect(m_pullSource, &QIODevice::readyRead, this, &QWindowsAudioSink::pullSource); - m_audioClient.reset(); - m_renderClient.reset(); + m_audioClient.Reset(); + m_renderClient.Reset(); m_pullSource = nullptr; } @@ -330,7 +282,7 @@ qsizetype QWindowsAudioSink::bytesFree() const if (!m_audioClient) return 0; - auto framesAvailable = audioClientFramesAvailable(m_audioClient.get()); + auto framesAvailable = audioClientFramesAvailable(m_audioClient.Get()); if (framesAvailable) return m_resampler.inputBufferSize(*framesAvailable * m_resampler.outputFormat().bytesPerFrame()); return 0; @@ -357,7 +309,7 @@ qint64 QWindowsAudioSink::write(const char *data, qint64 len) qCDebug(qLcAudioOutput) << "write()" << len; - auto framesAvailable = audioClientFramesAvailable(m_audioClient.get()); + auto framesAvailable = audioClientFramesAvailable(m_audioClient.Get()); if (!framesAvailable) return -1; @@ -371,8 +323,7 @@ qint64 QWindowsAudioSink::write(const char *data, qint64 len) quint8 *buffer = nullptr; HRESULT hr = m_renderClient->GetBuffer(writeFramesNum, &buffer); if (FAILED(hr)) { - qCWarning(qLcAudioOutput) << "Failed to get buffer" - << std::system_category().message(hr).c_str(); + qCWarning(qLcAudioOutput) << "Failed to get buffer" << errorString(hr); return -1; } @@ -384,8 +335,7 @@ qint64 QWindowsAudioSink::write(const char *data, qint64 len) DWORD flags = writeBytes.isEmpty() ? AUDCLNT_BUFFERFLAGS_SILENT : 0; hr = m_renderClient->ReleaseBuffer(writeFramesNum, flags); if (FAILED(hr)) { - qCWarning(qLcAudioOutput) << "Failed to return buffer" - << std::system_category().message(hr).c_str(); + qCWarning(qLcAudioOutput) << "Failed to return buffer" << errorString(hr); return -1; } @@ -399,9 +349,7 @@ void QWindowsAudioSink::resume() if (m_pullSource) { pullSource(); } else { - // FIXME: Set IdleState to be consistent with implementations on other platforms - // even when playing the audio part that was in the buffer when suspended - deviceStateChange(QAudio::IdleState, QAudio::NoError); + deviceStateChange(suspendedInState, QAudio::NoError); if (remainingPlayTimeUs() > 0) m_audioClient->Start(); } @@ -411,8 +359,10 @@ void QWindowsAudioSink::resume() void QWindowsAudioSink::suspend() { qCDebug(qLcAudioOutput) << "suspend()"; - if (deviceState == QAudio::ActiveState || deviceState == QAudio::IdleState) + if (deviceState == QAudio::ActiveState || deviceState == QAudio::IdleState) { + suspendedInState = deviceState; deviceStateChange(QAudio::SuspendedState, QAudio::NoError); + } } void QWindowsAudioSink::setVolume(qreal v) @@ -423,12 +373,14 @@ void QWindowsAudioSink::setVolume(qreal v) m_volume = qBound(qreal(0), v, qreal(1)); } +void QWindowsAudioSink::stop() { + // TODO: investigate and find a way to drain and stop instead of closing + close(); +} + void QWindowsAudioSink::reset() { - if (m_audioClient) { - m_audioClient->Stop(); - m_audioClient->Reset(); - } + close(); } QT_END_NAMESPACE diff --git a/src/multimedia/windows/qwindowsaudiosink_p.h b/src/multimedia/windows/qwindowsaudiosink_p.h index 6910a1385..1a98bc296 100644 --- a/src/multimedia/windows/qwindowsaudiosink_p.h +++ b/src/multimedia/windows/qwindowsaudiosink_p.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 // // W A R N I N G @@ -51,8 +15,6 @@ #ifndef QWINDOWSAUDIOOUTPUT_H #define QWINDOWSAUDIOOUTPUT_H -#include "qwindowsaudioutils_p.h" - #include <QtCore/qdebug.h> #include <QtCore/qelapsedtimer.h> #include <QtCore/qiodevice.h> @@ -61,28 +23,17 @@ #include <QtCore/qdatetime.h> #include <QtCore/qmutex.h> #include <QtCore/qtimer.h> +#include <QtCore/qpointer.h> #include <QtMultimedia/qaudio.h> #include <QtMultimedia/qaudiodevice.h> #include <private/qaudiosystem_p.h> -#include <qwindowsiupointer_p.h> +#include <qcomptr_p.h> #include <qwindowsresampler_p.h> -#include <queue> -#include <utility> - #include <audioclient.h> #include <mmdeviceapi.h> -// For compat with 4.6 -#if !defined(QT_WIN_CALLBACK) -# if defined(Q_CC_MINGW) -# define QT_WIN_CALLBACK CALLBACK __attribute__ ((force_align_arg_pointer)) -# else -# define QT_WIN_CALLBACK CALLBACK -# endif -#endif - QT_BEGIN_NAMESPACE class QWindowsResampler; @@ -91,14 +42,14 @@ class QWindowsAudioSink : public QPlatformAudioSink { Q_OBJECT public: - QWindowsAudioSink(QWindowsIUPointer<IMMDevice> device); + QWindowsAudioSink(ComPtr<IMMDevice> device, QObject *parent); ~QWindowsAudioSink(); void setFormat(const QAudioFormat& fmt) override; QAudioFormat format() const override; QIODevice* start() override; void start(QIODevice* device) override; - void stop() override { close(); } + void stop() override; void reset() override; void suspend() override; void resume() override; @@ -127,15 +78,16 @@ private: QAudioFormat m_format; QAudio::Error errorState = QAudio::NoError; QAudio::State deviceState = QAudio::StoppedState; + QAudio::State suspendedInState = QAudio::SuspendedState; qsizetype m_bufferSize = 0; qreal m_volume = 1.0; - QTimer m_timer; + QTimer *m_timer = nullptr; QScopedPointer<QIODevice> m_pushSource; - QIODevice *m_pullSource = nullptr; - QWindowsIUPointer<IMMDevice> m_device; - QWindowsIUPointer<IAudioClient> m_audioClient; - QWindowsIUPointer<IAudioRenderClient> m_renderClient; + QPointer<QIODevice> m_pullSource; + ComPtr<IMMDevice> m_device; + ComPtr<IAudioClient> m_audioClient; + ComPtr<IAudioRenderClient> m_renderClient; QWindowsResampler m_resampler; }; diff --git a/src/multimedia/windows/qwindowsaudiosource.cpp b/src/multimedia/windows/qwindowsaudiosource.cpp index 8523f9982..85fc454ad 100644 --- a/src/multimedia/windows/qwindowsaudiosource.cpp +++ b/src/multimedia/windows/qwindowsaudiosource.cpp @@ -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 // // W A R N I N G @@ -50,646 +14,393 @@ #include "qwindowsaudiosource_p.h" +#include "qwindowsmultimediautils_p.h" +#include "qcomtaskresource_p.h" #include <QtCore/QDataStream> #include <QtCore/qtimer.h> -QT_BEGIN_NAMESPACE +#include <private/qaudiohelpers_p.h> -//#define DEBUG_AUDIO 1 +#include <qloggingcategory.h> +#include <qdebug.h> +#include <audioclient.h> +#include <mmdeviceapi.h> -QWindowsAudioSource::QWindowsAudioSource(int deviceId) -{ - bytesAvailable = 0; - buffer_size = 0; - period_size = 0; - m_deviceId = deviceId; - totalTimeValue = 0; - errorState = QAudio::NoError; - deviceState = QAudio::StoppedState; - audioSource = 0; - pullMode = true; - resuming = false; - finished = false; - waveBlockOffset = 0; - - mixerID = 0; - cachedVolume = -1.0f; - memset(&mixerLineControls, 0, sizeof(mixerLineControls)); -} +QT_BEGIN_NAMESPACE -QWindowsAudioSource::~QWindowsAudioSource() -{ - stop(); -} +static Q_LOGGING_CATEGORY(qLcAudioSource, "qt.multimedia.audiosource") + +using namespace QWindowsMultimediaUtils; -void QT_WIN_CALLBACK QWindowsAudioSource::waveInProc( HWAVEIN hWaveIn, UINT uMsg, - DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2 ) +class OurSink : public QIODevice { - Q_UNUSED(dwParam1); - Q_UNUSED(dwParam2); - Q_UNUSED(hWaveIn); +public: + OurSink(QWindowsAudioSource& source) : QIODevice(&source), m_audioSource(source) {} - QWindowsAudioSource* qAudio; - qAudio = (QWindowsAudioSource*)(dwInstance); - if(!qAudio) - return; + qint64 bytesAvailable() const override { return m_audioSource.bytesReady(); } + qint64 readData(char* data, qint64 len) override { return m_audioSource.read(data, len); } + qint64 writeData(const char*, qint64) override { return 0; } - QMutexLocker locker(&qAudio->mutex); +private: + QWindowsAudioSource &m_audioSource; +}; - switch(uMsg) { - case WIM_OPEN: - break; - case WIM_DATA: - if(qAudio->waveFreeBlockCount > 0) - qAudio->waveFreeBlockCount--; - qAudio->feedback(); - break; - case WIM_CLOSE: - qAudio->finished = true; - break; - default: - return; - } +QWindowsAudioSource::QWindowsAudioSource(ComPtr<IMMDevice> device, QObject *parent) + : QPlatformAudioSource(parent), + m_timer(new QTimer(this)), + m_device(std::move(device)), + m_ourSink(new OurSink(*this)) +{ + m_ourSink->open(QIODevice::ReadOnly|QIODevice::Unbuffered); + m_timer->setTimerType(Qt::PreciseTimer); + m_timer->setSingleShot(true); + m_timer->callOnTimeout(this, &QWindowsAudioSource::pullCaptureClient); } -WAVEHDR* QWindowsAudioSource::allocateBlocks(int size, int count) +void QWindowsAudioSource::setVolume(qreal volume) { - int i; - unsigned char* buffer; - WAVEHDR* blocks; - DWORD totalBufferSize = (size + sizeof(WAVEHDR))*count; - - if((buffer=(unsigned char*)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, - totalBufferSize)) == 0) { - qWarning("QAudioSource: Memory allocation error"); - return 0; - } - blocks = (WAVEHDR*)buffer; - buffer += sizeof(WAVEHDR)*count; - for(i = 0; i < count; i++) { - blocks[i].dwBufferLength = size; - blocks[i].lpData = (LPSTR)buffer; - blocks[i].dwBytesRecorded=0; - blocks[i].dwUser = 0L; - blocks[i].dwFlags = 0L; - blocks[i].dwLoops = 0L; - result = waveInPrepareHeader(hWaveIn,&blocks[i], sizeof(WAVEHDR)); - if(result != MMSYSERR_NOERROR) { - qWarning("QAudioSource: Can't prepare block %d",i); - return 0; - } - buffer += size; - } - return blocks; + m_volume = qBound(qreal(0), volume, qreal(1)); } -void QWindowsAudioSource::freeBlocks(WAVEHDR* blockArray) +qreal QWindowsAudioSource::volume() const { - WAVEHDR* blocks = blockArray; - - int count = buffer_size/period_size; + return m_volume; +} - for(int i = 0; i < count; i++) { - waveInUnprepareHeader(hWaveIn,blocks, sizeof(WAVEHDR)); - blocks++; - } - HeapFree(GetProcessHeap(), 0, blockArray); +QWindowsAudioSource::~QWindowsAudioSource() +{ + stop(); } QAudio::Error QWindowsAudioSource::error() const { - return errorState; + return m_errorState; } QAudio::State QWindowsAudioSource::state() const { - return deviceState; + return m_deviceState; } -#ifndef DRVM_MAPPER_CONSOLEVOICECOM_GET - #ifndef DRVM_MAPPER - #define DRVM_MAPPER 0x2000 - #endif - #ifndef DRVM_MAPPER_STATUS - #define DRVM_MAPPER_STATUS (DRVM_MAPPER+0) - #endif - #define DRVM_USER 0x4000 - #define DRVM_MAPPER_RECONFIGURE (DRVM_MAPPER+1) - #define DRVM_MAPPER_PREFERRED_GET (DRVM_MAPPER+21) - #define DRVM_MAPPER_CONSOLEVOICECOM_GET (DRVM_MAPPER+23) -#endif - -void QWindowsAudioSource::setVolume(qreal volume) +void QWindowsAudioSource::setFormat(const QAudioFormat& fmt) { - cachedVolume = volume; - for (DWORD i = 0; i < mixerLineControls.cControls; i++) { - - MIXERCONTROLDETAILS controlDetails; - controlDetails.cbStruct = sizeof(MIXERCONTROLDETAILS); - controlDetails.dwControlID = mixerLineControls.pamxctrl[i].dwControlID; - controlDetails.cChannels = 1; - - if ((mixerLineControls.pamxctrl[i].dwControlType == MIXERCONTROL_CONTROLTYPE_FADER) || - (mixerLineControls.pamxctrl[i].dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME)) { - MIXERCONTROLDETAILS_UNSIGNED controlDetailsUnsigned; - controlDetailsUnsigned.dwValue = qBound(DWORD(0), DWORD(65535.0 * volume + 0.5), DWORD(65535)); - controlDetails.cMultipleItems = 0; - controlDetails.cbDetails = sizeof(MIXERCONTROLDETAILS_UNSIGNED); - controlDetails.paDetails = &controlDetailsUnsigned; - mixerSetControlDetails(mixerID, &controlDetails, MIXER_SETCONTROLDETAILSF_VALUE); + if (m_deviceState == QAudio::StoppedState) { + m_format = fmt; + } else { + if (m_format != fmt) { + qWarning() << "Cannot set a new audio format, in the current state (" + << m_deviceState << ")"; } } } -qreal QWindowsAudioSource::volume() const +QAudioFormat QWindowsAudioSource::format() const +{ + return m_format; +} + +void QWindowsAudioSource::deviceStateChange(QAudio::State state, QAudio::Error error) { - for (DWORD i = 0; i < mixerLineControls.cControls; i++) { - if ((mixerLineControls.pamxctrl[i].dwControlType != MIXERCONTROL_CONTROLTYPE_FADER) && - (mixerLineControls.pamxctrl[i].dwControlType != MIXERCONTROL_CONTROLTYPE_VOLUME)) { - continue; + if (state != m_deviceState) { + bool wasActive = m_deviceState == QAudio::ActiveState || m_deviceState == QAudio::IdleState; + bool isActive = state == QAudio::ActiveState || state == QAudio::IdleState; + + if (isActive && !wasActive) { + m_audioClient->Start(); + qCDebug(qLcAudioSource) << "Audio client started"; + + } else if (wasActive && !isActive) { + m_timer->stop(); + m_audioClient->Stop(); + qCDebug(qLcAudioSource) << "Audio client stopped"; } - MIXERCONTROLDETAILS controlDetails; - controlDetails.cbStruct = sizeof(controlDetails); - controlDetails.dwControlID = mixerLineControls.pamxctrl[i].dwControlID; - controlDetails.cChannels = 1; - controlDetails.cMultipleItems = 0; - controlDetails.cbDetails = sizeof(MIXERCONTROLDETAILS_UNSIGNED); - MIXERCONTROLDETAILS_UNSIGNED detailsUnsigned; - controlDetails.paDetails = &detailsUnsigned; - memset(controlDetails.paDetails, 0, controlDetails.cbDetails); - - MMRESULT result = mixerGetControlDetails(mixerID, &controlDetails, MIXER_GETCONTROLDETAILSF_VALUE); - if (result != MMSYSERR_NOERROR) - continue; - if (controlDetails.cbDetails < sizeof(MIXERCONTROLDETAILS_UNSIGNED)) - continue; - return detailsUnsigned.dwValue / 65535.0; + m_deviceState = state; + emit stateChanged(m_deviceState); } - return qFuzzyCompare(cachedVolume, qreal(-1.0f)) ? 1.0f : cachedVolume; + if (error != m_errorState) { + m_errorState = error; + emit errorChanged(error); + } } -void QWindowsAudioSource::setFormat(const QAudioFormat& fmt) +QByteArray QWindowsAudioSource::readCaptureClientBuffer() { - if (deviceState == QAudio::StoppedState) - settings = fmt; -} + UINT32 actualFrames = 0; + BYTE *data = nullptr; + DWORD flags = 0; + HRESULT hr = m_captureClient->GetBuffer(&data, &actualFrames, &flags, nullptr, nullptr); + if (FAILED(hr)) { + qWarning() << "IAudioCaptureClient::GetBuffer failed" << errorString(hr); + deviceStateChange(QAudio::IdleState, QAudio::IOError); + return {}; + } -QAudioFormat QWindowsAudioSource::format() const -{ - return settings; + if (actualFrames == 0) + return {}; + + QByteArray out; + if (flags & AUDCLNT_BUFFERFLAGS_SILENT) { + out.resize(m_resampler.outputFormat().bytesForDuration( + m_resampler.inputFormat().framesForDuration(actualFrames)), + 0); + } else { + out = m_resampler.resample( + { data, m_resampler.inputFormat().bytesForFrames(actualFrames) }); + QAudioHelperInternal::qMultiplySamples(m_volume, m_resampler.outputFormat(), out.data(), out.data(), out.size()); + } + + hr = m_captureClient->ReleaseBuffer(actualFrames); + if (FAILED(hr)) { + qWarning() << "IAudioCaptureClient::ReleaseBuffer failed" << errorString(hr); + deviceStateChange(QAudio::IdleState, QAudio::IOError); + return {}; + } + + return out; } -void QWindowsAudioSource::start(QIODevice* device) +void QWindowsAudioSource::schedulePull() { - if(deviceState != QAudio::StoppedState) - close(); + auto allocated = QWindowsAudioUtils::audioClientFramesAllocated(m_audioClient.Get()); + auto inUse = QWindowsAudioUtils::audioClientFramesInUse(m_audioClient.Get()); - if(!pullMode && audioSource) - delete audioSource; + if (!allocated || !inUse) { + deviceStateChange(QAudio::IdleState, QAudio::IOError); + } else { + // Schedule the next audio pull immediately if the audio buffer is more + // than half-full or wait until the audio source fills at least half of it. + if (*inUse > *allocated / 2) { + m_timer->start(0); + } else { + auto timeToHalfBuffer = m_resampler.inputFormat().durationForFrames(*allocated / 2 - *inUse); + m_timer->start(timeToHalfBuffer / 1000); + } + } +} - pullMode = true; - audioSource = device; +void QWindowsAudioSource::pullCaptureClient() +{ + qCDebug(qLcAudioSource) << "Pull captureClient"; + while (true) { + auto out = readCaptureClientBuffer(); + if (out.isEmpty()) + break; - deviceState = QAudio::ActiveState; + if (m_clientSink) { + qint64 written = m_clientSink->write(out.data(), out.size()); + if (written != out.size()) + qCDebug(qLcAudioSource) << "Did not write all data to the output"; - if(!open()) - return; + } else { + m_clientBufferResidue += out; + emit m_ourSink->readyRead(); + } + } - emit stateChanged(deviceState); + schedulePull(); } -QIODevice* QWindowsAudioSource::start() +void QWindowsAudioSource::start(QIODevice* device) { - if(deviceState != QAudio::StoppedState) + qCDebug(qLcAudioSource) << "start(ioDevice)"; + if (m_deviceState != QAudio::StoppedState) close(); - if(!pullMode && audioSource) - delete audioSource; + if (device == nullptr) + return; - pullMode = false; - audioSource = new InputPrivate(this); - audioSource->open(QIODevice::ReadOnly | QIODevice::Unbuffered); + if (!open()) { + m_errorState = QAudio::OpenError; + emit errorChanged(QAudio::OpenError); + return; + } - deviceState = QAudio::IdleState; + m_clientSink = device; + schedulePull(); + deviceStateChange(QAudio::ActiveState, QAudio::NoError); +} - if(!open()) - return 0; +QIODevice* QWindowsAudioSource::start() +{ + qCDebug(qLcAudioSource) << "start()"; + if (m_deviceState != QAudio::StoppedState) + close(); - emit stateChanged(deviceState); + if (!open()) { + m_errorState = QAudio::OpenError; + emit errorChanged(QAudio::OpenError); + return nullptr; + } - return audioSource; + schedulePull(); + deviceStateChange(QAudio::IdleState, QAudio::NoError); + return m_ourSink; } void QWindowsAudioSource::stop() { - if(deviceState == QAudio::StoppedState) + if (m_deviceState == QAudio::StoppedState) return; close(); - emit stateChanged(deviceState); } bool QWindowsAudioSource::open() { -#ifdef DEBUG_AUDIO - QTime now(QTime::currentTime()); - qDebug()<<now.second()<<"s "<<now.msec()<<"ms :open()"; -#endif - header = 0; - - period_size = 0; - - if (!QWindowsAudioUtils::formatToWaveFormatExtensible(settings, wfx)) { - qWarning("QAudioSource: open error, invalid format."); - } else if (buffer_size == 0) { - period_size = settings.sampleRate() / 25 * settings.bytesPerFrame(); - buffer_size = period_size * 5; - } else { - if (int bpf = settings.bytesPerFrame()) - period_size = bpf * (buffer_size / 5 / bpf); + HRESULT hr = m_device->Activate(__uuidof(IAudioClient), CLSCTX_INPROC_SERVER, + nullptr, (void**)m_audioClient.GetAddressOf()); + if (FAILED(hr)) { + qCWarning(qLcAudioSource) << "Failed to activate audio device" << errorString(hr); + return false; } - if (period_size == 0) { - errorState = QAudio::OpenError; - deviceState = QAudio::StoppedState; - emit stateChanged(deviceState); + QComTaskResource<WAVEFORMATEX> pwfx; + hr = m_audioClient->GetMixFormat(pwfx.address()); + if (FAILED(hr)) { + qCWarning(qLcAudioSource) << "Format unsupported" << errorString(hr); return false; } - elapsedTimeOffset = 0; - - if (waveInOpen(&hWaveIn, UINT_PTR(m_deviceId), &wfx.Format, - (DWORD_PTR)&waveInProc, - (DWORD_PTR) this, - CALLBACK_FUNCTION) != MMSYSERR_NOERROR) { - errorState = QAudio::OpenError; - deviceState = QAudio::StoppedState; - emit stateChanged(deviceState); - qWarning("QAudioSource: failed to open audio device"); + if (!m_resampler.setup(QWindowsAudioUtils::waveFormatExToFormat(*pwfx), m_format)) { + qCWarning(qLcAudioSource) << "Failed to set up resampler"; return false; } - waveBlocks = allocateBlocks(period_size, buffer_size/period_size); - waveBlockOffset = 0; - - if(waveBlocks == 0) { - errorState = QAudio::OpenError; - deviceState = QAudio::StoppedState; - emit stateChanged(deviceState); - qWarning("QAudioSource: failed to allocate blocks. open failed"); + + if (m_bufferSize == 0) + m_bufferSize = m_format.sampleRate() * m_format.bytesPerFrame() / 5; // 200ms + + REFERENCE_TIME requestedDuration = m_format.durationForBytes(m_bufferSize); + + hr = m_audioClient->Initialize(AUDCLNT_SHAREMODE_SHARED, 0, requestedDuration, 0, pwfx.get(), + nullptr); + + if (FAILED(hr)) { + qCWarning(qLcAudioSource) << "Failed to initialize audio client" << errorString(hr); return false; } - mutex.lock(); - waveFreeBlockCount = buffer_size/period_size; - mutex.unlock(); - - for(int i=0; i<buffer_size/period_size; i++) { - result = waveInAddBuffer(hWaveIn, &waveBlocks[i], sizeof(WAVEHDR)); - if(result != MMSYSERR_NOERROR) { - qWarning("QAudioSource: failed to setup block %d,err=%d",i,result); - errorState = QAudio::OpenError; - deviceState = QAudio::StoppedState; - emit stateChanged(deviceState); - return false; - } + auto framesAllocated = QWindowsAudioUtils::audioClientFramesAllocated(m_audioClient.Get()); + if (!framesAllocated) { + qCWarning(qLcAudioSource) << "Failed to get audio client buffer size"; + return false; } - result = waveInStart(hWaveIn); - if(result) { - qWarning("QAudioSource: failed to start audio input"); - errorState = QAudio::OpenError; - deviceState = QAudio::StoppedState; - emit stateChanged(deviceState); + + m_bufferSize = m_format.bytesForDuration( + m_resampler.inputFormat().durationForFrames(*framesAllocated)); + + hr = m_audioClient->GetService(__uuidof(IAudioCaptureClient), (void**)m_captureClient.GetAddressOf()); + if (FAILED(hr)) { + qCWarning(qLcAudioSource) << "Failed to obtain audio client rendering service" << errorString(hr); return false; } - elapsedTimeOffset = 0; - totalTimeValue = 0; - errorState = QAudio::NoError; - initMixer(); + return true; } void QWindowsAudioSource::close() { - if(deviceState == QAudio::StoppedState) + qCDebug(qLcAudioSource) << "close()"; + if (m_deviceState == QAudio::StoppedState) return; - deviceState = QAudio::StoppedState; - waveInReset(hWaveIn); + deviceStateChange(QAudio::StoppedState, QAudio::NoError); - mutex.lock(); - for (int i=0; i<waveFreeBlockCount; i++) - waveInUnprepareHeader(hWaveIn,&waveBlocks[i],sizeof(WAVEHDR)); - freeBlocks(waveBlocks); - mutex.unlock(); - - waveInClose(hWaveIn); - closeMixer(); - - int count = 0; - while(!finished && count < 500) { - count++; - Sleep(10); - } + m_clientBufferResidue.clear(); + m_captureClient.Reset(); + m_audioClient.Reset(); + m_clientSink = nullptr; } -void QWindowsAudioSource::initMixer() +qsizetype QWindowsAudioSource::bytesReady() const { - // Get the Mixer ID from the Sound Device ID - UINT mixerIntID = 0; - if (mixerGetID(reinterpret_cast<HMIXEROBJ>(hWaveIn), - &mixerIntID, MIXER_OBJECTF_HWAVEIN) != MMSYSERR_NOERROR) - return; - mixerID = reinterpret_cast<HMIXEROBJ>(quintptr(mixerIntID)); + if (m_deviceState == QAudio::StoppedState || m_deviceState == QAudio::SuspendedState) + return 0; - // Get the Destination (Recording) Line Information - MIXERLINE mixerLine; - mixerLine.cbStruct = sizeof(MIXERLINE); - mixerLine.dwComponentType = MIXERLINE_COMPONENTTYPE_DST_WAVEIN; - if (mixerGetLineInfo(mixerID, &mixerLine, MIXER_GETLINEINFOF_COMPONENTTYPE) != MMSYSERR_NOERROR) - return; + auto frames = QWindowsAudioUtils::audioClientFramesInUse(m_audioClient.Get()); + if (frames) { + auto clientBufferSize = m_resampler.outputFormat().bytesForDuration( + m_resampler.inputFormat().durationForFrames(*frames)); - // Set all the Destination (Recording) Line Controls - if (mixerLine.cControls > 0) { - mixerLineControls.cbStruct = sizeof(MIXERLINECONTROLS); - mixerLineControls.dwLineID = mixerLine.dwLineID; - mixerLineControls.cControls = mixerLine.cControls; - mixerLineControls.cbmxctrl = sizeof(MIXERCONTROL); - mixerLineControls.pamxctrl = new MIXERCONTROL[mixerLineControls.cControls]; - if (mixerGetLineControls(mixerID, &mixerLineControls, MIXER_GETLINECONTROLSF_ALL) != MMSYSERR_NOERROR) - closeMixer(); - else if (!qFuzzyCompare(cachedVolume, qreal(-1.0f))) - setVolume(cachedVolume); + return clientBufferSize + m_clientBufferResidue.size(); + + } else { + return 0; } } -void QWindowsAudioSource::closeMixer() +qint64 QWindowsAudioSource::read(char* data, qint64 len) { - delete[] mixerLineControls.pamxctrl; - memset(&mixerLineControls, 0, sizeof(mixerLineControls)); -} + deviceStateChange(QAudio::ActiveState, QAudio::NoError); + schedulePull(); -qsizetype QWindowsAudioSource::bytesReady() const -{ - if (period_size == 0 || buffer_size == 0) - return 0; - if (deviceState == QAudio::StoppedState || deviceState == QAudio::SuspendedState) - return 0; + if (data == nullptr || len < 0) + return -1; - int buf = ((buffer_size/period_size)-waveFreeBlockCount)*period_size; - if(buf < 0) - buf = 0; - return buf; -} + auto offset = 0; + if (!m_clientBufferResidue.isEmpty()) { + auto copyLen = qMin(m_clientBufferResidue.size(), len); + memcpy(data, m_clientBufferResidue.data(), copyLen); + len -= copyLen; + offset += copyLen; + } -qint64 QWindowsAudioSource::read(char* data, qint64 len) -{ - bool done = false; - - char* p = data; - qint64 l = 0; - qint64 written = 0; - while(!done) { - // Read in some audio data - if(waveBlocks[header].dwBytesRecorded > 0 && waveBlocks[header].dwFlags & WHDR_DONE) { - if(pullMode) { - l = audioSource->write(waveBlocks[header].lpData + waveBlockOffset, - waveBlocks[header].dwBytesRecorded - waveBlockOffset); -#ifdef DEBUG_AUDIO - qDebug()<<"IN: "<<waveBlocks[header].dwBytesRecorded<<", OUT: "<<l; -#endif - if(l < 0) { - // error - qWarning("QAudioSource: IOError"); - errorState = QAudio::IOError; - - } else if(l == 0) { - // cant write to IODevice - qWarning("QAudioSource: IOError, can't write to QIODevice"); - errorState = QAudio::IOError; - - } else { - totalTimeValue += l; - errorState = QAudio::NoError; - if (deviceState != QAudio::ActiveState) { - deviceState = QAudio::ActiveState; - emit stateChanged(deviceState); - } - resuming = false; - } - } else { - l = qMin<qint64>(len, waveBlocks[header].dwBytesRecorded - waveBlockOffset); - // push mode - memcpy(p, waveBlocks[header].lpData + waveBlockOffset, l); - - len -= l; - -#ifdef DEBUG_AUDIO - qDebug()<<"IN: "<<waveBlocks[header].dwBytesRecorded<<", OUT: "<<l; -#endif - totalTimeValue += l; - errorState = QAudio::NoError; - if (deviceState != QAudio::ActiveState) { - deviceState = QAudio::ActiveState; - emit stateChanged(deviceState); - } - resuming = false; - } - } else { - //no data, not ready yet, next time - break; - } + m_clientBufferResidue = QByteArray{ m_clientBufferResidue.data() + offset, + m_clientBufferResidue.size() - offset }; - if (l < waveBlocks[header].dwBytesRecorded - waveBlockOffset) { - waveBlockOffset += l; - done = true; - } else { - waveBlockOffset = 0; - - waveInUnprepareHeader(hWaveIn,&waveBlocks[header], sizeof(WAVEHDR)); - - mutex.lock(); - waveFreeBlockCount++; - mutex.unlock(); - - waveBlocks[header].dwBytesRecorded=0; - waveBlocks[header].dwFlags = 0L; - result = waveInPrepareHeader(hWaveIn,&waveBlocks[header], sizeof(WAVEHDR)); - if(result != MMSYSERR_NOERROR) { - result = waveInPrepareHeader(hWaveIn,&waveBlocks[header], sizeof(WAVEHDR)); - qWarning("QAudioSource: failed to prepare block %d,err=%d",header,result); - errorState = QAudio::IOError; - - mutex.lock(); - waveFreeBlockCount--; - mutex.unlock(); - - return 0; - } - result = waveInAddBuffer(hWaveIn, &waveBlocks[header], sizeof(WAVEHDR)); - if(result != MMSYSERR_NOERROR) { - qWarning("QAudioSource: failed to setup block %d,err=%d",header,result); - errorState = QAudio::IOError; - - mutex.lock(); - waveFreeBlockCount--; - mutex.unlock(); - - return 0; - } - header++; - if(header >= buffer_size/period_size) - header = 0; - p+=l; - - mutex.lock(); - if(!pullMode) { - if(len < period_size || waveFreeBlockCount == buffer_size/period_size) - done = true; - } else { - if(waveFreeBlockCount == buffer_size/period_size) - done = true; - } - mutex.unlock(); - } + if (len > 0) { + auto out = readCaptureClientBuffer(); + if (!out.isEmpty()) { + qsizetype copyLen = qMin(out.size(), len); + memcpy(data + offset, out.data(), copyLen); + offset += copyLen; - written+=l; + m_clientBufferResidue = QByteArray{ out.data() + copyLen, out.size() - copyLen }; + } } -#ifdef DEBUG_AUDIO - qDebug()<<"read in len="<<written; -#endif - return written; + + return offset; } void QWindowsAudioSource::resume() { - if (deviceState == QAudio::SuspendedState) { - deviceState = QAudio::ActiveState; - for(int i=0; i<buffer_size/period_size; i++) { - result = waveInAddBuffer(hWaveIn, &waveBlocks[i], sizeof(WAVEHDR)); - if(result != MMSYSERR_NOERROR) { - qWarning("QAudioSource: failed to setup block %d,err=%d",i,result); - errorState = QAudio::OpenError; - deviceState = QAudio::StoppedState; - emit stateChanged(deviceState); - return; - } - } - - mutex.lock(); - waveFreeBlockCount = buffer_size/period_size; - mutex.unlock(); - - header = 0; - resuming = true; - waveBlockOffset = 0; - waveInStart(hWaveIn); - QTimer::singleShot(20,this,SLOT(feedback())); - emit stateChanged(deviceState); + qCDebug(qLcAudioSource) << "resume()"; + if (m_deviceState == QAudio::SuspendedState) { + deviceStateChange(QAudio::ActiveState, QAudio::NoError); + pullCaptureClient(); } } void QWindowsAudioSource::setBufferSize(qsizetype value) { - buffer_size = value; + m_bufferSize = value; } qsizetype QWindowsAudioSource::bufferSize() const { - return buffer_size; + return m_bufferSize; } qint64 QWindowsAudioSource::processedUSecs() const { - if (deviceState == QAudio::StoppedState) + if (m_deviceState == QAudio::StoppedState) return 0; - qint64 result = qint64(1000000) * totalTimeValue / - settings.bytesPerFrame() / settings.sampleRate(); - return result; + return m_resampler.outputFormat().durationForBytes(m_resampler.totalOutputBytes()); } void QWindowsAudioSource::suspend() { - if(deviceState == QAudio::ActiveState) { - deviceState = QAudio::SuspendedState; - waveInReset(hWaveIn); - emit stateChanged(deviceState); - } -} - -void QWindowsAudioSource::feedback() -{ -#ifdef DEBUG_AUDIO - QTime now(QTime::currentTime()); - qDebug()<<now.second()<<"s "<<now.msec()<<"ms :feedback() INPUT "<<this; -#endif - if(deviceState != QAudio::StoppedState && deviceState != QAudio::SuspendedState) - QMetaObject::invokeMethod(this, "deviceReady", Qt::QueuedConnection); -} - -bool QWindowsAudioSource::deviceReady() -{ - bytesAvailable = bytesReady(); -#ifdef DEBUG_AUDIO - QTime now(QTime::currentTime()); - qDebug()<<now.second()<<"s "<<now.msec()<<"ms :deviceReady() INPUT" << bytesReady(); -#endif - if(deviceState != QAudio::ActiveState && deviceState != QAudio::IdleState) - return true; - - if(pullMode) { - // reads some audio data and writes it to QIODevice - read(0, period_size * (buffer_size / period_size)); - } else { - // emits readyRead() so user will call read() on QIODevice to get some audio data - InputPrivate* a = qobject_cast<InputPrivate*>(audioSource); - a->trigger(); - } - - return true; + qCDebug(qLcAudioSource) << "suspend"; + if (m_deviceState == QAudio::ActiveState || m_deviceState == QAudio::IdleState) + deviceStateChange(QAudio::SuspendedState, QAudio::NoError); } void QWindowsAudioSource::reset() { stop(); - if (period_size > 0) - waveFreeBlockCount = buffer_size / period_size; -} - -InputPrivate::InputPrivate(QWindowsAudioSource* audio) -{ - audioDevice = qobject_cast<QWindowsAudioSource*>(audio); -} - -InputPrivate::~InputPrivate() {} - -qint64 InputPrivate::readData( char* data, qint64 len) -{ - // push mode, user read() called - if(audioDevice->deviceState != QAudio::ActiveState && - audioDevice->deviceState != QAudio::IdleState) - return 0; - // Read in some audio data - return audioDevice->read(data,len); -} - -qint64 InputPrivate::writeData(const char* data, qint64 len) -{ - Q_UNUSED(data); - Q_UNUSED(len); - - emit readyRead(); - return 0; -} - -void InputPrivate::trigger() -{ - emit readyRead(); } QT_END_NAMESPACE - -#include "moc_qwindowsaudiosource_p.cpp" diff --git a/src/multimedia/windows/qwindowsaudiosource_p.h b/src/multimedia/windows/qwindowsaudiosource_p.h index 17bbdaaee..68d57bbe1 100644 --- a/src/multimedia/windows/qwindowsaudiosource_p.h +++ b/src/multimedia/windows/qwindowsaudiosource_p.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 // // W A R N I N G @@ -60,29 +24,26 @@ #include <QtCore/qstringlist.h> #include <QtCore/qdatetime.h> #include <QtCore/qmutex.h> +#include <QtCore/qbytearray.h> #include <QtMultimedia/qaudio.h> #include <QtMultimedia/qaudiodevice.h> #include <private/qaudiosystem_p.h> +#include <qwindowsresampler_p.h> -QT_BEGIN_NAMESPACE - +struct IMMDevice; +struct IAudioClient; +struct IAudioCaptureClient; -// For compat with 4.6 -#if !defined(QT_WIN_CALLBACK) -# if defined(Q_CC_MINGW) -# define QT_WIN_CALLBACK CALLBACK __attribute__ ((force_align_arg_pointer)) -# else -# define QT_WIN_CALLBACK CALLBACK -# endif -#endif +QT_BEGIN_NAMESPACE +class QTimer; class QWindowsAudioSource : public QPlatformAudioSource { Q_OBJECT public: - QWindowsAudioSource(int deviceId); + QWindowsAudioSource(ComPtr<IMMDevice> device, QObject *parent); ~QWindowsAudioSource(); qint64 read(char* data, qint64 len); @@ -104,65 +65,30 @@ public: void setVolume(qreal volume) override; qreal volume() const override; - QIODevice* audioSource; - QAudioFormat settings; - QAudio::Error errorState; - QAudio::State deviceState; - private: - qint32 buffer_size; - qint32 period_size; - qint32 header; - int m_deviceId; - int bytesAvailable; - qint64 elapsedTimeOffset; - qint64 totalTimeValue; - bool pullMode; - bool resuming; - WAVEFORMATEXTENSIBLE wfx; - HWAVEIN hWaveIn; - MMRESULT result; - WAVEHDR* waveBlocks; - volatile bool finished; - volatile int waveFreeBlockCount; - int waveBlockOffset; - - QMutex mutex; - static void QT_WIN_CALLBACK waveInProc( HWAVEIN hWaveIn, UINT uMsg, - DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2 ); - - WAVEHDR* allocateBlocks(int size, int count); - void freeBlocks(WAVEHDR* blockArray); + void deviceStateChange(QAudio::State state, QAudio::Error error); + void pullCaptureClient(); + void schedulePull(); + QByteArray readCaptureClientBuffer(); + + QTimer *m_timer = nullptr; + ComPtr<IMMDevice> m_device; + ComPtr<IAudioClient> m_audioClient; + ComPtr<IAudioCaptureClient> m_captureClient; + QWindowsResampler m_resampler; + int m_bufferSize = 0; + qreal m_volume = 1.0; + + QIODevice* m_ourSink = nullptr; + QIODevice* m_clientSink = nullptr; + QAudioFormat m_format; + QAudio::Error m_errorState = QAudio::NoError; + QAudio::State m_deviceState = QAudio::StoppedState; + + QByteArray m_clientBufferResidue; + bool open(); void close(); - - void initMixer(); - void closeMixer(); - HMIXEROBJ mixerID; - MIXERLINECONTROLS mixerLineControls; - qreal cachedVolume; - -private slots: - void feedback(); - bool deviceReady(); - -signals: - void processMore(); -}; - -class InputPrivate : public QIODevice -{ - Q_OBJECT -public: - InputPrivate(QWindowsAudioSource* audio); - ~InputPrivate(); - - qint64 readData( char* data, qint64 len) override; - qint64 writeData(const char* data, qint64 len) override; - - void trigger(); -private: - QWindowsAudioSource *audioDevice; }; QT_END_NAMESPACE diff --git a/src/multimedia/windows/qwindowsaudioutils.cpp b/src/multimedia/windows/qwindowsaudioutils.cpp index af7f6c775..dce4a2135 100644 --- a/src/multimedia/windows/qwindowsaudioutils.cpp +++ b/src/multimedia/windows/qwindowsaudioutils.cpp @@ -1,47 +1,14 @@ -/**************************************************************************** -** -** 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 #include "qwindowsaudioutils_p.h" +#include "qwindowsmediafoundation_p.h" #include "qdebug.h" #include "ks.h" #include "ksmedia.h" +#include <audioclient.h> + QT_BEGIN_NAMESPACE static QAudioFormat::AudioChannelPosition channelFormatMap[] = @@ -190,14 +157,14 @@ QAudioFormat QWindowsAudioUtils::mediaTypeToFormat(IMFMediaType *mediaType) return format; } -QWindowsIUPointer<IMFMediaType> QWindowsAudioUtils::formatToMediaType(const QAudioFormat &format) +ComPtr<IMFMediaType> QWindowsAudioUtils::formatToMediaType(QWindowsMediaFoundation &wmf, const QAudioFormat &format) { - QWindowsIUPointer<IMFMediaType> mediaType; + ComPtr<IMFMediaType> mediaType; if (!format.isValid()) return mediaType; - MFCreateMediaType(mediaType.address()); + wmf.mfCreateMediaType(mediaType.GetAddressOf()); mediaType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio); if (format.sampleFormat() == QAudioFormat::Float) { @@ -220,4 +187,22 @@ QWindowsIUPointer<IMFMediaType> QWindowsAudioUtils::formatToMediaType(const QAud return mediaType; } +std::optional<quint32> QWindowsAudioUtils::audioClientFramesInUse(IAudioClient *client) +{ + Q_ASSERT(client); + UINT32 framesPadding = 0; + if (SUCCEEDED(client->GetCurrentPadding(&framesPadding))) + return framesPadding; + return {}; +} + +std::optional<quint32> QWindowsAudioUtils::audioClientFramesAllocated(IAudioClient *client) +{ + Q_ASSERT(client); + UINT32 bufferFrameCount = 0; + if (SUCCEEDED(client->GetBufferSize(&bufferFrameCount))) + return bufferFrameCount; + return {}; +} + QT_END_NAMESPACE diff --git a/src/multimedia/windows/qwindowsaudioutils_p.h b/src/multimedia/windows/qwindowsaudioutils_p.h index 09ab605dd..9382f372f 100644 --- a/src/multimedia/windows/qwindowsaudioutils_p.h +++ b/src/multimedia/windows/qwindowsaudioutils_p.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 QWINDOWSAUDIOUTILS_H #define QWINDOWSAUDIOUTILS_H @@ -53,22 +17,27 @@ #include <qaudioformat.h> #include <QtCore/qt_windows.h> -#include <private/qwindowsiupointer_p.h> -#include <mfapi.h> -#include <mmsystem.h> +#include <private/qcomptr_p.h> #include <mmreg.h> +#include <optional> + +struct IAudioClient; struct IMFMediaType; QT_BEGIN_NAMESPACE +class QWindowsMediaFoundation; + namespace QWindowsAudioUtils { bool formatToWaveFormatExtensible(const QAudioFormat &format, WAVEFORMATEXTENSIBLE &wfx); QAudioFormat waveFormatExToFormat(const WAVEFORMATEX &in); Q_MULTIMEDIA_EXPORT QAudioFormat mediaTypeToFormat(IMFMediaType *mediaType); - QWindowsIUPointer<IMFMediaType> formatToMediaType(const QAudioFormat &format); + ComPtr<IMFMediaType> formatToMediaType(QWindowsMediaFoundation &, const QAudioFormat &format); QAudioFormat::ChannelConfig maskToChannelConfig(UINT32 mask, int count); + std::optional<quint32> audioClientFramesInUse(IAudioClient *client); + std::optional<quint32> audioClientFramesAllocated(IAudioClient *client); } QT_END_NAMESPACE diff --git a/src/multimedia/windows/qwindowsiupointer_p.h b/src/multimedia/windows/qwindowsiupointer_p.h deleted file mode 100644 index 9e9cf6894..000000000 --- a/src/multimedia/windows/qwindowsiupointer_p.h +++ /dev/null @@ -1,93 +0,0 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ - -#ifndef QWINDOWSIUPOINTER_H -#define QWINDOWSIUPOINTER_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -template <class T> -class QWindowsIUPointer -{ -public: - explicit QWindowsIUPointer(T *ptr = nullptr) : m_ptr(ptr) {} - QWindowsIUPointer(const QWindowsIUPointer<T> &uiPtr) : m_ptr(uiPtr.m_ptr) { if (m_ptr) m_ptr->AddRef(); } - QWindowsIUPointer(QWindowsIUPointer<T> &&uiPtr) : m_ptr(uiPtr.m_ptr) { uiPtr.m_ptr = nullptr; } - ~QWindowsIUPointer() { if (m_ptr) m_ptr->Release(); } - - QWindowsIUPointer& operator=(const QWindowsIUPointer<T> &rhs) { - if (this != &rhs) { - if (m_ptr) - m_ptr->Release(); - m_ptr = rhs.m_ptr; - m_ptr->AddRef(); - } - return *this; - } - - QWindowsIUPointer& operator=(QWindowsIUPointer<T> &&rhs) noexcept { - if (m_ptr) - m_ptr->Release(); - m_ptr = rhs.m_ptr; - rhs.m_ptr = nullptr; - return *this; - } - - explicit operator bool() const { return m_ptr != nullptr; } - T *operator->() const { return m_ptr; } - - T **address() { Q_ASSERT(m_ptr == nullptr); return &m_ptr; } - void reset(T *ptr = nullptr) { if (m_ptr) m_ptr->Release(); m_ptr = ptr; } - T *release() { T *ptr = m_ptr; m_ptr = nullptr; return ptr; } - T *get() const { return m_ptr; } - -private: - T *m_ptr; -}; - -#endif diff --git a/src/multimedia/windows/qwindowsmediadevices.cpp b/src/multimedia/windows/qwindowsmediadevices.cpp index ab223c0d7..c622a721c 100644 --- a/src/multimedia/windows/qwindowsmediadevices.cpp +++ b/src/multimedia/windows/qwindowsmediadevices.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 "qwindowsmediadevices_p.h" #include "qmediadevices.h" @@ -44,68 +8,37 @@ #include "qwindowsaudiosource_p.h" #include "qwindowsaudiosink_p.h" #include "qwindowsaudiodevice_p.h" +#include "qcomtaskresource_p.h" #include <mmsystem.h> #include <mmddk.h> #include <mfobjects.h> #include <mfidl.h> -#include <Mferror.h> +#include <mferror.h> #include <mmdeviceapi.h> #include <qwindowsmfdefs_p.h> #include <QtCore/qmap.h> +#include <private/qcomobject_p.h> +#include <private/qsystemerror_p.h> QT_BEGIN_NAMESPACE -class CMMNotificationClient : public IMMNotificationClient +class CMMNotificationClient : public QComObject<IMMNotificationClient> { - LONG m_cRef; - QWindowsIUPointer<IMMDeviceEnumerator> m_enumerator; + ComPtr<IMMDeviceEnumerator> m_enumerator; QWindowsMediaDevices *m_windowsMediaDevices; QMap<QString, DWORD> m_deviceState; public: CMMNotificationClient(QWindowsMediaDevices *windowsMediaDevices, - QWindowsIUPointer<IMMDeviceEnumerator> enumerator, - QMap<QString, DWORD> &&deviceState) : - m_cRef(1), - m_enumerator(enumerator), - m_windowsMediaDevices(windowsMediaDevices), - m_deviceState(deviceState) + ComPtr<IMMDeviceEnumerator> enumerator, + QMap<QString, DWORD> &&deviceState) + : m_enumerator(enumerator), + m_windowsMediaDevices(windowsMediaDevices), + m_deviceState(deviceState) {} - virtual ~CMMNotificationClient() {} - - // IUnknown methods -- AddRef, Release, and QueryInterface - ULONG STDMETHODCALLTYPE AddRef() override - { - return InterlockedIncrement(&m_cRef); - } - - ULONG STDMETHODCALLTYPE Release() override - { - ULONG ulRef = InterlockedDecrement(&m_cRef); - if (0 == ulRef) { - delete this; - } - return ulRef; - } - - HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, VOID **ppvInterface) override - { - if (IID_IUnknown == riid) { - AddRef(); - *ppvInterface = (IUnknown*)this; - } else if (__uuidof(IMMNotificationClient) == riid) { - AddRef(); - *ppvInterface = (IMMNotificationClient*)this; - } else { - *ppvInterface = NULL; - return E_NOINTERFACE; - } - return S_OK; - } - HRESULT STDMETHODCALLTYPE OnDefaultDeviceChanged(EDataFlow flow, ERole role, LPCWSTR) override { if (role == ERole::eMultimedia) @@ -160,94 +93,107 @@ public: { // windowsMediaDevice may be deleted as we are executing the callback if (flow == EDataFlow::eCapture) { - m_windowsMediaDevices->audioInputsChanged(); + emit m_windowsMediaDevices->audioInputsChanged(); } else if (flow == EDataFlow::eRender) { - m_windowsMediaDevices->audioOutputsChanged(); + emit m_windowsMediaDevices->audioOutputsChanged(); } } void emitAudioDevicesChanged(LPCWSTR deviceID) { - QWindowsIUPointer<IMMDevice> device; - QWindowsIUPointer<IMMEndpoint> endpoint; + ComPtr<IMMDevice> device; + ComPtr<IMMEndpoint> endpoint; EDataFlow flow; - if (SUCCEEDED(m_enumerator->GetDevice(deviceID, device.address())) - && SUCCEEDED(device->QueryInterface(__uuidof(IMMEndpoint), (void**)endpoint.address())) + if (SUCCEEDED(m_enumerator->GetDevice(deviceID, device.GetAddressOf())) + && SUCCEEDED(device->QueryInterface(__uuidof(IMMEndpoint), (void**)endpoint.GetAddressOf())) && SUCCEEDED(endpoint->GetDataFlow(&flow))) { emitAudioDevicesChanged(flow); } } + +private: + // Destructor is not public. Caller should call Release. + ~CMMNotificationClient() override = default; }; QWindowsMediaDevices::QWindowsMediaDevices() : QPlatformMediaDevices() { - CoInitialize(nullptr); - auto hr = CoCreateInstance(__uuidof(MMDeviceEnumerator), nullptr, CLSCTX_INPROC_SERVER,__uuidof(IMMDeviceEnumerator), (void**)&m_deviceEnumerator); - if (SUCCEEDED(hr)) { - QMap<QString, DWORD> devState; - QWindowsIUPointer<IMMDeviceCollection> devColl; - UINT count = 0; + if (FAILED(hr)) { + qWarning("Failed to instantiate IMMDeviceEnumerator (%s)." + "Audio device change notification will be disabled", + qPrintable(QSystemError::windowsComString(hr))); + return; + } - if (SUCCEEDED(m_deviceEnumerator->EnumAudioEndpoints(EDataFlow::eAll, DEVICE_STATEMASK_ALL, devColl.address())) - && SUCCEEDED(devColl->GetCount(&count))) - { - for (UINT i = 0; i < count; i++) { - QWindowsIUPointer<IMMDevice> device; - DWORD state = 0; - LPWSTR id = nullptr; - - if (SUCCEEDED(devColl->Item(i, device.address())) - && SUCCEEDED(device->GetState(&state)) - && SUCCEEDED(device->GetId(&id))) - { - devState.insert(QString::fromWCharArray(id), state); - CoTaskMemFree(id); - } + QMap<QString, DWORD> devState; + ComPtr<IMMDeviceCollection> devColl; + UINT count = 0; + + if (SUCCEEDED(m_deviceEnumerator->EnumAudioEndpoints(EDataFlow::eAll, DEVICE_STATEMASK_ALL, devColl.GetAddressOf())) + && SUCCEEDED(devColl->GetCount(&count))) + { + for (UINT i = 0; i < count; i++) { + ComPtr<IMMDevice> device; + DWORD state = 0; + QComTaskResource<WCHAR> id; + + if (SUCCEEDED(devColl->Item(i, device.GetAddressOf())) + && SUCCEEDED(device->GetState(&state)) + && SUCCEEDED(device->GetId(id.address()))) { + devState.insert(QString::fromWCharArray(id.get()), state); } } + } - m_notificationClient.reset(new CMMNotificationClient(this, m_deviceEnumerator, std::move(devState))); - m_deviceEnumerator->RegisterEndpointNotificationCallback(m_notificationClient.get()); - - } else { - qWarning() << "Audio device change notification disabled"; - } + m_notificationClient = makeComObject<CMMNotificationClient>(this, m_deviceEnumerator, std::move(devState)); + m_deviceEnumerator->RegisterEndpointNotificationCallback(m_notificationClient.Get()); } QWindowsMediaDevices::~QWindowsMediaDevices() { if (m_deviceEnumerator) { - m_deviceEnumerator->UnregisterEndpointNotificationCallback(m_notificationClient.get()); + // Note: Calling UnregisterEndpointNotificationCallback after CoUninitialize + // will abruptly terminate application, preventing remaining destructors from + // being called (QTBUG-120198). + m_deviceEnumerator->UnregisterEndpointNotificationCallback(m_notificationClient.Get()); + } + if (m_warmUpAudioClient) { + HRESULT hr = m_warmUpAudioClient->Stop(); + if (FAILED(hr)) { + qWarning() << "Failed to stop audio engine" << hr; + } } - m_deviceEnumerator.reset(); - m_notificationClient.reset(); - - CoUninitialize(); + m_deviceEnumerator.Reset(); + m_notificationClient.Reset(); + m_warmUpAudioClient.Reset(); } QList<QAudioDevice> QWindowsMediaDevices::availableDevices(QAudioDevice::Mode mode) const { + if (!m_deviceEnumerator) + return {}; + const auto audioOut = mode == QAudioDevice::Output; const auto defaultAudioDeviceID = [this, audioOut]{ const auto dataFlow = audioOut ? EDataFlow::eRender : EDataFlow::eCapture; - QWindowsIUPointer<IMMDevice> dev; - LPWSTR id = nullptr; + ComPtr<IMMDevice> dev; + QComTaskResource<WCHAR> id; QString sid; - if (SUCCEEDED(m_deviceEnumerator->GetDefaultAudioEndpoint(dataFlow, ERole::eMultimedia, dev.address())) - && SUCCEEDED(dev->GetId(&id))) { - sid = QString::fromWCharArray(id); - CoTaskMemFree(id); + if (SUCCEEDED(m_deviceEnumerator->GetDefaultAudioEndpoint(dataFlow, ERole::eMultimedia, dev.GetAddressOf()))) { + if (dev && SUCCEEDED(dev->GetId(id.address()))) { + sid = QString::fromWCharArray(id.get()); + } } return sid.toUtf8(); }(); @@ -271,10 +217,10 @@ QList<QAudioDevice> QWindowsMediaDevices::availableDevices(QAudioDevice::Mode mo if (waveMessage(DRV_QUERYFUNCTIONINSTANCEID, id.data(), len) != MMSYSERR_NOERROR) continue; - QWindowsIUPointer<IMMDevice> device; - QWindowsIUPointer<IPropertyStore> props; - if (FAILED(m_deviceEnumerator->GetDevice(id.data(), device.address())) - || FAILED(device->OpenPropertyStore(STGM_READ, props.address()))) { + ComPtr<IMMDevice> device; + ComPtr<IPropertyStore> props; + if (FAILED(m_deviceEnumerator->GetDevice(id.data(), device.GetAddressOf())) + || FAILED(device->OpenPropertyStore(STGM_READ, props.GetAddressOf()))) { continue; } @@ -306,16 +252,94 @@ QList<QAudioDevice> QWindowsMediaDevices::audioOutputs() const return availableDevices(QAudioDevice::Output); } -QPlatformAudioSource *QWindowsMediaDevices::createAudioSource(const QAudioDevice &deviceInfo) +QPlatformAudioSource *QWindowsMediaDevices::createAudioSource(const QAudioDevice &deviceInfo, + QObject *parent) { const auto *devInfo = static_cast<const QWindowsAudioDeviceInfo *>(deviceInfo.handle()); - return new QWindowsAudioSource(devInfo->waveId()); + return new QWindowsAudioSource(devInfo->immDev(), parent); } -QPlatformAudioSink *QWindowsMediaDevices::createAudioSink(const QAudioDevice &deviceInfo) +QPlatformAudioSink *QWindowsMediaDevices::createAudioSink(const QAudioDevice &deviceInfo, + QObject *parent) { const auto *devInfo = static_cast<const QWindowsAudioDeviceInfo *>(deviceInfo.handle()); - return new QWindowsAudioSink(devInfo->immDev()); + return new QWindowsAudioSink(devInfo->immDev(), parent); +} + +static bool isPrepareAudioEnabled() +{ + static bool isDisableAudioPrepareSet = false; + static const int disableAudioPrepare = + qEnvironmentVariableIntValue("QT_DISABLE_AUDIO_PREPARE", &isDisableAudioPrepareSet); + + return !isDisableAudioPrepareSet || disableAudioPrepare == 0; +} + +void QWindowsMediaDevices::prepareAudio() +{ + if (!isPrepareAudioEnabled()) + return; + + if (m_isAudioClientWarmedUp.exchange(true)) + return; + + ComPtr<IMMDeviceEnumerator> deviceEnumerator; + HRESULT hr = CoCreateInstance(__uuidof(MMDeviceEnumerator), nullptr, CLSCTX_ALL, + __uuidof(IMMDeviceEnumerator), + reinterpret_cast<void **>(deviceEnumerator.GetAddressOf())); + if (FAILED(hr)) { + qWarning() << "Failed to create device enumerator" << hr; + return; + } + + ComPtr<IMMDevice> device; + hr = deviceEnumerator->GetDefaultAudioEndpoint(eRender, eConsole, device.GetAddressOf()); + if (FAILED(hr)) { + if (hr != E_NOTFOUND) + qWarning() << "Failed to retrieve default audio endpoint" << hr; + return; + } + + hr = device->Activate(__uuidof(IAudioClient3), CLSCTX_ALL, nullptr, + reinterpret_cast<void **>(m_warmUpAudioClient.GetAddressOf())); + if (FAILED(hr)) { + qWarning() << "Failed to activate audio engine" << hr; + return; + } + + QComTaskResource<WAVEFORMATEX> deviceFormat; + UINT32 currentPeriodInFrames = 0; + hr = m_warmUpAudioClient->GetCurrentSharedModeEnginePeriod(deviceFormat.address(), + ¤tPeriodInFrames); + if (FAILED(hr)) { + qWarning() << "Failed to retrieve the current format and periodicity of the audio engine" + << hr; + return; + } + + UINT32 defaultPeriodInFrames = 0; + UINT32 fundamentalPeriodInFrames = 0; + UINT32 minPeriodInFrames = 0; + UINT32 maxPeriodInFrames = 0; + hr = m_warmUpAudioClient->GetSharedModeEnginePeriod(deviceFormat.get(), &defaultPeriodInFrames, + &fundamentalPeriodInFrames, + &minPeriodInFrames, &maxPeriodInFrames); + if (FAILED(hr)) { + qWarning() << "Failed to retrieve the range of periodicities supported by the audio engine" + << hr; + return; + } + + hr = m_warmUpAudioClient->InitializeSharedAudioStream( + AUDCLNT_SHAREMODE_SHARED, minPeriodInFrames, deviceFormat.get(), nullptr); + if (FAILED(hr)) { + qWarning() << "Failed to initialize audio engine stream" << hr; + return; + } + + hr = m_warmUpAudioClient->Start(); + if (FAILED(hr)) + qWarning() << "Failed to start audio engine" << hr; } QT_END_NAMESPACE diff --git a/src/multimedia/windows/qwindowsmediadevices_p.h b/src/multimedia/windows/qwindowsmediadevices_p.h index da5aaf18c..c82be8a0d 100644 --- a/src/multimedia/windows/qwindowsmediadevices_p.h +++ b/src/multimedia/windows/qwindowsmediadevices_p.h @@ -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 #ifndef QWINDOWSMEDIADEVICES_H #define QWINDOWSMEDIADEVICES_H @@ -52,10 +16,13 @@ // #include <private/qplatformmediadevices_p.h> -#include <private/qwindowsiupointer_p.h> +#include <private/qcomptr_p.h> +#include <QtCore/private/qfunctions_win_p.h> +#include <private/qwindowsmediafoundation_p.h> #include <qaudiodevice.h> +struct IAudioClient3; struct IMMDeviceEnumerator; QT_BEGIN_NAMESPACE @@ -71,14 +38,24 @@ public: QList<QAudioDevice> audioInputs() const override; QList<QAudioDevice> audioOutputs() const override; - QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo) override; - QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo) override; + QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo, + QObject *parent) override; + QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo, + QObject *parent) override; + + void prepareAudio() override; private: + QComHelper m_comRuntime; + QMFRuntimeInit m_wmfRuntime{ QWindowsMediaFoundation::instance() }; QList<QAudioDevice> availableDevices(QAudioDevice::Mode mode) const; - QWindowsIUPointer<IMMDeviceEnumerator> m_deviceEnumerator; - QWindowsIUPointer<CMMNotificationClient> m_notificationClient; + ComPtr<IMMDeviceEnumerator> m_deviceEnumerator; + ComPtr<CMMNotificationClient> m_notificationClient; + // The "warm-up" audio client is required to run in the background in order to keep audio engine + // ready for audio output immediately after creating any other subsequent audio client. + ComPtr<IAudioClient3> m_warmUpAudioClient; + std::atomic_bool m_isAudioClientWarmedUp = false; friend CMMNotificationClient; }; diff --git a/src/multimedia/windows/qwindowsmediafoundation.cpp b/src/multimedia/windows/qwindowsmediafoundation.cpp new file mode 100644 index 000000000..7094c9551 --- /dev/null +++ b/src/multimedia/windows/qwindowsmediafoundation.cpp @@ -0,0 +1,70 @@ +// 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 "qwindowsmediafoundation_p.h" +#include <QtCore/qdebug.h> + +QT_BEGIN_NAMESPACE + +namespace { + +Q_GLOBAL_STATIC(QWindowsMediaFoundation, s_wmf); + +template <typename T> +bool setProcAddress(QSystemLibrary &lib, T &f, const char name[]) +{ + f = reinterpret_cast<T>(lib.resolve(name)); + return static_cast<bool>(f); +} + +} // namespace + +QWindowsMediaFoundation *QWindowsMediaFoundation::instance() +{ + if (s_wmf->valid()) + return s_wmf; + + return nullptr; +} + +QWindowsMediaFoundation::QWindowsMediaFoundation() +{ + if (!m_mfplat.load(false)) + return; + + m_valid = setProcAddress(m_mfplat, mfStartup, "MFStartup") + && setProcAddress(m_mfplat, mfShutdown, "MFShutdown") + && setProcAddress(m_mfplat, mfCreateMediaType, "MFCreateMediaType") + && setProcAddress(m_mfplat, mfCreateMemoryBuffer, "MFCreateMemoryBuffer") + && setProcAddress(m_mfplat, mfCreateSample, "MFCreateSample"); + + Q_ASSERT(m_valid); // If it is not valid at this point, we have a programming bug +} + +QWindowsMediaFoundation::~QWindowsMediaFoundation() = default; + +bool QWindowsMediaFoundation::valid() const +{ + return m_valid; +} + +QMFRuntimeInit::QMFRuntimeInit(QWindowsMediaFoundation *wmf) + : m_wmf{ wmf }, m_initResult{ wmf ? m_wmf->mfStartup(MF_VERSION, MFSTARTUP_FULL) : E_FAIL } +{ + if (m_initResult != S_OK) + qErrnoWarning(m_initResult, "Failed to initialize Windows Media Foundation"); +} + +QMFRuntimeInit::~QMFRuntimeInit() +{ + // According to documentation MFShutdown should be called + // also when MFStartup failed. This is wrong. + if (FAILED(m_initResult)) + return; + + const HRESULT hr = m_wmf->mfShutdown(); + if (hr != S_OK) + qErrnoWarning(hr, "Failed to shut down Windows Media Foundation"); +} + +QT_END_NAMESPACE diff --git a/src/multimedia/windows/qwindowsmediafoundation_p.h b/src/multimedia/windows/qwindowsmediafoundation_p.h new file mode 100644 index 000000000..6dabc261e --- /dev/null +++ b/src/multimedia/windows/qwindowsmediafoundation_p.h @@ -0,0 +1,59 @@ +// 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 + +#ifndef QWINDOWSMEDIAFOUNDATION_H +#define QWINDOWSMEDIAFOUNDATION_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <private/qtmultimediaglobal_p.h> +#include <QtCore/private/qsystemlibrary_p.h> +#include <mfapi.h> + +QT_BEGIN_NAMESPACE + +class QWindowsMediaFoundation +{ +public: + static QWindowsMediaFoundation *instance(); + + QWindowsMediaFoundation(); + ~QWindowsMediaFoundation(); + + bool valid() const; + + decltype(&::MFStartup) mfStartup = nullptr; + decltype(&::MFShutdown) mfShutdown = nullptr; + decltype(&::MFCreateMediaType) mfCreateMediaType = nullptr; + decltype(&::MFCreateMemoryBuffer) mfCreateMemoryBuffer = nullptr; + decltype(&::MFCreateSample) mfCreateSample = nullptr; + +private: + QSystemLibrary m_mfplat{ QStringLiteral("Mfplat.dll") }; + bool m_valid = false; +}; + +class QMFRuntimeInit +{ + Q_DISABLE_COPY_MOVE(QMFRuntimeInit) +public: + QMFRuntimeInit(QWindowsMediaFoundation *wmf); + ~QMFRuntimeInit(); + +private: + QWindowsMediaFoundation *m_wmf; + HRESULT m_initResult; +}; + +QT_END_NAMESPACE + +#endif // QWINDOWSMEDIAFOUNDATION_H diff --git a/src/multimedia/windows/qwindowsmfdefs.cpp b/src/multimedia/windows/qwindowsmfdefs.cpp index 97eae9743..ef8c99922 100644 --- a/src/multimedia/windows/qwindowsmfdefs.cpp +++ b/src/multimedia/windows/qwindowsmfdefs.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 "qwindowsmfdefs_p.h" @@ -55,7 +19,7 @@ const GUID QMM_MF_SD_STREAM_NAME = {0x4f1b099d, 0xd314, 0x41e5, {0xa7, 0x81, 0x7 const GUID QMM_MF_SD_LANGUAGE = {0xaf2180, 0xbdc2, 0x423c, {0xab, 0xca, 0xf5, 0x3, 0x59, 0x3b, 0xc1, 0x21}}; const GUID QMM_KSCATEGORY_VIDEO_CAMERA = {0xe5323777, 0xf976, 0x4f5b, {0x9b, 0x55, 0xb9, 0x46, 0x99, 0xc4, 0x6e, 0x44}}; - +const GUID QMM_KSCATEGORY_SENSOR_CAMERA = {0x24e552d7, 0x6523, 0x47f7, {0xa6, 0x47, 0xd3, 0x46, 0x5b, 0xf1, 0xf5, 0xca}}; const GUID QMM_MR_POLICY_VOLUME_SERVICE = {0x1abaa2ac, 0x9d3b, 0x47c6, {0xab, 0x48, 0xc5, 0x95, 0x6, 0xde, 0x78, 0x4d}}; const PROPERTYKEY QMM_PKEY_Device_FriendlyName = {{0xa45c254e, 0xdf1c, 0x4efd, {0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0}}, 14}; diff --git a/src/multimedia/windows/qwindowsmfdefs_p.h b/src/multimedia/windows/qwindowsmfdefs_p.h index 5bae90d18..4bb90dbe3 100644 --- a/src/multimedia/windows/qwindowsmfdefs_p.h +++ b/src/multimedia/windows/qwindowsmfdefs_p.h @@ -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 #ifndef QWINDOWSMFDEFS_P_H #define QWINDOWSMFDEFS_P_H @@ -74,6 +38,7 @@ Q_MULTIMEDIA_EXPORT extern const GUID QMM_MF_SD_STREAM_NAME; Q_MULTIMEDIA_EXPORT extern const GUID QMM_MF_SD_LANGUAGE; Q_MULTIMEDIA_EXPORT extern const GUID QMM_KSCATEGORY_VIDEO_CAMERA; +Q_MULTIMEDIA_EXPORT extern const GUID QMM_KSCATEGORY_SENSOR_CAMERA; Q_MULTIMEDIA_EXPORT extern const GUID QMM_MR_POLICY_VOLUME_SERVICE; @@ -83,6 +48,7 @@ extern "C" HRESULT WINAPI MFCreateDeviceSource(IMFAttributes *pAttributes, IMFMe #define QMM_MFSESSION_GETFULLTOPOLOGY_CURRENT 1 #define QMM_PRESENTATION_CURRENT_POSITION 0x7fffffffffffffff +#define QMM_WININET_E_CANNOT_CONNECT ((HRESULT)0x80072EFDL) #ifndef __IMFVideoProcessor_INTERFACE_DEFINED__ #define __IMFVideoProcessor_INTERFACE_DEFINED__ 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 diff --git a/src/multimedia/windows/qwindowsmultimediautils_p.h b/src/multimedia/windows/qwindowsmultimediautils_p.h index 3821a058e..58ecd425f 100644 --- a/src/multimedia/windows/qwindowsmultimediautils_p.h +++ b/src/multimedia/windows/qwindowsmultimediautils_p.h @@ -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 #ifndef QWINDOWSMULTIMEDIATUTILS_P_H #define QWINDOWSMULTIMEDIATUTILS_P_H @@ -55,6 +19,7 @@ #include <private/qplatformmediaformatinfo_p.h> #include <qvideoframeformat.h> #include <guiddef.h> +#include <qstring.h> QT_BEGIN_NAMESPACE @@ -73,6 +38,8 @@ namespace QWindowsMultimediaUtils { Q_MULTIMEDIA_EXPORT GUID containerForVideoFileFormat(QMediaFormat::FileFormat format); Q_MULTIMEDIA_EXPORT GUID containerForAudioFileFormat(QMediaFormat::FileFormat format); + + Q_MULTIMEDIA_EXPORT QString errorString(HRESULT hr); } QT_END_NAMESPACE diff --git a/src/multimedia/windows/qwindowsresampler.cpp b/src/multimedia/windows/qwindowsresampler.cpp index 5b09830cc..3c50c0c19 100644 --- a/src/multimedia/windows/qwindowsresampler.cpp +++ b/src/multimedia/windows/qwindowsresampler.cpp @@ -1,59 +1,26 @@ -/**************************************************************************** -** -** 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 "qwindowsresampler_p.h" #include <qwindowsaudioutils_p.h> #include <qloggingcategory.h> +#include <QUuid> -#include <Wmcodecdsp.h> +#include <wmcodecdsp.h> #include <mftransform.h> -#include <mfapi.h> #include <mferror.h> QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(qLcAudioResampler, "qt.multimedia.audioresampler") +QUuid qIID_IMFTransform(0xbf94c121, 0x5b05, 0x4e6f, 0x80,0x00, 0xba,0x59,0x89,0x61,0x41,0x4d); +QUuid qCLSID_CResamplerMediaObject("f447b69e-1884-4a7e-8055-346f74d6edb3"); + +static Q_LOGGING_CATEGORY(qLcAudioResampler, "qt.multimedia.audioresampler") QWindowsResampler::QWindowsResampler() { - CoCreateInstance(CLSID_CResamplerMediaObject, nullptr, CLSCTX_INPROC_SERVER, - IID_IMFTransform, (LPVOID*)(m_resampler.address())); + CoCreateInstance(qCLSID_CResamplerMediaObject, nullptr, CLSCTX_INPROC_SERVER, + qIID_IMFTransform, (LPVOID*)(m_resampler.GetAddressOf())); if (m_resampler) m_resampler->AddInputStreams(1, &m_inputStreamID); } @@ -78,13 +45,13 @@ quint64 QWindowsResampler::inputBufferSize(quint64 outputBufferSize) const HRESULT QWindowsResampler::processInput(const QByteArrayView &in) { - QWindowsIUPointer<IMFSample> sample; - HRESULT hr = MFCreateSample(sample.address()); + ComPtr<IMFSample> sample; + HRESULT hr = m_wmf->mfCreateSample(sample.GetAddressOf()); if (FAILED(hr)) return hr; - QWindowsIUPointer<IMFMediaBuffer> buffer; - hr = MFCreateMemoryBuffer(in.size(), buffer.address()); + ComPtr<IMFMediaBuffer> buffer; + hr = m_wmf->mfCreateMemoryBuffer(in.size(), buffer.GetAddressOf()); if (FAILED(hr)) return hr; @@ -105,29 +72,29 @@ HRESULT QWindowsResampler::processInput(const QByteArrayView &in) if (FAILED(hr)) return hr; - hr = sample->AddBuffer(buffer.get()); + hr = sample->AddBuffer(buffer.Get()); if (FAILED(hr)) return hr; - return m_resampler->ProcessInput(m_inputStreamID, sample.get(), 0); + return m_resampler->ProcessInput(m_inputStreamID, sample.Get(), 0); } HRESULT QWindowsResampler::processOutput(QByteArray &out) { - QWindowsIUPointer<IMFSample> sample; - QWindowsIUPointer<IMFMediaBuffer> buffer; + ComPtr<IMFSample> sample; + ComPtr<IMFMediaBuffer> buffer; if (m_resamplerNeedsSampleBuffer) { - HRESULT hr = MFCreateSample(sample.address()); + HRESULT hr = m_wmf->mfCreateSample(sample.GetAddressOf()); if (FAILED(hr)) return hr; auto expectedOutputSize = outputBufferSize(m_totalInputBytes) - m_totalOutputBytes; - hr = MFCreateMemoryBuffer(expectedOutputSize, buffer.address()); + hr = m_wmf->mfCreateMemoryBuffer(expectedOutputSize, buffer.GetAddressOf()); if (FAILED(hr)) return hr; - hr = sample->AddBuffer(buffer.get()); + hr = sample->AddBuffer(buffer.Get()); if (FAILED(hr)) return hr; } @@ -139,12 +106,12 @@ HRESULT QWindowsResampler::processOutput(QByteArray &out) do { outputDataBuffer.pEvents = nullptr; outputDataBuffer.dwStatus = 0; - outputDataBuffer.pSample = m_resamplerNeedsSampleBuffer ? sample.get() : nullptr; + outputDataBuffer.pSample = m_resamplerNeedsSampleBuffer ? sample.Get() : nullptr; DWORD status = 0; hr = m_resampler->ProcessOutput(0, 1, &outputDataBuffer, &status); if (SUCCEEDED(hr)) { - QWindowsIUPointer<IMFMediaBuffer> outputBuffer; - outputDataBuffer.pSample->ConvertToContiguousBuffer(outputBuffer.address()); + ComPtr<IMFMediaBuffer> outputBuffer; + outputDataBuffer.pSample->ConvertToContiguousBuffer(outputBuffer.GetAddressOf()); DWORD len = 0; BYTE *data = nullptr; hr = outputBuffer->Lock(&data, nullptr, &len); @@ -169,7 +136,7 @@ QByteArray QWindowsResampler::resample(const QByteArrayView &in) return {in.data(), in.size()}; } else { - Q_ASSERT(m_resampler); + Q_ASSERT(m_resampler && m_wmf); QByteArray out; HRESULT hr = processInput(in); @@ -198,8 +165,8 @@ QByteArray QWindowsResampler::resample(IMFSample *sample) QByteArray out; if (m_inputFormat == m_outputFormat) { - QWindowsIUPointer<IMFMediaBuffer> outputBuffer; - sample->ConvertToContiguousBuffer(outputBuffer.address()); + ComPtr<IMFMediaBuffer> outputBuffer; + sample->ConvertToContiguousBuffer(outputBuffer.GetAddressOf()); DWORD len = 0; BYTE *data = nullptr; hr = outputBuffer->Lock(&data, nullptr, &len); @@ -208,7 +175,7 @@ QByteArray QWindowsResampler::resample(IMFSample *sample) outputBuffer->Unlock(); } else { - Q_ASSERT(m_resampler); + Q_ASSERT(m_resampler && m_wmf); hr = m_resampler->ProcessInput(m_inputStreamID, sample, 0); if (SUCCEEDED(hr)) @@ -237,18 +204,19 @@ bool QWindowsResampler::setup(const QAudioFormat &fin, const QAudioFormat &fout) return true; } - Q_ASSERT(m_resampler); + if (!m_resampler || !m_wmf) + return false; - QWindowsIUPointer<IMFMediaType> min = QWindowsAudioUtils::formatToMediaType(fin); - QWindowsIUPointer<IMFMediaType> mout = QWindowsAudioUtils::formatToMediaType(fout); + ComPtr<IMFMediaType> min = QWindowsAudioUtils::formatToMediaType(*m_wmf, fin); + ComPtr<IMFMediaType> mout = QWindowsAudioUtils::formatToMediaType(*m_wmf, fout); - HRESULT hr = m_resampler->SetInputType(m_inputStreamID, min.get(), 0); + HRESULT hr = m_resampler->SetInputType(m_inputStreamID, min.Get(), 0); if (FAILED(hr)) { qCWarning(qLcAudioResampler) << "Failed to set input type" << hr; return false; } - hr = m_resampler->SetOutputType(0, mout.get(), 0); + hr = m_resampler->SetOutputType(0, mout.Get(), 0); if (FAILED(hr)) { qCWarning(qLcAudioResampler) << "Failed to set output type" << hr; return false; diff --git a/src/multimedia/windows/qwindowsresampler_p.h b/src/multimedia/windows/qwindowsresampler_p.h index ce2be58ac..5885bffa6 100644 --- a/src/multimedia/windows/qwindowsresampler_p.h +++ b/src/multimedia/windows/qwindowsresampler_p.h @@ -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 #ifndef QT_QWINDOWSRESAMPLER_H @@ -55,15 +19,19 @@ #include <qbytearray.h> #include <qbytearrayview.h> #include <qaudioformat.h> -#include <private/qwindowsiupointer_p.h> +#include <private/qcomptr_p.h> +#include <private/qwindowsmediafoundation_p.h> #include <qt_windows.h> #include <mftransform.h> +#include <QtCore/private/qfunctions_win_p.h> struct IMFSample; struct IMFTransform; QT_BEGIN_NAMESPACE +class QWindowsMediaFoundation; + class Q_MULTIMEDIA_EXPORT QWindowsResampler { public: @@ -88,7 +56,10 @@ private: HRESULT processInput(const QByteArrayView &in); HRESULT processOutput(QByteArray &out); - QWindowsIUPointer<IMFTransform> m_resampler; + QComHelper m_comRuntime; + QWindowsMediaFoundation *m_wmf{ QWindowsMediaFoundation::instance() }; + QMFRuntimeInit m_wmfRuntime{ m_wmf }; + ComPtr<IMFTransform> m_resampler; bool m_resamplerNeedsSampleBuffer = false; quint64 m_totalInputBytes = 0; |
