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

Add 32 bit support (int/float) support to audioinput example.

Browse Source 
Change-Id: Ib7160f60af36cdccfe91a620f5555189792c13c4
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
This commit is contained in:
Michael Goddard
2012-07-09 16:51:50 +10:00
committed by Qt by Nokia
parent d67f9dba56
commit 3a5a59ed85
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
examples/audioinput/audioinput.cpp
View File

@@ -41,6 +41,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include <QDateTime>
#include <QDebug> #include <QDebug>
#include <QPainter> #include <QPainter>
#include <QVBoxLayout> #include <QVBoxLayout>
@@ -91,6 +93,22 @@ AudioInfo::AudioInfo(const QAudioFormat &format, QObject *parent)
break; break;
} }
break; break;
case 32:
switch (m_format.sampleType()) {
case QAudioFormat::UnSignedInt:
m_maxAmplitude = 0xffffffff;
break;
case QAudioFormat::SignedInt:
m_maxAmplitude = 0x7fffffff;
break;
case QAudioFormat::Float:
m_maxAmplitude = 0x7fffffff; // Kind of
default:
break;
}
break;
default: default:
break; break;
} }
@@ -127,12 +145,12 @@ qint64 AudioInfo::writeData(const char *data, qint64 len)
Q_ASSERT(len % sampleBytes == 0); Q_ASSERT(len % sampleBytes == 0);
const int numSamples = len / sampleBytes; const int numSamples = len / sampleBytes;
quint16 maxValue = 0; quint32 maxValue = 0;
const unsigned char *ptr = reinterpret_cast<const unsigned char *>(data); const unsigned char *ptr = reinterpret_cast<const unsigned char *>(data);
for (int i = 0; i < numSamples; ++i) { for (int i = 0; i < numSamples; ++i) {
for (int j = 0; j < m_format.channelCount(); ++j) { for (int j = 0; j < m_format.channelCount(); ++j) {
quint16 value = 0; quint32 value = 0;
if (m_format.sampleSize() == 8 && m_format.sampleType() == QAudioFormat::UnSignedInt) { if (m_format.sampleSize() == 8 && m_format.sampleType() == QAudioFormat::UnSignedInt) {
value = *reinterpret_cast<const quint8*>(ptr); value = *reinterpret_cast<const quint8*>(ptr);
@@ -148,6 +166,18 @@ qint64 AudioInfo::writeData(const char *data, qint64 len)
value = qAbs(qFromLittleEndian<qint16>(ptr)); value = qAbs(qFromLittleEndian<qint16>(ptr));
else else
value = qAbs(qFromBigEndian<qint16>(ptr)); value = qAbs(qFromBigEndian<qint16>(ptr));
} else if (m_format.sampleSize() == 32 && m_format.sampleType() == QAudioFormat::UnSignedInt) {
if (m_format.byteOrder() == QAudioFormat::LittleEndian)
value = qFromLittleEndian<quint32>(ptr);
else
value = qFromBigEndian<quint32>(ptr);
} else if (m_format.sampleSize() == 32 && m_format.sampleType() == QAudioFormat::SignedInt) {
if (m_format.byteOrder() == QAudioFormat::LittleEndian)
value = qAbs(qFromLittleEndian<qint32>(ptr));
else
value = qAbs(qFromBigEndian<qint32>(ptr));
} else if (m_format.sampleSize() == 32 && m_format.sampleType() == QAudioFormat::Float) {
value = qAbs(*reinterpret_cast<const float*>(ptr) * 0x7fffffff); // assumes 0-1.0
} }
maxValue = qMax(value, maxValue); maxValue = qMax(value, maxValue);

2
examples/audioinput/audioinput.h
View File

@@ -69,7 +69,7 @@ public:
private: private:
const QAudioFormat m_format; const QAudioFormat m_format;
quint16 m_maxAmplitude; quint32 m_maxAmplitude;
qreal m_level; // 0.0 <= m_level <= 1.0 qreal m_level; // 0.0 <= m_level <= 1.0
signals: signals: