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>

2 files changed, 0 insertions, 40 deletions

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;