diff options
author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-11-13 18:48:19 +0100 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-11-19 11:59:20 +0000 |
commit | 7c4574a6985671f14148ad8ee591aee4487f5d4d (patch) | |
tree | 5c1a748ba06c94d6866ecac4bd75409c5ed5f85d /src/plugins/gstreamer/camerabin/camerabincontainer.h | |
parent | 4a2c597a0666452a39939339ebd6f87040952cd3 (diff) |
Support compiling with GStreamer < 0.10.32 in the camerabin plugin.
The documented minimum GStreamer version for Qt Multimedia is 0.10.24,
however, the camerabin plugin actually required 0.10.32 to compile
successfully. The reason is mainly due to the GstEncodingProfiles
API, which is used to implement the audio and video encoding settings
controls. There's no hard requirement for that API anymore and the
aforementioned controls simply don't do anything when the GStreamer
version used to compile is older than 0.10.32.
A few other GStreamer calls had to be ifdef'd or replaced in order
to compile with 0.10.24.
Note that this patch only makes sure it compiles with older versions,
running the camerabin plugin with GStreamer < 0.10.32 is currently
untested and it might not work as expected.
Task-number: QTBUG-48914
Change-Id: I4ce8e932f24a33e919e29326729e12bbae561faf
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabincontainer.h')
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabincontainer.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabincontainer.h b/src/plugins/gstreamer/camerabin/camerabincontainer.h index 2f5173388..8f2079535 100644 --- a/src/plugins/gstreamer/camerabin/camerabincontainer.h +++ b/src/plugins/gstreamer/camerabin/camerabincontainer.h @@ -41,9 +41,11 @@ #include <gst/gst.h> #include <gst/pbutils/pbutils.h> -#include <gst/pbutils/encoding-profile.h> +#ifdef HAVE_GST_ENCODING_PROFILES +#include <gst/pbutils/encoding-profile.h> #include <private/qgstcodecsinfo_p.h> +#endif QT_BEGIN_NAMESPACE @@ -66,7 +68,9 @@ public: QString suggestedFileExtension(const QString &containerFormat) const; +#ifdef HAVE_GST_ENCODING_PROFILES GstEncodingContainerProfile *createProfile(); +#endif Q_SIGNALS: void settingsChanged(); @@ -76,7 +80,9 @@ private: QString m_actualFormat; QMap<QString, QString> m_fileExtensions; +#ifdef HAVE_GST_ENCODING_PROFILES QGstCodecsInfo m_supportedContainers; +#endif }; QT_END_NAMESPACE |