Fix a crash in the gstreamer audio output

Closing the audio output would delete the pipeline, and would
lead to deleting the GstAppSrc from within QGstAppSrc::pushData().

Speed up the qsoundeffect autotest (this uncovered the issue).

Change-Id: I3c5843854f5a74d563eb271df553c8a1a5854f63
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 21 insertions, 23 deletions

diff --git a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp
index 020daeea6..4367810fc 100644
--- a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp
+++ b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp
@@ -127,8 +127,8 @@ void tst_QSoundEffect::testSource()
 
     QTestEventLoop::instance().enterLoop(1);
     sound->play();
-
-    QTest::qWait(3000);
+    QTRY_COMPARE(sound->isPlaying(), false);
+    QCOMPARE(sound->loopsRemaining(), 0);
 }
 
 void tst_QSoundEffect::testLooping()
@@ -139,9 +139,9 @@ void tst_QSoundEffect::testLooping()
     QSignalSpy readSignal_Count(sound, SIGNAL(loopCountChanged()));
     QSignalSpy readSignal_Remaining(sound, SIGNAL(loopsRemainingChanged()));
 
-    sound->setLoopCount(5);
+    sound->setLoopCount(3);
     sound->setVolume(0.1f);
-    QCOMPARE(sound->loopCount(), 5);
+    QCOMPARE(sound->loopCount(), 3);
     QCOMPARE(readSignal_Count.count(), 1);
     QCOMPARE(sound->loopsRemaining(), 0);
     QCOMPARE(readSignal_Remaining.count(), 0);
@@ -149,11 +149,11 @@ void tst_QSoundEffect::testLooping()
     sound->play();
     QVERIFY(readSignal_Remaining.count() > 0);
 
-    // test.wav is about 200ms, wait until it has finished playing 5 times
+    // test.wav is about 200ms, wait until it has finished playing 3 times
     QTestEventLoop::instance().enterLoop(3);
 
     QTRY_COMPARE(sound->loopsRemaining(), 0);
-    QVERIFY(readSignal_Remaining.count() >= 6);
+    QVERIFY(readSignal_Remaining.count() == 4);
     QTRY_VERIFY(!sound->isPlaying());
 
     // QTBUG-36643 (setting the loop count while playing should work)
@@ -161,8 +161,8 @@ void tst_QSoundEffect::testLooping()
         readSignal_Count.clear();
         readSignal_Remaining.clear();
 
-        sound->setLoopCount(30);
-        QCOMPARE(sound->loopCount(), 30);
+        sound->setLoopCount(10);
+        QCOMPARE(sound->loopCount(), 10);
         QCOMPARE(readSignal_Count.count(), 1);
         QCOMPARE(sound->loopsRemaining(), 0);
         QCOMPARE(readSignal_Remaining.count(), 0);
@@ -171,21 +171,21 @@ void tst_QSoundEffect::testLooping()
         QVERIFY(readSignal_Remaining.count() > 0);
 
         // wait for the sound to be played several times
-        QTRY_VERIFY(sound->loopsRemaining() <= 20);
-        QVERIFY(readSignal_Remaining.count() >= 10);
+        QTRY_VERIFY(sound->loopsRemaining() <= 7);
+        QVERIFY(readSignal_Remaining.count() >= 3);
         readSignal_Count.clear();
         readSignal_Remaining.clear();
 
         // change the loop count while playing
-        sound->setLoopCount(5);
-        QCOMPARE(sound->loopCount(), 5);
+        sound->setLoopCount(3);
+        QCOMPARE(sound->loopCount(), 3);
         QCOMPARE(readSignal_Count.count(), 1);
-        QCOMPARE(sound->loopsRemaining(), 5);
+        QCOMPARE(sound->loopsRemaining(), 3);
         QCOMPARE(readSignal_Remaining.count(), 1);
 
         // wait for all the loops to be completed
         QTRY_COMPARE(sound->loopsRemaining(), 0);
-        QTRY_VERIFY(readSignal_Remaining.count() >= 6);
+        QTRY_VERIFY(readSignal_Remaining.count() == 4);
         QTRY_VERIFY(!sound->isPlaying());
     }
 
@@ -203,7 +203,7 @@ void tst_QSoundEffect::testLooping()
         QTRY_COMPARE(sound->loopsRemaining(), int(QSoundEffect::Infinite));
         QCOMPARE(readSignal_Remaining.count(), 1);
 
-        QTest::qWait(1500);
+        QTest::qWait(500);
         QVERIFY(sound->isPlaying());
         readSignal_Count.clear();
         readSignal_Remaining.clear();
@@ -228,8 +228,7 @@ void tst_QSoundEffect::testVolume()
     sound->setVolume(0.5);
     QCOMPARE(sound->volume(),0.5);
 
-    QTest::qWait(20);
-    QCOMPARE(readSignal.count(),1);
+    QTRY_COMPARE(readSignal.count(),1);
 }
 
 void tst_QSoundEffect::testMuting()
@@ -239,8 +238,7 @@ void tst_QSoundEffect::testMuting()
     sound->setMuted(true);
     QCOMPARE(sound->isMuted(),true);
 
-    QTest::qWait(20);
-    QCOMPARE(readSignal.count(),1);
+    QTRY_COMPARE(readSignal.count(),1);
 }
 
 void tst_QSoundEffect::testPlaying()
@@ -303,7 +301,7 @@ void tst_QSoundEffect::testDestroyWhilePlaying()
     instance->setVolume(0.1f);
     QTestEventLoop::instance().enterLoop(1);
     instance->play();
-    QTest::qWait(500);
+    QTest::qWait(100);
     delete instance;
     QTestEventLoop::instance().enterLoop(1);
 }
@@ -315,7 +313,7 @@ void tst_QSoundEffect::testDestroyWhileRestartPlaying()
     instance->setVolume(0.1f);
     QTestEventLoop::instance().enterLoop(1);
     instance->play();
-    QTest::qWait(1000);
+    QTRY_COMPARE(instance->isPlaying(), false);
     //restart playing
     instance->play();
     delete instance;
@@ -324,7 +322,7 @@ void tst_QSoundEffect::testDestroyWhileRestartPlaying()
 
 void tst_QSoundEffect::testSetSourceWhileLoading()
 {
-    for (int i = 0; i < 10; i++) {
+    for (int i = 0; i < 2; i++) {
         sound->setSource(url);
         QVERIFY(sound->status() == QSoundEffect::Loading || sound->status() == QSoundEffect::Ready);
         sound->setSource(url); // set same source again
@@ -352,7 +350,7 @@ void tst_QSoundEffect::testSetSourceWhileLoading()
 
 void tst_QSoundEffect::testSetSourceWhilePlaying()
 {
-    for (int i = 0; i < 10; i++) {
+    for (int i = 0; i < 2; i++) {
         sound->setSource(url);
         QTRY_COMPARE(sound->status(), QSoundEffect::Ready);
         sound->play();