Removed encoding options from Audio/Video encoding controls

They are replaced with encoding options from
QAudio/Video/ImageEncoderSettings.
This also allows to specify options without
requesting controls.

Change-Id: I507e68cdb8cb46325689804d27c6d0561cada50b
Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

5 files changed, 0 insertions, 85 deletions

diff --git a/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp b/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp
index eef4d316b..878b03a53 100644
--- a/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp
+++ b/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp
@@ -71,7 +71,6 @@ private slots:
     void testNullService();
     void testNullControl();
     void testAudioSource();
-    void testOptions();
     void testDevices();
     void testAvailability();
     void testAvailableAudioInputChangedSignal();
@@ -142,16 +141,6 @@ void tst_QAudioRecorder::testAudioSource()
     QCOMPARE(audiosource->mediaObject()->service(),(QMediaService *) mockMediaRecorderService);
 }
 
-void tst_QAudioRecorder::testOptions()
-{
-    const QString codec(QLatin1String("audio/mpeg"));
-
-    QStringList options = mockMediaRecorderService->mockAudioEncoderControl->supportedEncodingOptions(codec);
-    QCOMPARE(options.count(), 4);
-    mockMediaRecorderService->mockAudioEncoderControl->setEncodingOption(codec, options.first(),8000);
-    QVERIFY(mockMediaRecorderService->mockAudioEncoderControl->encodingOption(codec, options.first()).toInt() == 8000);
-}
-
 void tst_QAudioRecorder::testDevices()
 {
     audiosource = new QAudioRecorder;
diff --git a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
index bb5c8b525..99ea5d7b5 100644
--- a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
+++ b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
@@ -390,11 +390,6 @@ void tst_QMediaRecorder::testAudioEncodeControl()
     QStringList codecs = capture->supportedAudioCodecs();
     QVERIFY(codecs.count() == 2);
     QVERIFY(capture->audioCodecDescription("audio/pcm") == "Pulse Code Modulation");
-    QStringList options = encode->supportedEncodingOptions("audio/mpeg");
-    QCOMPARE(options.count(), 4);
-    QVERIFY(encode->encodingOption("audio/mpeg","bitrate").isNull());
-    encode->setEncodingOption("audio/mpeg", "bitrate", QString("vbr"));
-    QCOMPARE(encode->encodingOption("audio/mpeg","bitrate").toString(), QString("vbr"));
     QList<int> rates;
     rates << 8000 << 11025 << 22050 << 44100;
     QCOMPARE(capture->supportedAudioSampleRates(), rates);
@@ -423,14 +418,6 @@ void tst_QMediaRecorder::testVideoEncodeControl()
     QStringList vCodecs = capture->supportedVideoCodecs();
     QVERIFY(vCodecs.count() == 2);
     QCOMPARE(capture->videoCodecDescription("video/3gpp"), QString("video/3gpp"));
-
-    QStringList options = videoEncode->supportedEncodingOptions("video/3gpp");
-    QCOMPARE(options.count(), 2);
-
-    QVERIFY(encode->encodingOption("video/3gpp","me").isNull());
-    encode->setEncodingOption("video/3gpp", "me", QString("dia"));
-    QCOMPARE(encode->encodingOption("video/3gpp","me").toString(), QString("dia"));
-
 }
 
 void tst_QMediaRecorder::testEncodingSettings()
diff --git a/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h b/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h
index 789128a0f..7fb83e396 100644
--- a/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h
+++ b/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h
@@ -53,8 +53,6 @@ public:
     {
         m_codecs << "audio/pcm" << "audio/mpeg";
         m_descriptions << "Pulse Code Modulation" << "mp3 format";
-        m_supportedEncodeOptions.insert("audio/pcm", QStringList());
-        m_supportedEncodeOptions.insert("audio/mpeg", QStringList() << "quality" << "bitrate" << "mode" << "vbr");
         m_audioSettings.setCodec("audio/pcm");
         m_audioSettings.setBitRate(128*1024);
         m_audioSettings.setSampleRate(8000);
@@ -96,21 +94,6 @@ public:
         return m_descriptions.value(m_codecs.indexOf(codecName));
     }
 
-    QStringList supportedEncodingOptions(const QString &codec) const
-    {
-        return m_supportedEncodeOptions.value(codec);
-    }
-
-    QVariant encodingOption(const QString &codec, const QString &name) const
-    {
-        return m_encodeOptions[codec].value(name);
-    }
-
-    void setEncodingOption(const QString &codec, const QString &name, const QVariant &value)
-    {
-        m_encodeOptions[codec][name] = value;
-    }
-
 private:
     QAudioEncoderSettings m_audioSettings;
 
@@ -119,9 +102,6 @@ private:
 
     QList<int>   m_freqs;
 
-    QMap<QString, QStringList> m_supportedEncodeOptions;
-    QMap<QString, QMap<QString, QVariant> > m_encodeOptions;
-
 };
 
 #endif // MOCKAUDIOENCODERCONTROL_H
diff --git a/tests/auto/unit/qmultimedia_common/mockvideoencodercontrol.h b/tests/auto/unit/qmultimedia_common/mockvideoencodercontrol.h
index 7346240a4..1e756d389 100644
--- a/tests/auto/unit/qmultimedia_common/mockvideoencodercontrol.h
+++ b/tests/auto/unit/qmultimedia_common/mockvideoencodercontrol.h
@@ -51,8 +51,6 @@ public:
     MockVideoEncoderControl(QObject *parent):
         QVideoEncoderControl(parent)
     {
-        m_supportedEncodeOptions.insert("video/3gpp", QStringList() << "quantizer" << "me");
-        m_supportedEncodeOptions.insert("video/H264", QStringList() << "quantizer" << "me" << "bframes");
         m_videoCodecs << "video/3gpp" << "video/H264";
         m_sizes << QSize(320,240) << QSize(640,480);
         m_framerates << 30 << 15 << 1;
@@ -83,27 +81,9 @@ public:
     QStringList supportedVideoCodecs() const { return m_videoCodecs; }
     QString videoCodecDescription(const QString &codecName) const { return codecName; }
 
-    QStringList supportedEncodingOptions(const QString &codec) const
-    {
-        return m_supportedEncodeOptions.value(codec);
-    }
-
-    QVariant encodingOption(const QString &codec, const QString &name) const
-    {
-        return m_encodeOptions[codec].value(name);
-    }
-
-    void setEncodingOption(const QString &codec, const QString &name, const QVariant &value)
-    {
-        m_encodeOptions[codec][name] = value;
-    }
-
 private:
     QVideoEncoderSettings m_videoSettings;
 
-    QMap<QString, QStringList> m_supportedEncodeOptions;
-    QMap< QString, QMap<QString, QVariant> > m_encodeOptions;
-
     QStringList m_videoCodecs;
     QList<QSize> m_sizes;
     QList<qreal> m_framerates;
diff --git a/tests/auto/unit/qvideoencodercontrol/tst_qvideoencodercontrol.cpp b/tests/auto/unit/qvideoencodercontrol/tst_qvideoencodercontrol.cpp
index 84e715a5b..3df6d05fd 100644
--- a/tests/auto/unit/qvideoencodercontrol/tst_qvideoencodercontrol.cpp
+++ b/tests/auto/unit/qvideoencodercontrol/tst_qvideoencodercontrol.cpp
@@ -97,27 +97,6 @@ public:
     {
         Q_UNUSED(settings);
     }
-
-    QStringList supportedEncodingOptions(const QString &codec) const
-    {
-        Q_UNUSED(codec);
-        return QStringList();
-    }
-
-    QVariant encodingOption(const QString &codec, const QString &name) const
-    {
-        Q_UNUSED(codec);
-        Q_UNUSED(name);
-        return QVariant();
-    }
-
-    void setEncodingOption(const QString &codec, const QString &name, const QVariant &value)
-    {
-        Q_UNUSED(codec);
-        Q_UNUSED(name);
-        Q_UNUSED(value);
-    }
-
 };
 
 class tst_QVideoEncoderControl: public QObject