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

20
tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h
View File

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