diff options
Diffstat (limited to 'src/plugins/multimedia/darwin/avfaudiodecoder_p.h')
| -rw-r--r-- | src/plugins/multimedia/darwin/avfaudiodecoder_p.h | 83 |
1 files changed, 26 insertions, 57 deletions
diff --git a/src/plugins/multimedia/darwin/avfaudiodecoder_p.h b/src/plugins/multimedia/darwin/avfaudiodecoder_p.h index 73a8cbd38..81ef3f49e 100644 --- a/src/plugins/multimedia/darwin/avfaudiodecoder_p.h +++ b/src/plugins/multimedia/darwin/avfaudiodecoder_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 AVFAUDIODECODER_H #define AVFAUDIODECODER_H @@ -54,6 +18,9 @@ #include <QtMultimedia/private/qtmultimediaglobal_p.h> #include <QObject> #include <QtCore/qurl.h> +#include <QWaitCondition> +#include <QMutex> +#include <QQueue> #include "private/qplatformaudiodecoder_p.h" #include "qaudiodecoder.h" @@ -71,6 +38,8 @@ class AVFAudioDecoder : public QPlatformAudioDecoder { Q_OBJECT + struct DecodingContext; + public: AVFAudioDecoder(QAudioDecoder *parent); virtual ~AVFAudioDecoder(); @@ -88,41 +57,41 @@ public: void setAudioFormat(const QAudioFormat &format) override; QAudioBuffer read() override; - bool bufferAvailable() const override; - - qint64 position() const override; - qint64 duration() const override; -private slots: +private: void handleNewAudioBuffer(QAudioBuffer); void startReading(); -signals: - void newAudioBuffer(QAudioBuffer); - void readyToRead(); - -private: void processInvalidMedia(QAudioDecoder::Error errorCode, const QString& errorString); void initAssetReader(); + void onFinished(); + + void waitUntilBuffersCounterLessMax(); + + void decBuffersCounter(uint val); + template<typename F> + void invokeWithDecodingContext(std::weak_ptr<DecodingContext> weakContext, F &&f); + +private: QUrl m_source; QIODevice *m_device = nullptr; QAudioFormat m_format; - int m_buffersAvailable = 0; - QList<QAudioBuffer> m_cachedBuffers; - - qint64 m_position = -1; - qint64 m_duration = -1; - - bool m_loadingSource = false; + // Use a separate counter instead of buffers queue size in order to + // ensure atomic access and also make mutex locking shorter + std::atomic<int> m_buffersCounter = 0; + QQueue<QAudioBuffer> m_cachedBuffers; AVURLAsset *m_asset = nullptr; - AVAssetReader *m_reader = nullptr; - AVAssetReaderTrackOutput *m_readerOutput = nullptr; + AVFResourceReaderDelegate *m_readerDelegate = nullptr; dispatch_queue_t m_readingQueue; dispatch_queue_t m_decodingQueue; + + std::shared_ptr<DecodingContext> m_decodingContext; + QMutex m_buffersCounterMutex; + QWaitCondition m_buffersCounterCondition; }; QT_END_NAMESPACE |