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

Changes to GStreamer backend for audio decoder.

Browse Source 
Removed WaitingState.
New signals: finished(), positionChanged(), durationChanged().
New methods: position(), duration().
A parameter removed from read() method.
Unit tests updated.

Change-Id: Ie9d8a2804285c5542e592cce69963adbdf6ebfb8
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Lev Zelenskiy
2012-02-24 12:50:32 +10:00
committed by Qt by Nokia
parent 0b8c6115cd
commit b56d3e70df
7 changed files with 270 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
tests/auto/unit/qaudiodecoder/tst_qaudiodecoder.cpp
View File

@@ -61,6 +61,7 @@ private Q_SLOTS:
void stop();
void format();
void source();
void readAll();
private:
MockAudioDecoderService *mockAudioDecoderService;
@@ -125,10 +126,7 @@ void tst_QAudioDecoder::read()
QCOMPARE(d.bufferAvailable(), false); // not yet
// Try to read
bool ok = false;
QAudioBuffer b = d.read(&ok);
QVERIFY(ok == false);
QAudioBuffer b = d.read();
QVERIFY(!b.isValid());
// Read again with no parameter
@@ -140,7 +138,7 @@ void tst_QAudioDecoder::read()
QVERIFY(d.bufferAvailable());
b = d.read(&ok);
b = d.read();
QVERIFY(b.format().isValid());
QVERIFY(b.isValid());
QVERIFY(b.format().channelCount() == 1);
@@ -189,10 +187,7 @@ void tst_QAudioDecoder::stop()
QCOMPARE(d.bufferAvailable(), false); // not yet
// Try to read
bool ok = false;
QAudioBuffer b = d.read(&ok);
QVERIFY(ok == false);
QAudioBuffer b = d.read();
QVERIFY(!b.isValid());
// Read again with no parameter
@@ -234,10 +229,7 @@ void tst_QAudioDecoder::format()
QCOMPARE(d.bufferAvailable(), false); // not yet
// Try to read
bool ok = false;
QAudioBuffer b = d.read(&ok);
QVERIFY(ok == false);
QAudioBuffer b = d.read();
QVERIFY(!b.isValid());
// Read again with no parameter
@@ -247,7 +239,7 @@ void tst_QAudioDecoder::format()
// Wait a while
QTRY_COMPARE(d.bufferAvailable(), 1);
b = d.read(&ok);
b = d.read();
QVERIFY(d.audioFormat() == b.format());
// Setting format while decoding is forbidden
@@ -267,7 +259,7 @@ void tst_QAudioDecoder::format()
d.start();
QTRY_COMPARE(d.bufferAvailable(), 1);
b = d.read(&ok);
b = d.read();
QVERIFY(d.audioFormat() == f);
QVERIFY(b.format() == f);
}
@@ -301,6 +293,51 @@ void tst_QAudioDecoder::source()
QVERIFY(d.sourceDevice() == 0);
}
void tst_QAudioDecoder::readAll()
{
QAudioDecoder d;
d.setSourceFilename("Foo");
QVERIFY(d.state() == QAudioDecoder::StoppedState);
QSignalSpy durationSpy(&d, SIGNAL(durationChanged(qint64)));
QSignalSpy positionSpy(&d, SIGNAL(positionChanged(qint64)));
QSignalSpy stateSpy(&d, SIGNAL(stateChanged(QAudioDecoder::State)));
QSignalSpy finishedSpy(&d, SIGNAL(finished()));
QSignalSpy bufferAvailableSpy(&d, SIGNAL(bufferAvailableChanged(bool)));
d.start();
int i = 0;
forever {
QVERIFY(d.state() == QAudioDecoder::DecodingState);
QCOMPARE(stateSpy.count(), 1);
QCOMPARE(durationSpy.count(), 1);
QVERIFY(finishedSpy.isEmpty());
QTRY_VERIFY(bufferAvailableSpy.count() >= 1);
if (d.bufferAvailable()) {
QAudioBuffer b = d.read();
QVERIFY(b.isValid());
QCOMPARE(b.startTime() / 1000, d.position());
QVERIFY(!positionSpy.isEmpty());
QList<QVariant> arguments = positionSpy.takeLast();
QCOMPARE(arguments.at(0).toLongLong(), b.startTime() / 1000);
i++;
if (i == MOCK_DECODER_MAX_BUFFERS) {
QCOMPARE(finishedSpy.count(), 1);
QCOMPARE(stateSpy.count(), 2);
QVERIFY(d.state() == QAudioDecoder::StoppedState);
QList<QVariant> arguments = stateSpy.takeLast();
QVERIFY(arguments.at(0).toInt() == (int)QAudioDecoder::StoppedState);
QVERIFY(!d.bufferAvailable());
QVERIFY(!bufferAvailableSpy.isEmpty());
arguments = bufferAvailableSpy.takeLast();
QVERIFY(arguments.at(0).toBool() == false);
break;
}
} else
QTest::qWait(30);
}
}
QTEST_MAIN(tst_QAudioDecoder)
#include "tst_qaudiodecoder.moc"