slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactored AudioCapture plugin.

Browse Source 
Change-Id: I025588d7d2afc8d8137a258d86f6dab5b00b234a
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
This commit is contained in:
Yoann Lopes
2013-10-04 13:43:03 +02:00
committed by The Qt Project
parent b49746b588
commit c2f95891c0
16 changed files with 356 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
src/plugins/audiocapture/audioencodercontrol.cpp
View File

@@ -46,26 +46,43 @@
#include <QtCore/qdebug.h>
QT_BEGIN_NAMESPACE
static QAudioFormat audioSettingsToAudioFormat(const QAudioEncoderSettings &settings)
{
QAudioFormat fmt;
fmt.setCodec(settings.codec());
fmt.setChannelCount(settings.channelCount());
fmt.setSampleRate(settings.sampleRate());
if (settings.sampleRate() == 8000 && settings.bitRate() == 8000) {
fmt.setSampleType(QAudioFormat::UnSignedInt);
fmt.setSampleSize(8);
} else {
fmt.setSampleSize(16);
fmt.setSampleType(QAudioFormat::SignedInt);
}
fmt.setByteOrder(QAudioDeviceInfo::defaultInputDevice().preferredFormat().byteOrder());
return fmt;
}
static QAudioEncoderSettings audioFormatToAudioSettings(const QAudioFormat &format)
{
QAudioEncoderSettings settings;
settings.setCodec(format.codec());
settings.setChannelCount(format.channelCount());
settings.setSampleRate(format.sampleRate());
settings.setEncodingMode(QMultimedia::ConstantBitRateEncoding);
settings.setBitRate(format.channelCount()
* format.sampleSize()
* format.sampleRate());
return settings;
}
AudioEncoderControl::AudioEncoderControl(QObject *parent)
:QAudioEncoderSettingsControl(parent)
{
m_session = qobject_cast<AudioCaptureSession*>(parent);
QT_PREPEND_NAMESPACE(QAudioFormat) fmt;
fmt.setSampleSize(8);
fmt.setChannelCount(1);
fmt.setSampleRate(8000);
fmt.setSampleType(QT_PREPEND_NAMESPACE(QAudioFormat)::SignedInt);
fmt.setCodec("audio/pcm");
fmt.setByteOrder(QAudioFormat::LittleEndian);
m_session->setFormat(fmt);
m_settings.setEncodingMode(QMultimedia::ConstantQualityEncoding);
m_settings.setCodec("audio/pcm");
m_settings.setBitRate(8000);
m_settings.setChannelCount(1);
m_settings.setSampleRate(8000);
m_settings.setQuality(QMultimedia::LowQuality);
update();
}
AudioEncoderControl::~AudioEncoderControl()
@@ -74,71 +91,85 @@ AudioEncoderControl::~AudioEncoderControl()
QStringList AudioEncoderControl::supportedAudioCodecs() const
{
QStringList list;
if (m_session->supportedContainers().size() > 0)
list.append("audio/pcm");
return list;
return QStringList() << QStringLiteral("audio/pcm");
}
QString AudioEncoderControl::codecDescription(const QString &codecName) const
{
if (codecName.contains(QLatin1String("audio/pcm")))
return tr("PCM audio data");
if (QString::compare(codecName, QLatin1String("audio/pcm")) == 0)
return tr("Linear PCM audio data");
return QString();
}
QList<int> AudioEncoderControl::supportedSampleRates(const QAudioEncoderSettings &, bool *continuous) const
QList<int> AudioEncoderControl::supportedSampleRates(const QAudioEncoderSettings &settings, bool *continuous) const
{
if (continuous)
*continuous = false;
return m_session->deviceInfo()->supportedSampleRates();
if (settings.codec().isEmpty() || settings.codec() == QLatin1String("audio/pcm"))
return m_sampleRates;
return QList<int>();
}
QAudioEncoderSettings AudioEncoderControl::audioSettings() const
{
return m_settings;
return audioFormatToAudioSettings(m_session->format());
}
void AudioEncoderControl::setAudioSettings(const QAudioEncoderSettings &settings)
{
QAudioFormat fmt = m_session->format();
QAudioFormat fmt = audioSettingsToAudioFormat(settings);
if (settings.encodingMode() == QMultimedia::ConstantQualityEncoding) {
if (settings.quality() == QMultimedia::LowQuality) {
fmt.setCodec("audio/pcm");
switch (settings.quality()) {
case QMultimedia::VeryLowQuality:
fmt.setSampleSize(8);
fmt.setChannelCount(1);
fmt.setSampleRate(8000);
fmt.setSampleType(QAudioFormat::UnSignedInt);
} else if (settings.quality() == QMultimedia::NormalQuality) {
fmt.setSampleSize(16);
fmt.setChannelCount(1);
break;
case QMultimedia::LowQuality:
fmt.setSampleSize(8);
fmt.setSampleRate(22050);
fmt.setSampleType(QAudioFormat::SignedInt);
} else {
fmt.setSampleType(QAudioFormat::UnSignedInt);
break;
case QMultimedia::HighQuality:
fmt.setSampleSize(16);
fmt.setSampleRate(48000);
fmt.setSampleType(QAudioFormat::SignedInt);
break;
case QMultimedia::VeryHighQuality:
fmt.setSampleSize(16);
fmt.setSampleRate(96000);
fmt.setSampleType(QAudioFormat::SignedInt);
break;
case QMultimedia::NormalQuality:
default:
fmt.setSampleSize(16);
fmt.setChannelCount(1);
fmt.setSampleRate(44100);
fmt.setSampleType(QAudioFormat::SignedInt);
}
} else {
fmt.setChannelCount(settings.channelCount());
fmt.setSampleRate(settings.sampleRate());
if (settings.sampleRate() == 8000 && settings.bitRate() == 8000) {
fmt.setSampleType(QAudioFormat::UnSignedInt);
fmt.setSampleSize(8);
} else {
fmt.setSampleSize(16);
fmt.setSampleType(QAudioFormat::SignedInt);
break;
}
}
fmt.setCodec("audio/pcm");
m_session->setFormat(fmt);
m_settings = settings;
}
void AudioEncoderControl::update()
{
m_sampleRates.clear();
QList<QAudioDeviceInfo> devices = QAudioDeviceInfo::availableDevices(QAudio::AudioInput);
for (int i = 0; i < devices.size(); ++i) {
QList<int> rates = devices.at(i).supportedSampleRates();
for (int j = 0; j < rates.size(); ++j) {
int rate = rates.at(j);
if (!m_sampleRates.contains(rate))
m_sampleRates.append(rate);
}
}
qSort(m_sampleRates);
}
QT_END_NAMESPACE