summaryrefslogtreecommitdiffstats
path: root/src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp
diff options
context:
space:
mode:
authorDmytro Poplavskiy <dmytro.poplavskiy@nokia.com>2012-07-13 11:12:06 +1000
committerQt by Nokia <qt-info@nokia.com>2012-07-16 07:18:15 +0200
commit864ab3a39a8ce5155bf975e9ddd58fd20cd9f87f (patch)
treedaccf4b4d86cec4ba4c6812b746065c3371f4d1b /src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp
parentb6a8c713bcc0b0cc032fdbf909143f3ba8ca15a6 (diff)
Camerabin camera service: configure default video settings
encodebin doesn't like the encoding profile with ANY container caps, if container and codecs are not specified try to find a commonly used supported combination Change-Id: Icbde042bd17d9682112fb8bbb8f0d506f6ddebe1 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp')
-rw-r--r--src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp b/src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp
index bfd22a305..ebbadd1a5 100644
--- a/src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp
@@ -81,24 +81,31 @@ QAudioEncoderSettings CameraBinAudioEncoder::audioSettings() const
void CameraBinAudioEncoder::setAudioSettings(const QAudioEncoderSettings &settings)
{
- m_userSettings = settings;
- m_audioSettings = settings;
- emit settingsChanged();
+ if (m_audioSettings != settings) {
+ m_audioSettings = settings;
+ m_actualAudioSettings = settings;
+ emit settingsChanged();
+ }
+}
+
+QAudioEncoderSettings CameraBinAudioEncoder::actualAudioSettings() const
+{
+ return m_actualAudioSettings;
}
void CameraBinAudioEncoder::setActualAudioSettings(const QAudioEncoderSettings &settings)
{
- m_audioSettings = settings;
+ m_actualAudioSettings = settings;
}
void CameraBinAudioEncoder::resetActualSettings()
{
- m_audioSettings = m_userSettings;
+ m_actualAudioSettings = m_audioSettings;
}
GstEncodingProfile *CameraBinAudioEncoder::createProfile()
{
- QString codec = m_audioSettings.codec();
+ QString codec = m_actualAudioSettings.codec();
GstCaps *caps;
if (codec.isEmpty())