diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2014-11-20 17:54:18 +0100 |
|---|---|---|
| committer | Andrew den Exter <andrew.den.exter@qinetic.com.au> | 2014-11-27 23:30:05 +0100 |
| commit | 108dda7a90bd0f0337358b0db47ae55acd16dea6 (patch) | |
| tree | e74c44c004b257fb99fdc96063641c76ac0426cf /src/plugins/gstreamer/camerabin/camerabinimageprocessing.cpp | |
| parent | 7e3d69668e3f04110a651dee1850a1d0c885947b (diff) | |
GStreamer: port to 1.0.
0.10 is still used by default.
To enable GStreamer 1.0, pass GST_VERSION=1.0 to qmake
for qtmultimedia.pro.
Contributions from:
Andrew den Exter <andrew.den.exter@qinetic.com.au>
Ilya Smelykh <ilya@videoexpertsgroup.com>
Jim Hodapp <jim.hodapp@canonical.com>
Sergio Schvezov <sergio.schvezov@canonical.com>
Change-Id: I72a46d1170a8794a149bdb5e20767afcc5b7587c
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinimageprocessing.cpp')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinimageprocessing.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinimageprocessing.cpp b/src/plugins/gstreamer/camerabin/camerabinimageprocessing.cpp index ebfb08741..811225f68 100644 --- a/src/plugins/gstreamer/camerabin/camerabinimageprocessing.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinimageprocessing.cpp @@ -34,7 +34,11 @@ #include "camerabinimageprocessing.h" #include "camerabinsession.h" -#include <gst/interfaces/colorbalance.h> +#if GST_CHECK_VERSION(1,0,0) +# include <gst/video/colorbalance.h> +#else +# include <gst/interfaces/colorbalance.h> +#endif QT_BEGIN_NAMESPACE @@ -126,7 +130,7 @@ bool CameraBinImageProcessing::setColorBalanceValue(const QString& channel, qrea QCameraImageProcessing::WhiteBalanceMode CameraBinImageProcessing::whiteBalanceMode() const { #ifdef HAVE_GST_PHOTOGRAPHY - GstWhiteBalanceMode wbMode; + GstPhotographyWhiteBalanceMode wbMode; gst_photography_get_white_balance_mode(m_session->photography(), &wbMode); return m_mappedWbValues[wbMode]; #else |