FFmpeg: Various fixes to the ffmpeg audio decoder

* Pass more of the audio decoder auto tests.
* Correctly handle requesting a specific audio format.
* Fixes to error handling

Change-Id: I9ef1afe5038951dc6c666cb007d941758ced5056
Reviewed-by: Rafael Roquetto <rafael.roquetto@qt.io>

1 files changed, 3 insertions, 2 deletions

diff --git a/tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp b/tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp
index d7031ee70..a014b2dec 100644
--- a/tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp
+++ b/tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp
@@ -323,7 +323,8 @@ void tst_QAudioDecoderBackend::unsupportedFileTest()
     QVERIFY(isDecodingSpy.isEmpty());
     QVERIFY(finishedSpy.isEmpty());
     QVERIFY(positionSpy.isEmpty());
-    QVERIFY(durationSpy.isEmpty());
+    // Either reject the file directly, or set the duration to 5secs on setUrl() and back to -1 on start()
+    QVERIFY(durationSpy.isEmpty() || durationSpy.count() == 2);
 
     errorSpy.clear();
 
@@ -340,7 +341,7 @@ void tst_QAudioDecoderBackend::unsupportedFileTest()
     QVERIFY(isDecodingSpy.isEmpty());
     QVERIFY(finishedSpy.isEmpty());
     QVERIFY(positionSpy.isEmpty());
-    QVERIFY(durationSpy.isEmpty());
+    QVERIFY(durationSpy.isEmpty() || durationSpy.count() == 2);
 
 
     d.stop();