Remove the gstreamer encoding profile test

We now require the gstreamer base libs, and the base utils
library always contains encoding profile support. So get
rid of the feature check for this one, we can safely assume
it's supported.

Change-Id: I4d9d44aaed07bbc49d46c5bd03cae2662b6935e0
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

9 files changed, 0 insertions, 77 deletions

diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinaudioencoder.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinaudioencoder.cpp
index 9a26016de..9ea4fb4a4 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabinaudioencoder.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinaudioencoder.cpp
@@ -48,9 +48,7 @@ QT_BEGIN_NAMESPACE
 
 CameraBinAudioEncoder::CameraBinAudioEncoder(QObject *parent)
     :QAudioEncoderSettingsControl(parent)
-#if QT_CONFIG(gstreamer_encodingprofiles)
     , m_codecs(QGstCodecsInfo::AudioEncoder)
-#endif
 {
 }
 
@@ -60,21 +58,12 @@ CameraBinAudioEncoder::~CameraBinAudioEncoder()
 
 QStringList CameraBinAudioEncoder::supportedAudioCodecs() const
 {
-#if QT_CONFIG(gstreamer_encodingprofiles)
     return m_codecs.supportedCodecs();
-#else
-    return QStringList();
-#endif
 }
 
 QString CameraBinAudioEncoder::codecDescription(const QString &codecName) const
 {
-#if QT_CONFIG(gstreamer_encodingprofiles)
     return m_codecs.codecDescription(codecName);
-#else
-    Q_UNUSED(codecName);
-    return QString();
-#endif
 }
 
 QList<int> CameraBinAudioEncoder::supportedSampleRates(const QAudioEncoderSettings &, bool *) const
@@ -113,8 +102,6 @@ void CameraBinAudioEncoder::resetActualSettings()
     m_actualAudioSettings = m_audioSettings;
 }
 
-#if QT_CONFIG(gstreamer_encodingprofiles)
-
 GstEncodingProfile *CameraBinAudioEncoder::createProfile()
 {
     QString codec = m_actualAudioSettings.codec();
@@ -137,8 +124,6 @@ GstEncodingProfile *CameraBinAudioEncoder::createProfile()
     return profile;
 }
 
-#endif
-
 void CameraBinAudioEncoder::applySettings(GstElement *encoder)
 {
     GObjectClass * const objectClass = G_OBJECT_GET_CLASS(encoder);
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinaudioencoder_p.h b/src/multimedia/platform/gstreamer/camerabin/camerabinaudioencoder_p.h
index 0c6708449..4bdd4512e 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabinaudioencoder_p.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinaudioencoder_p.h
@@ -61,10 +61,8 @@
 #include <gst/gst.h>
 #include <gst/pbutils/pbutils.h>
 
-#if QT_CONFIG(gstreamer_encodingprofiles)
 #include <gst/pbutils/encoding-profile.h>
 #include <private/qgstcodecsinfo_p.h>
-#endif
 
 #include <qaudioformat.h>
 
@@ -97,9 +95,7 @@ public:
     void setActualAudioSettings(const QAudioEncoderSettings&);
     void resetActualSettings();
 
-#if QT_CONFIG(gstreamer_encodingprofiles)
     GstEncodingProfile *createProfile();
-#endif
 
     void applySettings(GstElement *element);
 
@@ -107,9 +103,7 @@ Q_SIGNALS:
     void settingsChanged();
 
 private:
-#if QT_CONFIG(gstreamer_encodingprofiles)
     QGstCodecsInfo m_codecs;
-#endif
 
     QAudioEncoderSettings m_actualAudioSettings;
     QAudioEncoderSettings m_audioSettings;
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabincontainer.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabincontainer.cpp
index b19a5524e..ed2b0171b 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabincontainer.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabincontainer.cpp
@@ -47,29 +47,18 @@ QT_BEGIN_NAMESPACE
 
 CameraBinContainer::CameraBinContainer(QObject *parent)
     :QMediaContainerControl(parent)
-#if QT_CONFIG(gstreamer_encodingprofiles)
     , m_supportedContainers(QGstCodecsInfo::Muxer)
-#endif
 {
 }
 
 QStringList CameraBinContainer::supportedContainers() const
 {
-#if QT_CONFIG(gstreamer_encodingprofiles)
     return m_supportedContainers.supportedCodecs();
-#else
-    return QStringList();
-#endif
 }
 
 QString CameraBinContainer::containerDescription(const QString &formatMimeType) const
 {
-#if QT_CONFIG(gstreamer_encodingprofiles)
     return m_supportedContainers.codecDescription(formatMimeType);
-#else
-    Q_UNUSED(formatMimeType);
-    return QString();
-#endif
 }
 
 QString CameraBinContainer::containerFormat() const
@@ -79,13 +68,11 @@ QString CameraBinContainer::containerFormat() const
 
 void CameraBinContainer::setContainerFormat(const QString &format)
 {
-#if QT_CONFIG(gstreamer_encodingprofiles)
     if (m_format != format) {
         m_format = format;
         m_actualFormat = format;
         emit settingsChanged();
     }
-#endif
 }
 
 QString CameraBinContainer::actualContainerFormat() const
@@ -95,9 +82,7 @@ QString CameraBinContainer::actualContainerFormat() const
 
 void CameraBinContainer::setActualContainerFormat(const QString &containerFormat)
 {
-#if QT_CONFIG(gstreamer_encodingprofiles)
     m_actualFormat = containerFormat;
-#endif
 }
 
 void CameraBinContainer::resetActualContainerFormat()
@@ -105,8 +90,6 @@ void CameraBinContainer::resetActualContainerFormat()
     m_actualFormat = m_format;
 }
 
-#if QT_CONFIG(gstreamer_encodingprofiles)
-
 GstEncodingContainerProfile *CameraBinContainer::createProfile()
 {
     GstCaps *caps = nullptr;
@@ -146,6 +129,4 @@ GstEncodingContainerProfile *CameraBinContainer::createProfile()
     return profile;
 }
 
-#endif
-
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabincontainer_p.h b/src/multimedia/platform/gstreamer/camerabin/camerabincontainer_p.h
index c743adf83..1cdc09fad 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabincontainer_p.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabincontainer_p.h
@@ -60,10 +60,8 @@
 #include <gst/gst.h>
 #include <gst/pbutils/pbutils.h>
 
-#if QT_CONFIG(gstreamer_encodingprofiles)
 #include <gst/pbutils/encoding-profile.h>
 #include <private/qgstcodecsinfo_p.h>
-#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -84,9 +82,7 @@ public:
     void setActualContainerFormat(const QString &containerFormat);
     void resetActualContainerFormat();
 
-#if QT_CONFIG(gstreamer_encodingprofiles)
     GstEncodingContainerProfile *createProfile();
-#endif
 
 Q_SIGNALS:
     void settingsChanged();
@@ -95,9 +91,7 @@ private:
     QString m_format;
     QString m_actualFormat;
 
-#if QT_CONFIG(gstreamer_encodingprofiles)
     QGstCodecsInfo m_supportedContainers;
-#endif
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder.cpp
index 24b52ec07..ed0b252c7 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder.cpp
@@ -130,7 +130,6 @@ qint64 CameraBinRecorder::duration() const
 
 void CameraBinRecorder::applySettings()
 {
-#if QT_CONFIG(gstreamer_encodingprofiles)
     CameraBinContainer *containerControl = m_session->mediaContainerControl();
     CameraBinAudioEncoder *audioEncoderControl = m_session->audioEncodeControl();
     CameraBinVideoEncoder *videoEncoderControl = m_session->videoEncodeControl();
@@ -201,7 +200,6 @@ void CameraBinRecorder::applySettings()
             }
         }
     }
-#endif
 }
 
 QAudioDeviceInfo CameraBinRecorder::audioInput() const
@@ -216,8 +214,6 @@ bool CameraBinRecorder::setAudioInput(const QAudioDeviceInfo &info)
     return true;
 }
 
-#if QT_CONFIG(gstreamer_encodingprofiles)
-
 GstEncodingContainerProfile *CameraBinRecorder::videoProfile()
 {
     GstEncodingContainerProfile *containerProfile = m_session->mediaContainerControl()->createProfile();
@@ -239,8 +235,6 @@ GstEncodingContainerProfile *CameraBinRecorder::videoProfile()
     return containerProfile;
 }
 
-#endif
-
 void CameraBinRecorder::setState(QMediaRecorder::State state)
 {
     if (m_state == state)
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder_p.h b/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder_p.h
index 888e228dd..0bd6ae56b 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder_p.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder_p.h
@@ -56,9 +56,7 @@
 #include <qmediarecordercontrol.h>
 #include "camerabinsession.h"
 
-#if QT_CONFIG(gstreamer_encodingprofiles)
 #include <gst/pbutils/encoding-profile.h>
-#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -86,9 +84,7 @@ public:
     QAudioDeviceInfo audioInput() const override;
     bool setAudioInput(const QAudioDeviceInfo &id) override;
 
-#if QT_CONFIG(gstreamer_encodingprofiles)
     GstEncodingContainerProfile *videoProfile();
-#endif
 
 public slots:
     void setState(QMediaRecorder::State state) override;
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinsession.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinsession.cpp
index 2348bedd7..6435c7096 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabinsession.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinsession.cpp
@@ -757,7 +757,6 @@ void CameraBinSession::load()
 
     m_recorderControl->applySettings();
 
-#if QT_CONFIG(gstreamer_encodingprofiles)
     GstEncodingContainerProfile *profile = m_recorderControl->videoProfile();
     if (profile) {
         g_object_set (G_OBJECT(m_camerabin),
@@ -766,7 +765,6 @@ void CameraBinSession::load()
                       NULL);
         gst_encoding_profile_unref(profile);
     }
-#endif
 
     gst_element_set_state(m_camerabin, GST_STATE_READY);
 }
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinvideoencoder.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinvideoencoder.cpp
index 8ecbc0eb0..443f84060 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabinvideoencoder.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinvideoencoder.cpp
@@ -50,9 +50,7 @@ QT_BEGIN_NAMESPACE
 CameraBinVideoEncoder::CameraBinVideoEncoder(CameraBinSession *session)
     :QVideoEncoderSettingsControl(session)
     , m_session(session)
-#if QT_CONFIG(gstreamer_encodingprofiles)
     , m_codecs(QGstCodecsInfo::VideoEncoder)
-#endif
 {
 }
 
@@ -62,21 +60,12 @@ CameraBinVideoEncoder::~CameraBinVideoEncoder()
 
 QStringList CameraBinVideoEncoder::supportedVideoCodecs() const
 {
-#if QT_CONFIG(gstreamer_encodingprofiles)
     return m_codecs.supportedCodecs();
-#else
-    return QStringList();
-#endif
 }
 
 QString CameraBinVideoEncoder::videoCodecDescription(const QString &codecName) const
 {
-#if QT_CONFIG(gstreamer_encodingprofiles)
     return m_codecs.codecDescription(codecName);
-#else
-    Q_UNUSED(codecName);
-    return QString();
-#endif
 }
 
 QVideoEncoderSettings CameraBinVideoEncoder::videoSettings() const
@@ -140,8 +129,6 @@ QPair<int,int> CameraBinVideoEncoder::rateAsRational(qreal frameRate) const
     return QPair<int,int>();
 }
 
-#if QT_CONFIG(gstreamer_encodingprofiles)
-
 GstEncodingProfile *CameraBinVideoEncoder::createProfile()
 {
     QString codec = m_actualVideoSettings.codec();
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinvideoencoder_p.h b/src/multimedia/platform/gstreamer/camerabin/camerabinvideoencoder_p.h
index acb8e6db9..f9ed546d7 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabinvideoencoder_p.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinvideoencoder_p.h
@@ -61,10 +61,8 @@
 #include <gst/gst.h>
 #include <gst/pbutils/pbutils.h>
 
-#if QT_CONFIG(gstreamer_encodingprofiles)
 #include <gst/pbutils/encoding-profile.h>
 #include <private/qgstcodecsinfo_p.h>
-#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -89,9 +87,7 @@ public:
     void setActualVideoSettings(const QVideoEncoderSettings&);
     void resetActualSettings();
 
-#if QT_CONFIG(gstreamer_encodingprofiles)
     GstEncodingProfile *createProfile();
-#endif
 
     void applySettings(GstElement *encoder);
 
@@ -101,9 +97,7 @@ Q_SIGNALS:
 private:
     CameraBinSession *m_session;
 
-#if QT_CONFIG(gstreamer_encodingprofiles)
     QGstCodecsInfo m_codecs;
-#endif
 
     QVideoEncoderSettings m_actualVideoSettings;
     QVideoEncoderSettings m_videoSettings;