diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:27 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:51:09 +0100 |
commit | e964e89331f2cfef99a3f63172a127b6c02a9727 (patch) | |
tree | 4c7d78573d17e523e4278027cee8fa88494366c8 /src/plugins/gstreamer/camerabin/camerabinsession.cpp | |
parent | f09d36708fdab70ad51af374a65ddded64525f67 (diff) | |
parent | 6f7192a048432e4792330244b74a2a39ccd8d515 (diff) |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/plugins/gstreamer/camerabin/camerabincontainer.h
Change-Id: I4942d41d69112335fe0c994002f1b32ef3aad051
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinsession.cpp')
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinsession.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp index 1e075f58d..ab0bea24a 100644 --- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp @@ -36,6 +36,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + +#include <QtMultimedia/private/qtmultimediaglobal_p.h> #include "camerabinsession.h" #include "camerabincontrol.h" #include "camerabinrecorder.h" @@ -44,7 +46,7 @@ #include "camerabinvideoencoder.h" #include "camerabinimageencoder.h" -#ifdef HAVE_GST_PHOTOGRAPHY +#if QT_CONFIG(gstreamer_photography) #include "camerabinexposure.h" #include "camerabinflash.h" #include "camerabinfocus.h" @@ -63,7 +65,7 @@ #include <qmediarecorder.h> #include <qvideosurfaceformat.h> -#ifdef HAVE_GST_PHOTOGRAPHY +#if QT_CONFIG(gstreamer_photography) #include <gst/interfaces/photography.h> #endif @@ -127,7 +129,7 @@ CameraBinSession::CameraBinSession(GstElementFactory *sourceFactory, QObject *pa m_videoInputFactory(0), m_viewfinder(0), m_viewfinderInterface(0), -#ifdef HAVE_GST_PHOTOGRAPHY +#if QT_CONFIG(gstreamer_photography) m_cameraExposureControl(0), m_cameraFlashControl(0), m_cameraFocusControl(0), @@ -212,7 +214,7 @@ CameraBinSession::~CameraBinSession() gst_object_unref(GST_OBJECT(m_sourceFactory)); } -#ifdef HAVE_GST_PHOTOGRAPHY +#if QT_CONFIG(gstreamer_photography) GstPhotography *CameraBinSession::photography() { if (GST_IS_PHOTOGRAPHY(m_camerabin)) { @@ -807,7 +809,7 @@ void CameraBinSession::start() m_recorderControl->applySettings(); -#ifdef HAVE_GST_ENCODING_PROFILES +#if QT_CONFIG(gstreamer_encodingprofiles) GstEncodingContainerProfile *profile = m_recorderControl->videoProfile(); g_object_set (G_OBJECT(m_camerabin), "video-profile", @@ -952,7 +954,7 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message) } return true; } -#ifdef HAVE_GST_PHOTOGRAPHY +#if QT_CONFIG(gstreamer_photography) if (gst_structure_has_name(st, GST_PHOTOGRAPHY_AUTOFOCUS_DONE)) m_cameraFocusControl->handleFocusMessage(gm); #endif |