slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed encoding options from Audio/Video encoding controls

Browse Source 
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>
This commit is contained in:
Dmytro Poplavskiy
2012-06-06 14:06:04 +10:00
committed by Qt by Nokia
parent f53788ae42
commit 62749d654d
15 changed files with 0 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/multimedia/controls/qaudioencodercontrol.cpp
View File

@@ -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

5
src/multimedia/controls/qaudioencodercontrol.h
View File

@@ -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);
};

20
src/multimedia/controls/qvideoencodercontrol.cpp
View File

@@ -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

4
src/multimedia/controls/qvideoencodercontrol.h
View File

@@ -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);
};