Cleanup the QMediaEncoder backend architecture

QPlatformMediaEncoder should not be a QObject, as with the
other backend classes. Instead, the class now tracks some
state to simplify the implementation of the platform dependent
code and emits the signals for the frontend.

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

3 files changed, 7 insertions, 12 deletions

diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
index 8a8057966..b13bfe3a4 100644
--- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
+++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
@@ -438,7 +438,7 @@ void tst_QCameraBackend::testVideoRecording()
     session.setEncoder(&recorder);
 
     QSignalSpy errorSignal(camera.data(), SIGNAL(errorOccurred(QCamera::Error, const QString &)));
-    QSignalSpy recorderErrorSignal(&recorder, SIGNAL(error(QMediaEncoder::Error)));
+    QSignalSpy recorderErrorSignal(&recorder, SIGNAL(errorOccurred(QMediaEncoder::Error, const QString &)));
     QSignalSpy recorderStatusSignal(&recorder, SIGNAL(statusChanged(QMediaEncoder::Status)));
 
     QMediaEncoderSettings videoSettings;
@@ -452,15 +452,16 @@ void tst_QCameraBackend::testVideoRecording()
         QVERIFY(!camera->isActive());
         return;
     }
+    QTRY_VERIFY(camera->isActive());
 
     QTRY_COMPARE(camera->status(), QCamera::ActiveStatus);
     QTRY_COMPARE(recorder.status(), QMediaEncoder::StoppedStatus);
 
-    //record 5 seconds clip
+    //record 1 seconds clip
     recorder.record();
     QTRY_COMPARE(recorder.status(), QMediaEncoder::RecordingStatus);
     QCOMPARE(recorderStatusSignal.last().first().value<QMediaEncoder::Status>(), recorder.status());
-    QTest::qWait(5000);
+    QTest::qWait(1000);
     recorderStatusSignal.clear();
     recorder.stop();
     bool foundFinalizingStatus = false;
diff --git a/tests/auto/unit/mockbackend/qmockmediaencoder.h b/tests/auto/unit/mockbackend/qmockmediaencoder.h
index d51d21104..84dfec434 100644
--- a/tests/auto/unit/mockbackend/qmockmediaencoder.h
+++ b/tests/auto/unit/mockbackend/qmockmediaencoder.h
@@ -36,8 +36,6 @@
 
 class QMockMediaEncoder : public QPlatformMediaEncoder
 {
-    Q_OBJECT
-
 public:
     QMockMediaEncoder(QMediaEncoder *parent):
         QPlatformMediaEncoder(parent),
@@ -90,7 +88,7 @@ public:
 
     using QPlatformMediaEncoder::error;
 
-public slots:
+public:
     void record()
     {
         m_state = QMediaEncoder::RecordingState;
diff --git a/tests/auto/unit/multimedia/qmediaencoder/tst_qmediaencoder.cpp b/tests/auto/unit/multimedia/qmediaencoder/tst_qmediaencoder.cpp
index 9973baa27..3803cee96 100644
--- a/tests/auto/unit/multimedia/qmediaencoder/tst_qmediaencoder.cpp
+++ b/tests/auto/unit/multimedia/qmediaencoder/tst_qmediaencoder.cpp
@@ -199,7 +199,7 @@ void tst_QMediaEncoder::testError()
 {
     const QString errorString(QLatin1String("format error"));
 
-    QSignalSpy spy(encoder, SIGNAL(error(QMediaEncoder::Error)));
+    QSignalSpy spy(encoder, SIGNAL(errorOccurred(QMediaEncoder::Error, const QString&)));
 
     QCOMPARE(encoder->error(), QMediaEncoder::NoError);
     QCOMPARE(encoder->errorString(), QString());
@@ -562,10 +562,6 @@ void tst_QMediaEncoder::testSettingsApplied()
     QCOMPARE(mock->m_settingAppliedCount, 3);
 
     encoder.stop();
-
-    //applySettings is not called if setting has not changes
-    encoder.record();
-    QCOMPARE(mock->m_settingAppliedCount, 3);
 }
 
 void tst_QMediaEncoder::metaData()
@@ -722,7 +718,7 @@ void tst_QMediaEncoder::testEnum()
 {
     const QString errorString(QLatin1String("resource error"));
 
-    QSignalSpy spy(encoder, SIGNAL(error(QMediaEncoder::Error)));
+    QSignalSpy spy(encoder, SIGNAL(errorOccurred(QMediaEncoder::Error, const QString&)));
 
     QCOMPARE(encoder->error(), QMediaEncoder::NoError);
     QCOMPARE(encoder->errorString(), QString());