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

Give more time before timeout in some tst_QAudioInput tests

Browse Source 
Change-Id: If2336e9c550ef8264d0853be83972a6170a9746b
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Yoann Lopes
2016-07-29 14:34:03 +02:00
parent 5b9384336c
commit 7966aca384
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -644,7 +644,7 @@ void tst_QAudioInput::push()
QByteArray buffer(AUDIO_BUFFER, 0); QByteArray buffer(AUDIO_BUFFER, 0);
qint64 len = (audioFormat.sampleRate()*audioFormat.channelCount()*(audioFormat.sampleSize()/8)*2); // 2 seconds qint64 len = (audioFormat.sampleRate()*audioFormat.channelCount()*(audioFormat.sampleSize()/8)*2); // 2 seconds
while (totalBytesRead < len) { while (totalBytesRead < len) {
QTRY_VERIFY(audioInput.bytesReady() >= audioInput.periodSize()); QTRY_VERIFY_WITH_TIMEOUT(audioInput.bytesReady() >= audioInput.periodSize(), 10000);
qint64 bytesRead = feed->read(buffer.data(), audioInput.periodSize()); qint64 bytesRead = feed->read(buffer.data(), audioInput.periodSize());
audioFile->write(buffer.constData(),bytesRead); audioFile->write(buffer.constData(),bytesRead);
totalBytesRead+=bytesRead; totalBytesRead+=bytesRead;
@@ -725,7 +725,7 @@ void tst_QAudioInput::pushSuspendResume()
QByteArray buffer(AUDIO_BUFFER, 0); QByteArray buffer(AUDIO_BUFFER, 0);
qint64 len = (audioFormat.sampleRate()*audioFormat.channelCount()*(audioFormat.sampleSize()/8)); // 1 seconds qint64 len = (audioFormat.sampleRate()*audioFormat.channelCount()*(audioFormat.sampleSize()/8)); // 1 seconds
while (totalBytesRead < len) { while (totalBytesRead < len) {
QTRY_VERIFY(audioInput.bytesReady() >= audioInput.periodSize()); QTRY_VERIFY_WITH_TIMEOUT(audioInput.bytesReady() >= audioInput.periodSize(), 10000);
qint64 bytesRead = feed->read(buffer.data(), audioInput.periodSize()); qint64 bytesRead = feed->read(buffer.data(), audioInput.periodSize());
audioFile->write(buffer.constData(),bytesRead); audioFile->write(buffer.constData(),bytesRead);
totalBytesRead+=bytesRead; totalBytesRead+=bytesRead;
@@ -780,7 +780,7 @@ void tst_QAudioInput::pushSuspendResume()
totalBytesRead = 0; totalBytesRead = 0;
firstBuffer = true; firstBuffer = true;
while (totalBytesRead < len && audioInput.state() != QAudio::StoppedState) { while (totalBytesRead < len && audioInput.state() != QAudio::StoppedState) {
QTRY_VERIFY(audioInput.bytesReady() >= audioInput.periodSize()); QTRY_VERIFY_WITH_TIMEOUT(audioInput.bytesReady() >= audioInput.periodSize(), 10000);
qint64 bytesRead = feed->read(buffer.data(), audioInput.periodSize()); qint64 bytesRead = feed->read(buffer.data(), audioInput.periodSize());
audioFile->write(buffer.constData(),bytesRead); audioFile->write(buffer.constData(),bytesRead);
totalBytesRead+=bytesRead; totalBytesRead+=bytesRead;
@@ -827,7 +827,7 @@ void tst_QAudioInput::reset()
QVERIFY2((audioInput.state() == QAudio::IdleState), "didn't transition to IdleState after start()"); QVERIFY2((audioInput.state() == QAudio::IdleState), "didn't transition to IdleState after start()");
QVERIFY2((audioInput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()"); QVERIFY2((audioInput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()");
QVERIFY(audioInput.periodSize() > 0); QVERIFY(audioInput.periodSize() > 0);
QTRY_VERIFY2((audioInput.bytesReady() > audioInput.periodSize()), "no bytes available after starting"); QTRY_VERIFY2_WITH_TIMEOUT((audioInput.bytesReady() > audioInput.periodSize()), "no bytes available after starting", 10000);
// Trigger a read // Trigger a read
QByteArray data = device->read(audioInput.periodSize()); QByteArray data = device->read(audioInput.periodSize());