Delete obsolete class methods and update related code
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:
committed by
Qt by Nokia
parent
952bd004be
commit
53fdcca366
@@ -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);
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -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()),
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -362,7 +362,7 @@ void tst_QAudioDecoder::nullControl()
|
||||
QVERIFY(d.sourceDevice() == 0);
|
||||
|
||||
QAudioFormat format;
|
||||
format.setChannels(2);
|
||||
format.setChannelCount(2);
|
||||
QVERIFY(!d.audioFormat().isValid());
|
||||
d.setAudioFormat(format);
|
||||
QVERIFY(!d.audioFormat().isValid());
|
||||
@@ -403,7 +403,7 @@ void tst_QAudioDecoder::nullService()
|
||||
QVERIFY(d.sourceDevice() == 0);
|
||||
|
||||
QAudioFormat format;
|
||||
format.setChannels(2);
|
||||
format.setChannelCount(2);
|
||||
QVERIFY(!d.audioFormat().isValid());
|
||||
d.setAudioFormat(format);
|
||||
QVERIFY(!d.audioFormat().isValid());
|
||||
|
||||
@@ -58,7 +58,6 @@ public:
|
||||
|
||||
private slots:
|
||||
void checkNull();
|
||||
void checkFrequency();
|
||||
void checkSampleSize();
|
||||
void checkCodec();
|
||||
void checkByteOrder();
|
||||
@@ -82,21 +81,14 @@ void tst_QAudioFormat::checkNull()
|
||||
QAudioFormat audioFormat1(audioFormat0);
|
||||
QVERIFY(!audioFormat1.isValid());
|
||||
|
||||
audioFormat0.setFrequency(44100);
|
||||
audioFormat0.setChannels(2);
|
||||
audioFormat0.setSampleRate(44100);
|
||||
audioFormat0.setChannelCount(2);
|
||||
audioFormat0.setSampleSize(16);
|
||||
audioFormat0.setCodec("audio/pcm");
|
||||
audioFormat0.setSampleType(QAudioFormat::SignedInt);
|
||||
QVERIFY(audioFormat0.isValid());
|
||||
}
|
||||
|
||||
void tst_QAudioFormat::checkFrequency()
|
||||
{
|
||||
QAudioFormat audioFormat;
|
||||
audioFormat.setFrequency(44100);
|
||||
QVERIFY(audioFormat.frequency() == 44100);
|
||||
}
|
||||
|
||||
void tst_QAudioFormat::checkSampleSize()
|
||||
{
|
||||
QAudioFormat audioFormat;
|
||||
@@ -161,15 +153,15 @@ void tst_QAudioFormat::checkEquality()
|
||||
QVERIFY(!(audioFormat0 != audioFormat1));
|
||||
|
||||
// on filled formats
|
||||
audioFormat0.setFrequency(8000);
|
||||
audioFormat0.setChannels(1);
|
||||
audioFormat0.setSampleRate(8000);
|
||||
audioFormat0.setChannelCount(1);
|
||||
audioFormat0.setSampleSize(8);
|
||||
audioFormat0.setCodec("audio/pcm");
|
||||
audioFormat0.setByteOrder(QAudioFormat::LittleEndian);
|
||||
audioFormat0.setSampleType(QAudioFormat::UnSignedInt);
|
||||
|
||||
audioFormat1.setFrequency(8000);
|
||||
audioFormat1.setChannels(1);
|
||||
audioFormat1.setSampleRate(8000);
|
||||
audioFormat1.setChannelCount(1);
|
||||
audioFormat1.setSampleSize(8);
|
||||
audioFormat1.setCodec("audio/pcm");
|
||||
audioFormat1.setByteOrder(QAudioFormat::LittleEndian);
|
||||
@@ -178,7 +170,7 @@ void tst_QAudioFormat::checkEquality()
|
||||
QVERIFY(audioFormat0 == audioFormat1);
|
||||
QVERIFY(!(audioFormat0 != audioFormat1));
|
||||
|
||||
audioFormat0.setFrequency(44100);
|
||||
audioFormat0.setSampleRate(44100);
|
||||
QVERIFY(audioFormat0 != audioFormat1);
|
||||
QVERIFY(!(audioFormat0 == audioFormat1));
|
||||
}
|
||||
@@ -188,8 +180,8 @@ void tst_QAudioFormat::checkAssignment()
|
||||
QAudioFormat audioFormat0;
|
||||
QAudioFormat audioFormat1;
|
||||
|
||||
audioFormat0.setFrequency(8000);
|
||||
audioFormat0.setChannels(1);
|
||||
audioFormat0.setSampleRate(8000);
|
||||
audioFormat0.setChannelCount(1);
|
||||
audioFormat0.setSampleSize(8);
|
||||
audioFormat0.setCodec("audio/pcm");
|
||||
audioFormat0.setByteOrder(QAudioFormat::LittleEndian);
|
||||
@@ -219,15 +211,15 @@ void tst_QAudioFormat::checkChannelCount()
|
||||
// they should always be equal
|
||||
QAudioFormat audioFormat;
|
||||
QVERIFY(audioFormat.channelCount() == -1);
|
||||
QVERIFY(audioFormat.channels() == -1);
|
||||
QVERIFY(audioFormat.channelCount() == -1);
|
||||
|
||||
audioFormat.setChannelCount(123);
|
||||
QVERIFY(audioFormat.channelCount() == 123);
|
||||
QVERIFY(audioFormat.channels() == 123);
|
||||
QVERIFY(audioFormat.channelCount() == 123);
|
||||
|
||||
audioFormat.setChannels(5);
|
||||
audioFormat.setChannelCount(5);
|
||||
QVERIFY(audioFormat.channelCount() == 5);
|
||||
QVERIFY(audioFormat.channelCount() == 5);
|
||||
QVERIFY(audioFormat.channels() == 5);
|
||||
}
|
||||
|
||||
void tst_QAudioFormat::debugOperator_data()
|
||||
|
||||
@@ -71,9 +71,9 @@ public:
|
||||
, mPosition(-1)
|
||||
, mSerial(0)
|
||||
{
|
||||
mFormat.setChannels(1);
|
||||
mFormat.setChannelCount(1);
|
||||
mFormat.setSampleSize(8);
|
||||
mFormat.setFrequency(1000);
|
||||
mFormat.setSampleRate(1000);
|
||||
mFormat.setCodec("audio/x-raw");
|
||||
mFormat.setSampleType(QAudioFormat::UnSignedInt);
|
||||
}
|
||||
@@ -184,7 +184,7 @@ public:
|
||||
|
||||
qint64 duration() const
|
||||
{
|
||||
return (sizeof(mSerial) * MOCK_DECODER_MAX_BUFFERS * qint64(1000)) / (mFormat.sampleRate() * mFormat.channels());
|
||||
return (sizeof(mSerial) * MOCK_DECODER_MAX_BUFFERS * qint64(1000)) / (mFormat.sampleRate() * mFormat.channelCount());
|
||||
}
|
||||
|
||||
private slots:
|
||||
@@ -198,7 +198,7 @@ private slots:
|
||||
if (mBuffers.length() < 3) {
|
||||
QByteArray b(sizeof(mSerial), 0);
|
||||
memcpy(b.data(), &mSerial, sizeof(mSerial));
|
||||
qint64 position = (sizeof(mSerial) * mSerial * qint64(1000000)) / (mFormat.sampleRate() * mFormat.channels());
|
||||
qint64 position = (sizeof(mSerial) * mSerial * qint64(1000000)) / (mFormat.sampleRate() * mFormat.channelCount());
|
||||
mSerial++;
|
||||
mBuffers.push_back(QAudioBuffer(b, mFormat, position));
|
||||
emit bufferReady();
|
||||
|
||||
@@ -184,7 +184,7 @@ void tst_QWaveDecoder::file()
|
||||
QVERIFY(waveDecoder.duration() == 250);
|
||||
QAudioFormat format = waveDecoder.audioFormat();
|
||||
QVERIFY(format.isValid());
|
||||
QVERIFY(format.channels() == channels);
|
||||
QVERIFY(format.channelCount() == channels);
|
||||
QVERIFY(format.sampleSize() == samplesize);
|
||||
QVERIFY(format.sampleRate() == samplerate);
|
||||
if (format.sampleSize() != 8) {
|
||||
@@ -247,7 +247,7 @@ void tst_QWaveDecoder::http()
|
||||
QVERIFY(waveDecoder.duration() == 250);
|
||||
QAudioFormat format = waveDecoder.audioFormat();
|
||||
QVERIFY(format.isValid());
|
||||
QVERIFY(format.channels() == channels);
|
||||
QVERIFY(format.channelCount() == channels);
|
||||
QVERIFY(format.sampleSize() == samplesize);
|
||||
QVERIFY(format.sampleRate() == samplerate);
|
||||
if (format.sampleSize() != 8) {
|
||||
|
||||
Reference in New Issue
Block a user