From a22a0195f146e83174ee4eacffe33c161ab39e50 Mon Sep 17 00:00:00 2001 From: Dmytro Poplavskiy Date: Tue, 31 Jan 2012 10:08:49 +1000 Subject: 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 Reviewed-by: Michael Goddard --- src/plugins/audiocapture/audiocapturesession.cpp | 4 ++-- src/plugins/audiocapture/audiocapturesession.h | 4 ++-- src/plugins/audiocapture/audiocontainercontrol.cpp | 8 ++++---- src/plugins/audiocapture/audiocontainercontrol.h | 4 ++-- .../gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp | 2 +- .../gstreamer/mediacapture/qgstreamermediacontainercontrol.h | 6 +++--- src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/audiocapture/audiocapturesession.cpp b/src/plugins/audiocapture/audiocapturesession.cpp index 29dd11dc9..62e475d15 100644 --- a/src/plugins/audiocapture/audiocapturesession.cpp +++ b/src/plugins/audiocapture/audiocapturesession.cpp @@ -146,7 +146,7 @@ QString AudioCaptureSession::containerDescription(const QString &formatMimeType) return QString(); } -void AudioCaptureSession::setContainerMimeType(const QString &formatMimeType) +void AudioCaptureSession::setContainerFormat(const QString &formatMimeType) { if (!formatMimeType.contains(QLatin1String("audio/x-wav")) && !formatMimeType.contains(QLatin1String("audio/pcm")) && @@ -167,7 +167,7 @@ void AudioCaptureSession::setContainerMimeType(const QString &formatMimeType) } } -QString AudioCaptureSession::containerMimeType() const +QString AudioCaptureSession::containerFormat() const { if(wavFile) return QString("audio/x-wav"); diff --git a/src/plugins/audiocapture/audiocapturesession.h b/src/plugins/audiocapture/audiocapturesession.h index 4151daaa4..bf68f6eef 100644 --- a/src/plugins/audiocapture/audiocapturesession.h +++ b/src/plugins/audiocapture/audiocapturesession.h @@ -69,8 +69,8 @@ public: bool isFormatSupported(const QAudioFormat &format) const; bool setFormat(const QAudioFormat &format); QStringList supportedContainers() const; - QString containerMimeType() const; - void setContainerMimeType(const QString &formatMimeType); + QString containerFormat() const; + void setContainerFormat(const QString &formatMimeType); QString containerDescription(const QString &formatMimeType) const; QUrl outputLocation() const; diff --git a/src/plugins/audiocapture/audiocontainercontrol.cpp b/src/plugins/audiocapture/audiocontainercontrol.cpp index 732df3e1e..462bfa731 100644 --- a/src/plugins/audiocapture/audiocontainercontrol.cpp +++ b/src/plugins/audiocapture/audiocontainercontrol.cpp @@ -57,14 +57,14 @@ QStringList AudioContainerControl::supportedContainers() const return m_session->supportedContainers(); } -QString AudioContainerControl::containerMimeType() const +QString AudioContainerControl::containerFormat() const { - return m_session->containerMimeType(); + return m_session->containerFormat(); } -void AudioContainerControl::setContainerMimeType(const QString &formatMimeType) +void AudioContainerControl::setContainerFormat(const QString &formatMimeType) { - m_session->setContainerMimeType(formatMimeType); + m_session->setContainerFormat(formatMimeType); } QString AudioContainerControl::containerDescription(const QString &formatMimeType) const diff --git a/src/plugins/audiocapture/audiocontainercontrol.h b/src/plugins/audiocapture/audiocontainercontrol.h index baf8a5a34..bc93834c3 100644 --- a/src/plugins/audiocapture/audiocontainercontrol.h +++ b/src/plugins/audiocapture/audiocontainercontrol.h @@ -59,8 +59,8 @@ public: virtual ~AudioContainerControl(); QStringList supportedContainers() const; - QString containerMimeType() const; - void setContainerMimeType(const QString &formatMimeType); + QString containerFormat() const; + void setContainerFormat(const QString &formatMimeType); QString containerDescription(const QString &formatMimeType) const; private: 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 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 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(); -- cgit v1.2.3