[qtmultimedia] Apply presets supplied in audio and video settings.

mer-packages · Sep 3, 2013 · f03cdb5 · f03cdb5
1 parent 21957b1
commit f03cdb5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/qtmultimedia/src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp b/qtmultimedia/src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp
@@ -106,6 +106,7 @@ void CameraBinAudioEncoder::resetActualSettings()
 GstEncodingProfile *CameraBinAudioEncoder::createProfile()
 {
     QString codec = m_actualAudioSettings.codec();
+    QString preset = m_actualAudioSettings.encodingOption(QStringLiteral("preset")).toString();
     GstCaps *caps;
 
     if (codec.isEmpty())
@@ -115,7 +116,7 @@ GstEncodingProfile *CameraBinAudioEncoder::createProfile()
 
     return (GstEncodingProfile *)gst_encoding_audio_profile_new(
                                         caps,
-                                        NULL, //preset
+                                        !preset.isEmpty() ? preset.toUtf8().constData() : NULL,	//preset
                                         NULL, //restriction
                                         0); //presence
 }

diff --git a/qtmultimedia/src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp b/qtmultimedia/src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp
@@ -160,6 +160,8 @@ QPair<int,int> CameraBinVideoEncoder::rateAsRational(qreal frameRate) const
 GstEncodingProfile *CameraBinVideoEncoder::createProfile()
 {
     QString codec = m_actualVideoSettings.codec();
+    QString preset = m_actualVideoSettings.encodingOption(QStringLiteral("preset")).toString();
+
     GstCaps *caps;
 
     if (codec.isEmpty())
@@ -169,7 +171,7 @@ GstEncodingProfile *CameraBinVideoEncoder::createProfile()
 
     GstEncodingVideoProfile *profile = gst_encoding_video_profile_new(
                 caps,
-                NULL, //preset
+                !preset.isEmpty() ? preset.toUtf8().constData() : NULL,	//preset
                 NULL, //restriction
                 1); //presence