Split QMediaRecorder::setEncodingSettings to separate setters.

It's easier to change only the necessary part of encoding settings.
The settings are applied during the next event loop or before recording
starts.

Change-Id: Ia2b5c93826a302212aa7f79a0c75e4cbaaf1dd7a
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

3 files changed, 7 insertions, 7 deletions

diff --git a/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp b/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp
index 3e57cc786..12297bac5 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp
@@ -101,7 +101,7 @@ QGstreamerMediaContainerControl::QGstreamerMediaContainerControl(QObject *parent
     }
 
     //if (!m_supportedContainers.isEmpty())
-    //    setContainerMimeType(m_supportedContainers[0]);
+    //    setContainerFormat(m_supportedContainers[0]);
 }
 
 QSet<QString> QGstreamerMediaContainerControl::supportedStreamTypes(GstElementFactory *factory, GstPadDirection direction)
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.h b/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.h
index 68a0b0b56..75d7e8eb7 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.h
+++ b/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.h
@@ -59,12 +59,12 @@ public:
     virtual ~QGstreamerMediaContainerControl() {};
 
     virtual QStringList supportedContainers() const { return m_supportedContainers; }
-    virtual QString containerMimeType() const { return m_format; }
-    virtual void setContainerMimeType(const QString &formatMimeType) { m_format = formatMimeType; }
+    virtual QString containerFormat() const { return m_format; }
+    virtual void setContainerFormat(const QString &formatMimeType) { m_format = formatMimeType; }
 
     virtual QString containerDescription(const QString &formatMimeType) const { return m_containerDescriptions.value(formatMimeType); }
 
-    QByteArray formatElementName() const { return m_elementNames.value(containerMimeType()); }
+    QByteArray formatElementName() const { return m_elementNames.value(containerFormat()); }
 
     QSet<QString> supportedStreamTypes(const QString &container) const;
 
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp b/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
index 958551fb7..c9e8d454c 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
@@ -152,10 +152,10 @@ void QGstreamerRecorderControl::applySettings()
     bool needVideo = m_session->captureMode() & QGstreamerCaptureSession::Video;
 
     QStringList containerCandidates;
-    if (mediaContainerControl->containerMimeType().isEmpty())
+    if (mediaContainerControl->containerFormat().isEmpty())
         containerCandidates = mediaContainerControl->supportedContainers();
     else
-        containerCandidates << mediaContainerControl->containerMimeType();
+        containerCandidates << mediaContainerControl->containerFormat();
 
 
     QStringList audioCandidates;
@@ -221,7 +221,7 @@ void QGstreamerRecorderControl::applySettings()
     if (container.isEmpty()) {
         emit error(QMediaRecorder::FormatError, tr("Not compatible codecs and container format."));
     } else {
-        mediaContainerControl->setContainerMimeType(container);
+        mediaContainerControl->setContainerFormat(container);
 
         if (needAudio) {
             QAudioEncoderSettings audioSettings = audioEncodeControl->audioSettings();