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

24
src/plugins/audiocapture/audioencodercontrol.cpp
View File

@@ -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<int> AudioEncoderControl::supportedSampleRates(const QAudioEncoderSettings &, bool *continuous) const
{
if (continuous)

4
src/plugins/audiocapture/audioencodercontrol.h
View File

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

17
src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp
View File

@@ -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<int> CameraBinAudioEncoder::supportedSampleRates(const QAudioEncoderSettings &, bool *) const
{
//TODO check element caps to find actual values

2
src/plugins/gstreamer/camerabin/camerabinaudioencoder.h
View File

@@ -90,8 +90,6 @@ Q_SIGNALS:
private:
QGstCodecsInfo m_codecs;
QMap<QString,QStringList> m_codecOptions;
QMap<QString, QMap<QString, QVariant> > m_options;
QAudioEncoderSettings m_audioSettings;
QAudioEncoderSettings m_userSettings;

16
src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp
View File

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

6
src/plugins/gstreamer/camerabin/camerabinvideoencoder.h
View File

@@ -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<QString,QStringList> m_codecOptions;
QMap<QString, QMap<QString, QVariant> > m_options;
QVideoEncoderSettings m_videoSettings; // backend selected settings, using m_userSettings
QVideoEncoderSettings m_userSettings;