slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated the camerabin2 based camera with QtMultimedia changes

Browse Source 
Moved it to the separate plugin as the rest of gstreamer based services;
Updated with libqgsttools_p changes;
Implemented QMediaRecorder::status property;
Made gst_photography dependency optional,
it's not always available on desktop;
Added video recording case to auto integration test;
Moved backend implementation into qt namespace

Task-number: QTBUG-26046
Change-Id: Iacfc1a6e263a4c0201d5eb28d04c960b87a230c0
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2012-07-16 10:55:20 +10:00
committed by Qt by Nokia
parent fdc197d614
commit b6a8c713bc
47 changed files with 889 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/gstreamer/camerabin/camerabincontainer.h
View File

@@ -51,9 +51,9 @@
#include <gst/pbutils/pbutils.h>
#include <gst/pbutils/encoding-profile.h>
#include "qgstcodecsinfo.h"
#include <private/qgstcodecsinfo_p.h>
QT_USE_NAMESPACE
QT_BEGIN_NAMESPACE
class CameraBinContainer : public QMediaContainerControl
{
@@ -65,13 +65,10 @@ public:
virtual QStringList supportedContainers() const;
virtual QString containerDescription(const QString &formatMimeType) const;
virtual QString containerMimeType() const;
virtual void setContainerMimeType(const QString &formatMimeType);
virtual QString containerFormat() const;
virtual void setContainerFormat(const QString &format);
void setActualContainer(const QString &formatMimeType);
void resetActualContainer();
QString suggestedFileExtension() const;
QString suggestedFileExtension(const QString &containerFormat) const;
GstEncodingContainerProfile *createProfile();
@@ -80,10 +77,11 @@ Q_SIGNALS:
private:
QString m_format; // backend selected format, using m_userFormat
QString m_userFormat;
QMap<QString, QString> m_fileExtensions;
QGstCodecsInfo m_supportedContainers;
};
QT_END_NAMESPACE
#endif // CAMERABINMEDIACONTAINERCONTROL_H