summaryrefslogtreecommitdiffstats
path: root/src/multimedia/platform/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia/platform/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp')
-rw-r--r--src/multimedia/platform/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
index 7c60ed4d1..fabf6cf20 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
@@ -42,6 +42,7 @@
#include <QtGui/qdesktopservices.h>
#include <QStandardPaths>
#include "qaudiodeviceinfo.h"
+#include <qmimetype.h>
QGstreamerRecorderControl::QGstreamerRecorderControl(QGstreamerCaptureSession *session)
: QMediaRecorderControl(session),
@@ -154,9 +155,9 @@ void QGstreamerRecorderControl::record()
m_state = QMediaRecorder::RecordingState;
if (m_outputLocation.isEmpty()) {
- QString container;// ### = m_session->mediaContainerControl()->containerExtension();
+ QString container = resolvedEncoderSettings().mimeType().preferredSuffix();
if (container.isEmpty())
- container = "raw";
+ container = QString::fromLatin1("raw");
m_session->setOutputLocation(QUrl(generateFileName(defaultDir(), container)));
}
@@ -232,12 +233,10 @@ void QGstreamerRecorderControl::setEncoderSettings(const QMediaEncoderSettings &
QMediaEncoderSettings QGstreamerRecorderControl::resolvedEncoderSettings() const
{
QMediaEncoderSettings f = m_settings;
- f.resolveFormat(m_session->captureMode() & QGstreamerCaptureSession::Video ?
- QMediaEncoderSettings::AudioAndVideo : QMediaEncoderSettings::AudioOnly);
+ f.resolveFormat();
return f;
}
-
bool QGstreamerRecorderControl::isMuted() const
{
return m_session->isMuted();