From 62749d654d6bbd50d84089e038529fda815cf96f Mon Sep 17 00:00:00 2001 From: Dmytro Poplavskiy Date: Wed, 6 Jun 2012 14:06:04 +1000 Subject: 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 Reviewed-by: Michael Goddard --- src/multimedia/controls/qaudioencodercontrol.cpp | 18 ---------------- src/multimedia/controls/qaudioencodercontrol.h | 5 ----- src/multimedia/controls/qvideoencodercontrol.cpp | 20 ------------------ src/multimedia/controls/qvideoencodercontrol.h | 4 ---- src/plugins/audiocapture/audioencodercontrol.cpp | 24 ---------------------- src/plugins/audiocapture/audioencodercontrol.h | 4 ---- .../gstreamer/camerabin/camerabinaudioencoder.cpp | 17 --------------- .../gstreamer/camerabin/camerabinaudioencoder.h | 2 -- .../gstreamer/camerabin/camerabinvideoencoder.cpp | 16 --------------- .../gstreamer/camerabin/camerabinvideoencoder.h | 6 ------ 10 files changed, 116 deletions(-) (limited to 'src') diff --git a/src/multimedia/controls/qaudioencodercontrol.cpp b/src/multimedia/controls/qaudioencodercontrol.cpp index 573dbe9f3..4224ff7bf 100644 --- a/src/multimedia/controls/qaudioencodercontrol.cpp +++ b/src/multimedia/controls/qaudioencodercontrol.cpp @@ -120,24 +120,6 @@ QAudioEncoderControl::~QAudioEncoderControl() *\a continuous is set to true, otherwise *\a continuous is set to false. */ -/*! - \fn QAudioEncoderControl::supportedEncodingOptions(const QString &codec) const - - Returns the list of \a codec specific audio encoding options. -*/ - -/*! - \fn QAudioEncoderControl::encodingOption(const QString &codec, const QString &option) const - - Returns the value of audio encoding \a option for \a codec. -*/ - -/*! - \fn QAudioEncoderControl::setEncodingOption(const QString &codec, const QString &option, const QVariant &value) - - Set the \a codec specific \a option to \a value. -*/ - /*! \fn QAudioEncoderControl::audioSettings() const diff --git a/src/multimedia/controls/qaudioencodercontrol.h b/src/multimedia/controls/qaudioencodercontrol.h index 35322ff40..090706a79 100644 --- a/src/multimedia/controls/qaudioencodercontrol.h +++ b/src/multimedia/controls/qaudioencodercontrol.h @@ -75,11 +75,6 @@ public: virtual QAudioEncoderSettings audioSettings() const = 0; virtual void setAudioSettings(const QAudioEncoderSettings&) = 0; - virtual QStringList supportedEncodingOptions(const QString &codec) const = 0; - virtual QVariant encodingOption(const QString &codec, const QString &name) const = 0; - virtual void setEncodingOption( - const QString &codec, const QString &name, const QVariant &value) = 0; - protected: QAudioEncoderControl(QObject *parent = 0); }; diff --git a/src/multimedia/controls/qvideoencodercontrol.cpp b/src/multimedia/controls/qvideoencodercontrol.cpp index a5a6af71f..b69909043 100644 --- a/src/multimedia/controls/qvideoencodercontrol.cpp +++ b/src/multimedia/controls/qvideoencodercontrol.cpp @@ -107,26 +107,6 @@ QVideoEncoderControl::~QVideoEncoderControl() Returns a description of a video \a codec. */ -/*! - \fn QVideoEncoderControl::supportedEncodingOptions(const QString &codec) const - - Returns a list of supported encoding options for a video \a codec. - - The names and types of the options in the list is system dependent. -*/ - -/*! - \fn QVideoEncoderControl::encodingOption(const QString &codec, const QString &option) const - - Returns the value of a video \a codec \a option. -*/ - -/*! - \fn QVideoEncoderControl::setEncodingOption(const QString &codec, const QString &option, const QVariant &value) - - Sets the \a value of a \a codec specific \a option. -*/ - /*! \fn QVideoEncoderControl::supportedResolutions(const QVideoEncoderSettings &settings = QVideoEncoderSettings(), bool *continuous = 0) const diff --git a/src/multimedia/controls/qvideoencodercontrol.h b/src/multimedia/controls/qvideoencodercontrol.h index ea3c49f91..9ffcd3584 100644 --- a/src/multimedia/controls/qvideoencodercontrol.h +++ b/src/multimedia/controls/qvideoencodercontrol.h @@ -79,10 +79,6 @@ public: virtual QVideoEncoderSettings videoSettings() const = 0; virtual void setVideoSettings(const QVideoEncoderSettings &settings) = 0; - virtual QStringList supportedEncodingOptions(const QString &codec) const = 0; - virtual QVariant encodingOption(const QString &codec, const QString &name) const = 0; - virtual void setEncodingOption(const QString &codec, const QString &name, const QVariant &value) = 0; - protected: QVideoEncoderControl(QObject *parent = 0); }; diff --git a/src/plugins/audiocapture/audioencodercontrol.cpp b/src/plugins/audiocapture/audioencodercontrol.cpp index 1d51961e6..67d685a9b 100644 --- a/src/plugins/audiocapture/audioencodercontrol.cpp +++ b/src/plugins/audiocapture/audioencodercontrol.cpp @@ -89,30 +89,6 @@ QString AudioEncoderControl::codecDescription(const QString &codecName) const return QString(); } -QStringList AudioEncoderControl::supportedEncodingOptions(const QString &codec) const -{ - Q_UNUSED(codec) - - QStringList list; - return list; -} - -QVariant AudioEncoderControl::encodingOption(const QString &codec, const QString &name) const -{ - Q_UNUSED(codec) - Q_UNUSED(name) - - return QVariant(); -} - -void AudioEncoderControl::setEncodingOption( - const QString &codec, const QString &name, const QVariant &value) -{ - Q_UNUSED(value) - Q_UNUSED(codec) - Q_UNUSED(name) -} - QList AudioEncoderControl::supportedSampleRates(const QAudioEncoderSettings &, bool *continuous) const { if (continuous) diff --git a/src/plugins/audiocapture/audioencodercontrol.h b/src/plugins/audiocapture/audioencodercontrol.h index dfdff3bda..bf7e7b327 100644 --- a/src/plugins/audiocapture/audioencodercontrol.h +++ b/src/plugins/audiocapture/audioencodercontrol.h @@ -67,10 +67,6 @@ public: QAudioEncoderSettings audioSettings() const; void setAudioSettings(const QAudioEncoderSettings&); - QStringList supportedEncodingOptions(const QString &codec) const; - QVariant encodingOption(const QString &codec, const QString &name) const; - void setEncodingOption(const QString &codec, const QString &name, const QVariant &value); - private: AudioCaptureSession* m_session; QAudioEncoderSettings m_settings; diff --git a/src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp b/src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp index a166d1879..72fe602ec 100644 --- a/src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp @@ -65,23 +65,6 @@ QString CameraBinAudioEncoder::codecDescription(const QString &codecName) const return m_codecs.codecDescription(codecName); } -QStringList CameraBinAudioEncoder::supportedEncodingOptions(const QString &codec) const -{ - return m_codecOptions.value(codec); -} - -QVariant CameraBinAudioEncoder::encodingOption( - const QString &codec, const QString &name) const -{ - return m_options[codec].value(name); -} - -void CameraBinAudioEncoder::setEncodingOption( - const QString &codec, const QString &name, const QVariant &value) -{ - m_options[codec][name] = value; -} - QList CameraBinAudioEncoder::supportedSampleRates(const QAudioEncoderSettings &, bool *) const { //TODO check element caps to find actual values diff --git a/src/plugins/gstreamer/camerabin/camerabinaudioencoder.h b/src/plugins/gstreamer/camerabin/camerabinaudioencoder.h index 644dda742..4727e1327 100644 --- a/src/plugins/gstreamer/camerabin/camerabinaudioencoder.h +++ b/src/plugins/gstreamer/camerabin/camerabinaudioencoder.h @@ -90,8 +90,6 @@ Q_SIGNALS: private: QGstCodecsInfo m_codecs; - QMap m_codecOptions; - QMap > m_options; QAudioEncoderSettings m_audioSettings; QAudioEncoderSettings m_userSettings; diff --git a/src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp b/src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp index b315a62e4..e16379275 100644 --- a/src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp @@ -94,22 +94,6 @@ QString CameraBinVideoEncoder::videoCodecDescription(const QString &codecName) c return m_codecs.codecDescription(codecName); } -QStringList CameraBinVideoEncoder::supportedEncodingOptions(const QString &codec) const -{ - return m_codecOptions.value(codec); -} - -QVariant CameraBinVideoEncoder::encodingOption(const QString &codec, const QString &name) const -{ - return m_options[codec].value(name); -} - -void CameraBinVideoEncoder::setEncodingOption( - const QString &codec, const QString &name, const QVariant &value) -{ - m_options[codec][name] = value; -} - QVideoEncoderSettings CameraBinVideoEncoder::videoSettings() const { return m_videoSettings; diff --git a/src/plugins/gstreamer/camerabin/camerabinvideoencoder.h b/src/plugins/gstreamer/camerabin/camerabinvideoencoder.h index 61fa12710..9617731a5 100644 --- a/src/plugins/gstreamer/camerabin/camerabinvideoencoder.h +++ b/src/plugins/gstreamer/camerabin/camerabinvideoencoder.h @@ -77,10 +77,6 @@ public: QVideoEncoderSettings videoSettings() const; void setVideoSettings(const QVideoEncoderSettings &settings); - QStringList supportedEncodingOptions(const QString &codec) const; - QVariant encodingOption(const QString &codec, const QString &name) const; - void setEncodingOption(const QString &codec, const QString &name, const QVariant &value); - void setActualVideoSettings(const QVideoEncoderSettings&); void resetActualSettings(); @@ -93,8 +89,6 @@ private: CameraBinSession *m_session; QGstCodecsInfo m_codecs; - QMap m_codecOptions; - QMap > m_options; QVideoEncoderSettings m_videoSettings; // backend selected settings, using m_userSettings QVideoEncoderSettings m_userSettings; -- cgit v1.2.3