diff options
Diffstat (limited to 'src/multimedia/darwin/qdarwinaudiosink_p.h')
| -rw-r--r-- | src/multimedia/darwin/qdarwinaudiosink_p.h | 102 |
1 files changed, 30 insertions, 72 deletions
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 |