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.cpp | |
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.cpp')
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabincontainer.cpp | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabincontainer.cpp b/src/plugins/gstreamer/camerabin/camerabincontainer.cpp index 8c31d20cd..f5b6900f9 100644 --- a/src/plugins/gstreamer/camerabin/camerabincontainer.cpp +++ b/src/plugins/gstreamer/camerabin/camerabincontainer.cpp @@ -39,8 +39,10 @@ QT_BEGIN_NAMESPACE CameraBinContainer::CameraBinContainer(QObject *parent) - :QMediaContainerControl(parent), - m_supportedContainers(QGstCodecsInfo::Muxer) + :QMediaContainerControl(parent) +#ifdef HAVE_GST_ENCODING_PROFILES + , m_supportedContainers(QGstCodecsInfo::Muxer) +#endif { //extension for containers hard to guess from mimetype m_fileExtensions["video/x-matroska"] = "mkv"; @@ -54,12 +56,21 @@ CameraBinContainer::CameraBinContainer(QObject *parent) QStringList CameraBinContainer::supportedContainers() const { +#ifdef HAVE_GST_ENCODING_PROFILES return m_supportedContainers.supportedCodecs(); +#else + return QStringList(); +#endif } QString CameraBinContainer::containerDescription(const QString &formatMimeType) const { +#ifdef HAVE_GST_ENCODING_PROFILES return m_supportedContainers.codecDescription(formatMimeType); +#else + Q_UNUSED(formatMimeType) + return QString(); +#endif } QString CameraBinContainer::containerFormat() const @@ -69,11 +80,13 @@ QString CameraBinContainer::containerFormat() const void CameraBinContainer::setContainerFormat(const QString &format) { +#ifdef HAVE_GST_ENCODING_PROFILES if (m_format != format) { m_format = format; m_actualFormat = format; emit settingsChanged(); } +#endif } QString CameraBinContainer::actualContainerFormat() const @@ -83,7 +96,9 @@ QString CameraBinContainer::actualContainerFormat() const void CameraBinContainer::setActualContainerFormat(const QString &containerFormat) { +#ifdef HAVE_GST_ENCODING_PROFILES m_actualFormat = containerFormat; +#endif } void CameraBinContainer::resetActualContainerFormat() @@ -91,6 +106,8 @@ void CameraBinContainer::resetActualContainerFormat() m_actualFormat = m_format; } +#ifdef HAVE_GST_ENCODING_PROFILES + GstEncodingContainerProfile *CameraBinContainer::createProfile() { GstCaps *caps; @@ -127,6 +144,8 @@ GstEncodingContainerProfile *CameraBinContainer::createProfile() return profile; } +#endif + /*! Suggest file extension for current container mimetype. */ |