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

Delete obsolete class methods and update related code

Browse Source 
Delete obsolete methods from QAudioFormat and QAudioDeviceInfo
and update code that relied on the obsolete methods.

Change-Id: I007e36375a45399b1d5a289341bc5d5a05dc68cc
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Mithra Pattison
2012-07-10 13:26:48 +10:00
committed by Qt by Nokia
parent 952bd004be
commit 53fdcca366
47 changed files with 301 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp
View File

@@ -183,9 +183,9 @@ void tst_QAudioDecoderBackend::fileTest()
// change output audio format
QAudioFormat format;
format.setChannels(2);
format.setChannelCount(2);
format.setSampleSize(8);
format.setFrequency(11050);
format.setSampleRate(11050);
format.setCodec("audio/pcm");
format.setSampleType(QAudioFormat::SignedInt);
@@ -509,9 +509,9 @@ void tst_QAudioDecoderBackend::deviceTest()
// Now try changing formats
QAudioFormat format;
format.setChannels(2);
format.setChannelCount(2);
format.setSampleSize(8);
format.setFrequency(8000);
format.setSampleRate(8000);
format.setCodec("audio/pcm");
format.setSampleType(QAudioFormat::SignedInt);

22
tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
View File

@@ -64,7 +64,7 @@ private slots:
void sampleSizes();
void byteOrders();
void sampleTypes();
void frequencies();
void sampleRates();
void isFormatSupported();
void preferred();
void nearest();
@@ -112,7 +112,7 @@ void tst_QAudioDeviceInfo::codecs()
void tst_QAudioDeviceInfo::channels()
{
QList<int> avail = device->supportedChannels();
QList<int> avail = device->supportedChannelCounts();
QVERIFY(avail.size() > 0);
}
@@ -134,17 +134,17 @@ void tst_QAudioDeviceInfo::sampleTypes()
QVERIFY(avail.size() > 0);
}
void tst_QAudioDeviceInfo::frequencies()
void tst_QAudioDeviceInfo::sampleRates()
{
QList<int> avail = device->supportedFrequencies();
QList<int> avail = device->supportedSampleRates();
QVERIFY(avail.size() > 0);
}
void tst_QAudioDeviceInfo::isFormatSupported()
{
QAudioFormat format;
format.setFrequency(44100);
format.setChannels(2);
format.setSampleRate(44100);
format.setChannelCount(2);
format.setSampleType(QAudioFormat::SignedInt);
format.setByteOrder(QAudioFormat::LittleEndian);
format.setSampleSize(16);
@@ -167,13 +167,13 @@ void tst_QAudioDeviceInfo::nearest()
{
/*
QAudioFormat format1, format2;
format1.setFrequency(8000);
format1.setSampleRate(8000);
format2 = device->nearestFormat(format1);
QVERIFY(format2.frequency() == 44100);
QVERIFY(format2.sampleRate() == 44100);
*/
QAudioFormat format;
format.setFrequency(44100);
format.setChannels(2);
format.setSampleRate(44100);
format.setChannelCount(2);
format.setSampleType(QAudioFormat::SignedInt);
format.setByteOrder(QAudioFormat::LittleEndian);
format.setSampleSize(16);
@@ -182,7 +182,7 @@ void tst_QAudioDeviceInfo::nearest()
QAudioFormat format2 = device->nearestFormat(format);
// This is definitely dependent on platform support (but isFormatSupported tests that above)
QVERIFY(format2.frequency() == 44100);
QVERIFY(format2.sampleRate() == 44100);
}
// Returns a list of supported channel counts.

30
tests/auto/integration/qaudioinput/tst_qaudioinput.cpp
View File

@@ -128,11 +128,11 @@ QString tst_QAudioInput::formatToFileName(const QAudioFormat &format)
? QString("signed") : QString("unsigned");
return QString("%1_%2_%3_%4_%5")
.arg(format.frequency())
.arg(format.sampleRate())
.arg(format.sampleSize())
.arg(formatSigned)
.arg(formatEndian)
.arg(format.channels());
.arg(format.channelCount());
}
void tst_QAudioInput::initTestCase()
@@ -157,37 +157,37 @@ void tst_QAudioInput::initTestCase()
testFormats.append(audioDevice.preferredFormat());
// PCM 8000 mono S8
format.setFrequency(8000);
format.setSampleRate(8000);
format.setSampleSize(8);
format.setSampleType(QAudioFormat::SignedInt);
format.setByteOrder(QAudioFormat::LittleEndian);
format.setChannels(1);
format.setChannelCount(1);
if (audioDevice.isFormatSupported(format))
testFormats.append(format);
// PCM 11025 mono S16LE
format.setFrequency(11025);
format.setSampleRate(11025);
format.setSampleSize(16);
if (audioDevice.isFormatSupported(format))
testFormats.append(format);
// PCM 22050 mono S16LE
format.setFrequency(22050);
format.setSampleRate(22050);
if (audioDevice.isFormatSupported(format))
testFormats.append(format);
// PCM 22050 stereo S16LE
format.setChannels(2);
format.setChannelCount(2);
if (audioDevice.isFormatSupported(format))
testFormats.append(format);
// PCM 44100 stereo S16LE
format.setFrequency(44100);
format.setSampleRate(44100);
if (audioDevice.isFormatSupported(format))
testFormats.append(format);
// PCM 48000 stereo S16LE
format.setFrequency(48000);
format.setSampleRate(48000);
if (audioDevice.isFormatSupported(format))
testFormats.append(format);
@@ -217,10 +217,10 @@ void tst_QAudioInput::format()
QAudioFormat requested = audioDevice.preferredFormat();
QAudioFormat actual = audioInput.format();
QVERIFY2((requested.channels() == actual.channels()),
QString("channels: requested=%1, actual=%2").arg(requested.channels()).arg(actual.channels()).toLocal8Bit().constData());
QVERIFY2((requested.frequency() == actual.frequency()),
QString("frequency: requested=%1, actual=%2").arg(requested.frequency()).arg(actual.frequency()).toLocal8Bit().constData());
QVERIFY2((requested.channelCount() == actual.channelCount()),
QString("channels: requested=%1, actual=%2").arg(requested.channelCount()).arg(actual.channelCount()).toLocal8Bit().constData());
QVERIFY2((requested.sampleRate() == actual.sampleRate()),
QString("sampleRate: requested=%1, actual=%2").arg(requested.sampleRate()).arg(actual.sampleRate()).toLocal8Bit().constData());
QVERIFY2((requested.sampleSize() == actual.sampleSize()),
QString("sampleSize: requested=%1, actual=%2").arg(requested.sampleSize()).arg(actual.sampleSize()).toLocal8Bit().constData());
QVERIFY2((requested.codec() == actual.codec()),
@@ -620,7 +620,7 @@ void tst_QAudioInput::push()
qint64 totalBytesRead = 0;
bool firstBuffer = true;
QByteArray buffer(AUDIO_BUFFER, 0);
qint64 len = (testFormats.at(i).frequency()*testFormats.at(i).channels()*(testFormats.at(i).sampleSize()/8)*2); // 2 seconds
qint64 len = (testFormats.at(i).sampleRate()*testFormats.at(i).channelCount()*(testFormats.at(i).sampleSize()/8)*2); // 2 seconds
while (totalBytesRead < len) {
if (audioInput.bytesReady() >= audioInput.periodSize()) {
qint64 bytesRead = feed->read(buffer.data(), audioInput.periodSize());
@@ -703,7 +703,7 @@ void tst_QAudioInput::pushSuspendResume()
qint64 totalBytesRead = 0;
bool firstBuffer = true;
QByteArray buffer(AUDIO_BUFFER, 0);
qint64 len = (testFormats.at(i).frequency()*testFormats.at(i).channels()*(testFormats.at(i).sampleSize()/8)); // 1 seconds
qint64 len = (testFormats.at(i).sampleRate()*testFormats.at(i).channelCount()*(testFormats.at(i).sampleSize()/8)); // 1 seconds
while (totalBytesRead < len) {
if (audioInput.bytesReady() >= audioInput.periodSize()) {
qint64 bytesRead = feed->read(buffer.data(), audioInput.periodSize());

12
tests/auto/integration/qaudioinput/wavheader.cpp
View File

@@ -111,9 +111,9 @@ bool WavHeader::read(QIODevice &device)
else
m_format.setByteOrder(QAudioFormat::BigEndian);
m_format.setChannels(qFromLittleEndian<quint16>(header.wave.numChannels));
m_format.setChannelCount(qFromLittleEndian<quint16>(header.wave.numChannels));
m_format.setCodec("audio/pcm");
m_format.setFrequency(qFromLittleEndian<quint32>(header.wave.sampleRate));
m_format.setSampleRate(qFromLittleEndian<quint32>(header.wave.sampleRate));
m_format.setSampleSize(qFromLittleEndian<quint16>(header.wave.bitsPerSample));
switch(header.wave.bitsPerSample) {
@@ -158,13 +158,13 @@ bool WavHeader::write(QIODevice &device)
reinterpret_cast<unsigned char*>(&header.wave.descriptor.size));
qToLittleEndian<quint16>(quint16(1),
reinterpret_cast<unsigned char*>(&header.wave.audioFormat));
qToLittleEndian<quint16>(quint16(m_format.channels()),
qToLittleEndian<quint16>(quint16(m_format.channelCount()),
reinterpret_cast<unsigned char*>(&header.wave.numChannels));
qToLittleEndian<quint32>(quint32(m_format.frequency()),
qToLittleEndian<quint32>(quint32(m_format.sampleRate()),
reinterpret_cast<unsigned char*>(&header.wave.sampleRate));
qToLittleEndian<quint32>(quint32(m_format.frequency() * m_format.channels() * m_format.sampleSize() / 8),
qToLittleEndian<quint32>(quint32(m_format.sampleRate() * m_format.channelCount() * m_format.sampleSize() / 8),
reinterpret_cast<unsigned char*>(&header.wave.byteRate));
qToLittleEndian<quint16>(quint16(m_format.channels() * m_format.sampleSize() / 8),
qToLittleEndian<quint16>(quint16(m_format.channelCount() * m_format.sampleSize() / 8),
reinterpret_cast<unsigned char*>(&header.wave.blockAlign));
qToLittleEndian<quint16>(quint16(m_format.sampleSize()),
reinterpret_cast<unsigned char*>(&header.wave.bitsPerSample));

38
tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
View File

@@ -106,7 +106,7 @@ private:
typedef QSharedPointer<QFile> FilePtr;
QString formatToFileName(const QAudioFormat &format);
void createSineWaveData(const QAudioFormat &format, qint64 length, int frequency = 440);
void createSineWaveData(const QAudioFormat &format, qint64 length, int sampleRate = 440);
QAudioDeviceInfo audioDevice;
QList<QAudioFormat> testFormats;
@@ -128,17 +128,17 @@ QString tst_QAudioOutput::formatToFileName(const QAudioFormat &format)
? QString("signed") : QString("unsigned");
return QString("%1_%2_%3_%4_%5")
.arg(format.frequency())
.arg(format.sampleRate())
.arg(format.sampleSize())
.arg(formatSigned)
.arg(formatEndian)
.arg(format.channels());
.arg(format.channelCount());
}
void tst_QAudioOutput::createSineWaveData(const QAudioFormat &format, qint64 length, int frequency)
void tst_QAudioOutput::createSineWaveData(const QAudioFormat &format, qint64 length, int sampleRate)
{
const int channelBytes = format.sampleSize() / 8;
const int sampleBytes = format.channels() * channelBytes;
const int sampleBytes = format.channelCount() * channelBytes;
Q_ASSERT(length % sampleBytes == 0);
Q_UNUSED(sampleBytes) // suppress warning in release builds
@@ -148,8 +148,8 @@ void tst_QAudioOutput::createSineWaveData(const QAudioFormat &format, qint64 len
int sampleIndex = 0;
while (length) {
const qreal x = qSin(2 * M_PI * frequency * qreal(sampleIndex % format.frequency()) / format.frequency());
for (int i=0; i<format.channels(); ++i) {
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 && format.sampleType() == QAudioFormat::UnSignedInt) {
const quint8 value = static_cast<quint8>((1.0 + x) / 2 * 255);
*reinterpret_cast<quint8*>(ptr) = value;
@@ -202,37 +202,37 @@ void tst_QAudioOutput::initTestCase()
testFormats.append(audioDevice.preferredFormat());
// PCM 8000 mono S8
format.setFrequency(8000);
format.setSampleRate(8000);
format.setSampleSize(8);
format.setSampleType(QAudioFormat::SignedInt);
format.setByteOrder(QAudioFormat::LittleEndian);
format.setChannels(1);
format.setChannelCount(1);
if (audioDevice.isFormatSupported(format))
testFormats.append(format);
// PCM 11025 mono S16LE
format.setFrequency(11025);
format.setSampleRate(11025);
format.setSampleSize(16);
if (audioDevice.isFormatSupported(format))
testFormats.append(format);
// PCM 22050 mono S16LE
format.setFrequency(22050);
format.setSampleRate(22050);
if (audioDevice.isFormatSupported(format))
testFormats.append(format);
// PCM 22050 stereo S16LE
format.setChannels(2);
format.setChannelCount(2);
if (audioDevice.isFormatSupported(format))
testFormats.append(format);
// PCM 44100 stereo S16LE
format.setFrequency(44100);
format.setSampleRate(44100);
if (audioDevice.isFormatSupported(format))
testFormats.append(format);
// PCM 48000 stereo S16LE
format.setFrequency(48000);
format.setSampleRate(48000);
if (audioDevice.isFormatSupported(format))
testFormats.append(format);
@@ -249,7 +249,7 @@ void tst_QAudioOutput::initTestCase()
const QString temporaryAudioPath = m_temporaryDir->path() + slash;
foreach (const QAudioFormat &format, testFormats) {
qint64 len = (format.frequency()*format.channels()*(format.sampleSize()/8)*2); // 2 seconds
qint64 len = (format.sampleRate()*format.channelCount()*(format.sampleSize()/8)*2); // 2 seconds
createSineWaveData(format, len);
// Write generate sine wave data to file
const QString fileName = temporaryAudioPath + QStringLiteral("generated")
@@ -272,10 +272,10 @@ void tst_QAudioOutput::format()
QAudioFormat requested = audioDevice.preferredFormat();
QAudioFormat actual = audioOutput.format();
QVERIFY2((requested.channels() == actual.channels()),
QString("channels: requested=%1, actual=%2").arg(requested.channels()).arg(actual.channels()).toLocal8Bit().constData());
QVERIFY2((requested.frequency() == actual.frequency()),
QString("frequency: requested=%1, actual=%2").arg(requested.frequency()).arg(actual.frequency()).toLocal8Bit().constData());
QVERIFY2((requested.channelCount() == actual.channelCount()),
QString("channels: requested=%1, actual=%2").arg(requested.channelCount()).arg(actual.channelCount()).toLocal8Bit().constData());
QVERIFY2((requested.sampleRate() == actual.sampleRate()),
QString("sampleRate: requested=%1, actual=%2").arg(requested.sampleRate()).arg(actual.sampleRate()).toLocal8Bit().constData());
QVERIFY2((requested.sampleSize() == actual.sampleSize()),
QString("sampleSize: requested=%1, actual=%2").arg(requested.sampleSize()).arg(actual.sampleSize()).toLocal8Bit().constData());
QVERIFY2((requested.codec() == actual.codec()),

12
tests/auto/integration/qaudiooutput/wavheader.cpp
View File

@@ -111,9 +111,9 @@ bool WavHeader::read(QIODevice &device)
else
m_format.setByteOrder(QAudioFormat::BigEndian);
m_format.setChannels(qFromLittleEndian<quint16>(header.wave.numChannels));
m_format.setChannelCount(qFromLittleEndian<quint16>(header.wave.numChannels));
m_format.setCodec("audio/pcm");
m_format.setFrequency(qFromLittleEndian<quint32>(header.wave.sampleRate));
m_format.setSampleRate(qFromLittleEndian<quint32>(header.wave.sampleRate));
m_format.setSampleSize(qFromLittleEndian<quint16>(header.wave.bitsPerSample));
switch(header.wave.bitsPerSample) {
@@ -158,13 +158,13 @@ bool WavHeader::write(QIODevice &device)
reinterpret_cast<unsigned char*>(&header.wave.descriptor.size));
qToLittleEndian<quint16>(quint16(1),
reinterpret_cast<unsigned char*>(&header.wave.audioFormat));
qToLittleEndian<quint16>(quint16(m_format.channels()),
qToLittleEndian<quint16>(quint16(m_format.channelCount()),
reinterpret_cast<unsigned char*>(&header.wave.numChannels));
qToLittleEndian<quint32>(quint32(m_format.frequency()),
qToLittleEndian<quint32>(quint32(m_format.sampleRate()),
reinterpret_cast<unsigned char*>(&header.wave.sampleRate));
qToLittleEndian<quint32>(quint32(m_format.frequency() * m_format.channels() * m_format.sampleSize() / 8),
qToLittleEndian<quint32>(quint32(m_format.sampleRate() * m_format.channelCount() * m_format.sampleSize() / 8),
reinterpret_cast<unsigned char*>(&header.wave.byteRate));
qToLittleEndian<quint16>(quint16(m_format.channels() * m_format.sampleSize() / 8),
qToLittleEndian<quint16>(quint16(m_format.channelCount() * m_format.sampleSize() / 8),
reinterpret_cast<unsigned char*>(&header.wave.blockAlign));
qToLittleEndian<quint16>(quint16(m_format.sampleSize()),
reinterpret_cast<unsigned char*>(&header.wave.bitsPerSample));