summaryrefslogtreecommitdiffstats
path: root/examples/multimedia/audiooutput/audiooutput.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'examples/multimedia/audiooutput/audiooutput.cpp')
-rw-r--r--examples/multimedia/audiooutput/audiooutput.cpp188
1 files changed, 63 insertions, 125 deletions
diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp
index b6eb41f69..809b79293 100644
--- a/examples/multimedia/audiooutput/audiooutput.cpp
+++ b/examples/multimedia/audiooutput/audiooutput.cpp
@@ -1,65 +1,16 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples 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 "audiooutput.h"
-#include <QAudioDeviceInfo>
-#include <QAudioOutput>
+#include <QAudioDevice>
+#include <QAudioSink>
#include <QDebug>
#include <QVBoxLayout>
-#include <qmath.h>
-#include <qendian.h>
+#include <QtEndian>
+#include <QtMath>
-Generator::Generator(const QAudioFormat &format
- , qint64 durationUs
- , int sampleRate)
+Generator::Generator(const QAudioFormat &format, qint64 durationUs, int sampleRate)
{
if (format.isValid())
generateData(format, durationUs, sampleRate);
@@ -78,10 +29,9 @@ void Generator::stop()
void Generator::generateData(const QAudioFormat &format, qint64 durationUs, int sampleRate)
{
- const int channelBytes = format.sampleSize() / 8;
+ const int channelBytes = format.bytesPerSample();
const int sampleBytes = format.channelCount() * channelBytes;
- qint64 length = (format.sampleRate() * format.channelCount() * (format.sampleSize() / 8))
- * durationUs / 1000000;
+ qint64 length = format.bytesForDuration(durationUs);
Q_ASSERT(length % sampleBytes == 0);
Q_UNUSED(sampleBytes); // suppress warning in release builds
@@ -91,30 +41,25 @@ void Generator::generateData(const QAudioFormat &format, qint64 durationUs, int
while (length) {
// Produces value (-1..1)
- const qreal x = qSin(2 * M_PI * sampleRate * qreal(sampleIndex++ % format.sampleRate()) / format.sampleRate());
- for (int i=0; i<format.channelCount(); ++i) {
- if (format.sampleSize() == 8) {
- if (format.sampleType() == QAudioFormat::UnSignedInt) {
- const quint8 value = static_cast<quint8>((1.0 + x) / 2 * 255);
- *reinterpret_cast<quint8 *>(ptr) = value;
- } else if (format.sampleType() == QAudioFormat::SignedInt) {
- const qint8 value = static_cast<qint8>(x * 127);
- *reinterpret_cast<qint8 *>(ptr) = value;
- }
- } else if (format.sampleSize() == 16) {
- if (format.sampleType() == QAudioFormat::UnSignedInt) {
- quint16 value = static_cast<quint16>((1.0 + x) / 2 * 65535);
- if (format.byteOrder() == QAudioFormat::LittleEndian)
- qToLittleEndian<quint16>(value, ptr);
- else
- qToBigEndian<quint16>(value, ptr);
- } else if (format.sampleType() == QAudioFormat::SignedInt) {
- qint16 value = static_cast<qint16>(x * 32767);
- if (format.byteOrder() == QAudioFormat::LittleEndian)
- qToLittleEndian<qint16>(value, ptr);
- else
- qToBigEndian<qint16>(value, ptr);
- }
+ const qreal x = qSin(2 * M_PI * sampleRate * qreal(sampleIndex++ % format.sampleRate())
+ / format.sampleRate());
+ for (int i = 0; i < format.channelCount(); ++i) {
+ switch (format.sampleFormat()) {
+ case QAudioFormat::UInt8:
+ *reinterpret_cast<quint8 *>(ptr) = static_cast<quint8>((1.0 + x) / 2 * 255);
+ break;
+ case QAudioFormat::Int16:
+ *reinterpret_cast<qint16 *>(ptr) = static_cast<qint16>(x * 32767);
+ break;
+ case QAudioFormat::Int32:
+ *reinterpret_cast<qint32 *>(ptr) =
+ static_cast<qint32>(x * std::numeric_limits<qint32>::max());
+ break;
+ case QAudioFormat::Float:
+ *reinterpret_cast<float *>(ptr) = x;
+ break;
+ default:
+ break;
}
ptr += channelBytes;
@@ -150,11 +95,10 @@ qint64 Generator::bytesAvailable() const
return m_buffer.size() + QIODevice::bytesAvailable();
}
-AudioTest::AudioTest()
- : m_pushTimer(new QTimer(this))
+AudioTest::AudioTest() : m_devices(new QMediaDevices(this)), m_pushTimer(new QTimer(this))
{
initializeWindow();
- initializeAudio(QAudioDeviceInfo::defaultOutputDevice());
+ initializeAudio(m_devices->defaultAudioOutput());
}
AudioTest::~AudioTest()
@@ -168,13 +112,15 @@ void AudioTest::initializeWindow()
QVBoxLayout *layout = new QVBoxLayout;
m_deviceBox = new QComboBox(this);
- const QAudioDeviceInfo &defaultDeviceInfo = QAudioDeviceInfo::defaultOutputDevice();
- m_deviceBox->addItem(defaultDeviceInfo.deviceName(), QVariant::fromValue(defaultDeviceInfo));
- for (auto &deviceInfo: QAudioDeviceInfo::availableDevices(QAudio::AudioOutput)) {
+ const QAudioDevice &defaultDeviceInfo = m_devices->defaultAudioOutput();
+ m_deviceBox->addItem(defaultDeviceInfo.description(), QVariant::fromValue(defaultDeviceInfo));
+ for (auto &deviceInfo : m_devices->audioOutputs()) {
if (deviceInfo != defaultDeviceInfo)
- m_deviceBox->addItem(deviceInfo.deviceName(), QVariant::fromValue(deviceInfo));
+ m_deviceBox->addItem(deviceInfo.description(), QVariant::fromValue(deviceInfo));
}
- connect(m_deviceBox, QOverload<int>::of(&QComboBox::activated), this, &AudioTest::deviceChanged);
+ connect(m_deviceBox, QOverload<int>::of(&QComboBox::activated), this,
+ &AudioTest::deviceChanged);
+ connect(m_devices, &QMediaDevices::audioOutputsChanged, this, &AudioTest::updateAudioDevices);
layout->addWidget(m_deviceBox);
m_modeButton = new QPushButton(this);
@@ -203,29 +149,17 @@ void AudioTest::initializeWindow()
window->show();
}
-void AudioTest::initializeAudio(const QAudioDeviceInfo &deviceInfo)
+void AudioTest::initializeAudio(const QAudioDevice &deviceInfo)
{
- QAudioFormat format;
- format.setSampleRate(44100);
- format.setChannelCount(1);
- format.setSampleSize(16);
- format.setCodec("audio/pcm");
- format.setByteOrder(QAudioFormat::LittleEndian);
- format.setSampleType(QAudioFormat::SignedInt);
-
- if (!deviceInfo.isFormatSupported(format)) {
- qWarning() << "Default format not supported - trying to use nearest";
- format = deviceInfo.nearestFormat(format);
- }
+ QAudioFormat format = deviceInfo.preferredFormat();
const int durationSeconds = 1;
const int toneSampleRateHz = 600;
m_generator.reset(new Generator(format, durationSeconds * 1000000, toneSampleRateHz));
- m_audioOutput.reset(new QAudioOutput(deviceInfo, format));
+ m_audioOutput.reset(new QAudioSink(deviceInfo, format));
m_generator->start();
- qreal initialVolume = QAudio::convertVolume(m_audioOutput->volume(),
- QAudio::LinearVolumeScale,
+ qreal initialVolume = QAudio::convertVolume(m_audioOutput->volume(), QAudio::LinearVolumeScale,
QAudio::LogarithmicVolumeScale);
m_volumeSlider->setValue(qRound(initialVolume * 100));
toggleMode();
@@ -236,18 +170,25 @@ void AudioTest::deviceChanged(int index)
m_generator->stop();
m_audioOutput->stop();
m_audioOutput->disconnect(this);
- initializeAudio(m_deviceBox->itemData(index).value<QAudioDeviceInfo>());
+ initializeAudio(m_deviceBox->itemData(index).value<QAudioDevice>());
}
void AudioTest::volumeChanged(int value)
{
- qreal linearVolume = QAudio::convertVolume(value / qreal(100),
- QAudio::LogarithmicVolumeScale,
+ qreal linearVolume = QAudio::convertVolume(value / qreal(100), QAudio::LogarithmicVolumeScale,
QAudio::LinearVolumeScale);
m_audioOutput->setVolume(linearVolume);
}
+void AudioTest::updateAudioDevices()
+{
+ m_deviceBox->clear();
+ const QList<QAudioDevice> devices = m_devices->audioOutputs();
+ for (const QAudioDevice &deviceInfo : devices)
+ m_deviceBox->addItem(deviceInfo.description(), QVariant::fromValue(deviceInfo));
+}
+
void AudioTest::toggleMode()
{
m_pushTimer->stop();
@@ -255,11 +196,11 @@ void AudioTest::toggleMode()
toggleSuspendResume();
if (m_pullMode) {
- //switch to pull mode (QAudioOutput pulls from Generator as needed)
+ // switch to pull mode (QAudioSink pulls from Generator as needed)
m_modeButton->setText(tr("Enable push mode"));
m_audioOutput->start(m_generator.data());
} else {
- //switch to push mode (periodically push to QAudioOutput using a timer)
+ // switch to push mode (periodically push to QAudioSink using a timer)
m_modeButton->setText(tr("Enable pull mode"));
auto io = m_audioOutput->start();
m_pushTimer->disconnect();
@@ -268,19 +209,14 @@ void AudioTest::toggleMode()
if (m_audioOutput->state() == QAudio::StoppedState)
return;
- QByteArray buffer(32768, 0);
- int chunks = m_audioOutput->bytesFree() / m_audioOutput->periodSize();
- while (chunks) {
- const qint64 len = m_generator->read(buffer.data(), m_audioOutput->periodSize());
- if (len)
- io->write(buffer.data(), len);
- if (len != m_audioOutput->periodSize())
- break;
- --chunks;
- }
+ int len = m_audioOutput->bytesFree();
+ QByteArray buffer(len, 0);
+ len = m_generator->read(buffer.data(), len);
+ if (len)
+ io->write(buffer.data(), len);
});
- m_pushTimer->start(20);
+ m_pushTimer->start(10);
}
m_pullMode = !m_pullMode;
@@ -288,9 +224,10 @@ void AudioTest::toggleMode()
void AudioTest::toggleSuspendResume()
{
- if (m_audioOutput->state() == QAudio::SuspendedState || m_audioOutput->state() == QAudio::StoppedState) {
+ if (m_audioOutput->state() == QAudio::SuspendedState
+ || m_audioOutput->state() == QAudio::StoppedState) {
m_audioOutput->resume();
- m_suspendResumeButton->setText(tr("Suspend recording"));
+ m_suspendResumeButton->setText(tr("Suspend playback"));
} else if (m_audioOutput->state() == QAudio::ActiveState) {
m_audioOutput->suspend();
m_suspendResumeButton->setText(tr("Resume playback"));
@@ -299,3 +236,4 @@ void AudioTest::toggleSuspendResume()
}
}
+#include "moc_audiooutput.cpp"