Provide encoderSettings with the applySettings function

setEncoderSettings is always followed by a call to applySettings, which
is called only once for a sequence of setEncoderSettings calls.
Furthermore, QGstreamerMediaEncoder::setEncoderSettings called
applySettings() which is later called again anyway, leading to multiple
unnecessary applySettings calls. The existence of setEncoderSettings
and applySettings at the same time is confusing and unnecessary

Change-Id: Id24d47c65f54a37a449eeb0a8aeea6a550154c67
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 2 insertions, 3 deletions

diff --git a/tests/auto/unit/mockbackend/qmockmediaencoder.h b/tests/auto/unit/mockbackend/qmockmediaencoder.h
index e835a5959..dcf33ee48 100644
--- a/tests/auto/unit/mockbackend/qmockmediaencoder.h
+++ b/tests/auto/unit/mockbackend/qmockmediaencoder.h
@@ -60,13 +60,12 @@ public:
         return m_position;
     }
 
-    void applySettings()
+    void applySettings(const QMediaEncoderSettings &settings)
     {
+        m_settings = settings;
         m_settingAppliedCount++;
     }
 
-    void setEncoderSettings(const QMediaEncoderSettings &settings) { m_settings = settings; }
-
     virtual void setMetaData(const QMediaMetaData &m)
     {
         m_metaData = m;