diff options
author | Jonas Rabbe <jonas.rabbe@nokia.com> | 2011-10-11 15:25:36 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-12 08:58:30 +0200 |
commit | 48d95f0baac39fc5eb38a137a8e84eda2cdb2b79 (patch) | |
tree | 038a66510f91527c70a5fc416238484842a514c1 | |
parent | 126addddb5e5a1928a8decf84e9e20655ac24f8d (diff) |
Moved general gstreamer helper classes into separate library.
Cleaned up configuration of gstreamer with a separate config
test.
Change-Id: I1ec9ee466233687fbcfdc544a12d9fce578e4379
Reviewed-on: http://codereview.qt-project.org/6459
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
37 files changed, 278 insertions, 75 deletions
diff --git a/config.tests/gstreamer/gstreamer.pro b/config.tests/gstreamer/gstreamer.pro new file mode 100644 index 000000000..5fcd1ab79 --- /dev/null +++ b/config.tests/gstreamer/gstreamer.pro @@ -0,0 +1,20 @@ +TEMPLATE = app +DEPENDPATH += . +INCLUDEPATH += . + +requires(unix) + +# Input +SOURCES += main.cpp + +CONFIG += link_pkgconfig + +PKGCONFIG += \ + gstreamer-0.10 \ + gstreamer-base-0.10 \ + gstreamer-interfaces-0.10 \ + gstreamer-audio-0.10 \ + gstreamer-video-0.10 \ + gstreamer-pbutils-0.10 + + diff --git a/config.tests/gstreamer/main.cpp b/config.tests/gstreamer/main.cpp new file mode 100644 index 000000000..94228d188 --- /dev/null +++ b/config.tests/gstreamer/main.cpp @@ -0,0 +1,49 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the Qt Toolkit +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#define GST_USE_UNSTABLE_API + +#include <gst/gst.h> + +int main(int argc, char** argv) +{ + return 0; +} diff --git a/src/gsttools/gsttools.pro b/src/gsttools/gsttools.pro new file mode 100644 index 000000000..778564bcf --- /dev/null +++ b/src/gsttools/gsttools.pro @@ -0,0 +1,67 @@ +TEMPLATE = lib + +TARGET = qgsttools_p +QPRO_PWD = $$PWD +QT = core multimedia + +!static:DEFINES += QT_MAKEDLL + +unix:!maemo*:contains(QT_CONFIG, alsa) { +DEFINES += HAVE_ALSA +LIBS += \ + -lasound +} + +CONFIG += link_pkgconfig + +PKGCONFIG += \ + gstreamer-0.10 \ + gstreamer-base-0.10 \ + gstreamer-interfaces-0.10 \ + gstreamer-audio-0.10 \ + gstreamer-video-0.10 \ + gstreamer-pbutils-0.10 + +maemo*:PKGCONFIG +=gstreamer-plugins-bad-0.10 +contains(config_test_gstreamer_appsrc, yes): PKGCONFIG += gstreamer-app-0.10 + +contains(config_test_resourcepolicy, yes) { + DEFINES += HAVE_RESOURCE_POLICY + PKGCONFIG += libresourceqt1 +} + +# Header files must go inside source directory of a module +# to be installed by syncqt. +INCLUDEPATH += ../multimedia/gsttools_headers/ +DEPENDPATH += ../multimedia/gsttools_headers/ + +PRIVATE_HEADERS += \ + qabstractgstbufferpool_p.h \ + qgstreamerbushelper_p.h \ + qgstreamermessage_p.h \ + qgstutils_p.h \ + qgstvideobuffer_p.h \ + qvideosurfacegstsink_p.h \ + +SOURCES += \ + qgstreamerbushelper.cpp \ + qgstreamermessage.cpp \ + qgstutils.cpp \ + qgstvideobuffer.cpp \ + qvideosurfacegstsink.cpp \ + +!win32:!contains(QT_CONFIG,embedded):!mac:!simulator:!contains(QT_CONFIG, qpa) { + LIBS += -lXv -lX11 -lXext + + PRIVATE_HEADERS += \ + qgstxvimagebuffer_p.h \ + + + SOURCES += \ + qgstxvimagebuffer.cpp \ +} + +HEADERS += $$PRIVATE_HEADERS + +DESTDIR = $$QT.multimedia.libs + diff --git a/src/plugins/gstreamer/qgstreamerbushelper.cpp b/src/gsttools/qgstreamerbushelper.cpp index 92f2ee8b7..211c364df 100644 --- a/src/plugins/gstreamer/qgstreamerbushelper.cpp +++ b/src/gsttools/qgstreamerbushelper.cpp @@ -44,7 +44,7 @@ #include <QtCore/qmutex.h> #include <QtCore/qlist.h> -#include "qgstreamerbushelper.h" +#include "qgstreamerbushelper_p.h" #ifndef QT_NO_GLIB diff --git a/src/plugins/gstreamer/qgstreamermessage.cpp b/src/gsttools/qgstreamermessage.cpp index d7c09780f..d36fa92fe 100644 --- a/src/plugins/gstreamer/qgstreamermessage.cpp +++ b/src/gsttools/qgstreamermessage.cpp @@ -41,7 +41,7 @@ #include <gst/gst.h> -#include "qgstreamermessage.h" +#include "qgstreamermessage_p.h" static int wuchi = qRegisterMetaType<QGstreamerMessage>(); diff --git a/src/plugins/gstreamer/qgstutils.cpp b/src/gsttools/qgstutils.cpp index 6f0194f24..4e501e91d 100644 --- a/src/plugins/gstreamer/qgstutils.cpp +++ b/src/gsttools/qgstutils.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qgstutils.h" +#include "qgstutils_p.h" #include <QtCore/qdatetime.h> #include <QtCore/qbytearray.h> diff --git a/src/plugins/gstreamer/qgstvideobuffer.cpp b/src/gsttools/qgstvideobuffer.cpp index bc12ee9c8..a1a93c0ef 100644 --- a/src/plugins/gstreamer/qgstvideobuffer.cpp +++ b/src/gsttools/qgstvideobuffer.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qgstvideobuffer.h" +#include "qgstvideobuffer_p.h" QGstVideoBuffer::QGstVideoBuffer(GstBuffer *buffer, int bytesPerLine) diff --git a/src/plugins/gstreamer/qgstxvimagebuffer.cpp b/src/gsttools/qgstxvimagebuffer.cpp index 31839920b..90ca86701 100644 --- a/src/plugins/gstreamer/qgstxvimagebuffer.cpp +++ b/src/gsttools/qgstxvimagebuffer.cpp @@ -44,9 +44,9 @@ #include <QtCore/qvariant.h> #include <QtWidgets/qx11info_x11.h> -#include "qgstxvimagebuffer.h" -#include "qvideosurfacegstsink.h" -#include "qgstvideobuffer.h" +#include "qgstxvimagebuffer_p.h" +#include "qvideosurfacegstsink_p.h" +#include "qgstvideobuffer_p.h" #ifndef QT_NO_XVIDEO diff --git a/src/plugins/gstreamer/qvideosurfacegstsink.cpp b/src/gsttools/qvideosurfacegstsink.cpp index 6ccc1b1c5..3df1401d2 100644 --- a/src/plugins/gstreamer/qvideosurfacegstsink.cpp +++ b/src/gsttools/qvideosurfacegstsink.cpp @@ -46,14 +46,14 @@ #include <QDebug> #include <QThread> -#include "qgstvideobuffer.h" +#include "qgstvideobuffer_p.h" #if defined(Q_WS_X11) && !defined(QT_NO_XVIDEO) #include <QtWidgets/qx11info_x11.h> -#include "qgstxvimagebuffer.h" +#include "qgstxvimagebuffer_p.h" #endif -#include "qvideosurfacegstsink.h" +#include "qvideosurfacegstsink_p.h" //#define DEBUG_VIDEO_SURFACE_SINK diff --git a/src/plugins/gstreamer/qabstractgstbufferpool.h b/src/multimedia/gsttools_headers/qabstractgstbufferpool_p.h index 5ab6b8866..40c75ad32 100644 --- a/src/plugins/gstreamer/qabstractgstbufferpool.h +++ b/src/multimedia/gsttools_headers/qabstractgstbufferpool_p.h @@ -39,8 +39,19 @@ ** ****************************************************************************/ -#ifndef QGSTBUFFERPOOL_H -#define QGSTBUFFERPOOL_H +#ifndef QGSTBUFFERPOOL_P_H +#define QGSTBUFFERPOOL_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// #include <qabstractvideobuffer.h> #include <qvideosurfaceformat.h> diff --git a/src/plugins/gstreamer/qgstreamerbushelper.h b/src/multimedia/gsttools_headers/qgstreamerbushelper_p.h index d09192a42..0ae5b8978 100644 --- a/src/plugins/gstreamer/qgstreamerbushelper.h +++ b/src/multimedia/gsttools_headers/qgstreamerbushelper_p.h @@ -39,12 +39,23 @@ ** ****************************************************************************/ -#ifndef QGSTREAMERBUSHELPER_H -#define QGSTREAMERBUSHELPER_H +#ifndef QGSTREAMERBUSHELPER_P_H +#define QGSTREAMERBUSHELPER_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// #include <QObject> -#include <qgstreamermessage.h> +#include "qgstreamermessage_p.h" #include <gst/gst.h> class QGstreamerSyncMessageFilter { diff --git a/src/plugins/gstreamer/qgstreamermessage.h b/src/multimedia/gsttools_headers/qgstreamermessage_p.h index 478774e69..b0a568de2 100644 --- a/src/plugins/gstreamer/qgstreamermessage.h +++ b/src/multimedia/gsttools_headers/qgstreamermessage_p.h @@ -39,8 +39,19 @@ ** ****************************************************************************/ -#ifndef QGSTREAMERMESSAGE_H -#define QGSTREAMERMESSAGE_H +#ifndef QGSTREAMERMESSAGE_P_H +#define QGSTREAMERMESSAGE_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// #include <QMetaType> diff --git a/src/plugins/gstreamer/qgstutils.h b/src/multimedia/gsttools_headers/qgstutils_p.h index a6f2dabb7..ea99e560f 100644 --- a/src/plugins/gstreamer/qgstutils.h +++ b/src/multimedia/gsttools_headers/qgstutils_p.h @@ -39,8 +39,19 @@ ** ****************************************************************************/ -#ifndef QGSTUTILS_H -#define QGSTUTILS_H +#ifndef QGSTUTILS_P_H +#define QGSTUTILS_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// #include <QtCore/qmap.h> #include <gst/gst.h> diff --git a/src/plugins/gstreamer/qgstvideobuffer.h b/src/multimedia/gsttools_headers/qgstvideobuffer_p.h index 8884005a0..0f14a8fec 100644 --- a/src/plugins/gstreamer/qgstvideobuffer.h +++ b/src/multimedia/gsttools_headers/qgstvideobuffer_p.h @@ -39,8 +39,19 @@ ** ****************************************************************************/ -#ifndef QGSTVIDEOBUFFER_H -#define QGSTVIDEOBUFFER_H +#ifndef QGSTVIDEOBUFFER_P_H +#define QGSTVIDEOBUFFER_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// #include <qabstractvideobuffer.h> #include <QtCore/qvariant.h> diff --git a/src/plugins/gstreamer/qgstxvimagebuffer.h b/src/multimedia/gsttools_headers/qgstxvimagebuffer_p.h index 33f706329..c6f74373e 100644 --- a/src/plugins/gstreamer/qgstxvimagebuffer.h +++ b/src/multimedia/gsttools_headers/qgstxvimagebuffer_p.h @@ -39,8 +39,19 @@ ** ****************************************************************************/ -#ifndef QGSTXVIMAGEBUFFER_H -#define QGSTXVIMAGEBUFFER_H +#ifndef QGSTXVIMAGEBUFFER_P_H +#define QGSTXVIMAGEBUFFER_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// #include <qabstractvideobuffer.h> #include <qvideosurfaceformat.h> @@ -60,7 +71,7 @@ #include <gst/gst.h> -#include "qabstractgstbufferpool.h" +#include "qabstractgstbufferpool_p.h" class QGstXvImageBufferPool; diff --git a/src/plugins/gstreamer/qvideosurfacegstsink.h b/src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h index 4110579e5..438b796cf 100644 --- a/src/plugins/gstreamer/qvideosurfacegstsink.h +++ b/src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h @@ -39,8 +39,19 @@ ** ****************************************************************************/ -#ifndef VIDEOSURFACEGSTSINK_H -#define VIDEOSURFACEGSTSINK_H +#ifndef VIDEOSURFACEGSTSINK_P_H +#define VIDEOSURFACEGSTSINK_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// #include <gst/video/gstvideosink.h> @@ -53,7 +64,7 @@ #include <qvideoframe.h> #include <qabstractvideobuffer.h> -#include "qabstractgstbufferpool.h" +#include "qabstractgstbufferpool_p.h" QT_BEGIN_NAMESPACE class QAbstractVideoSurface; diff --git a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp index a73ec4bc7..874361ec7 100644 --- a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp @@ -43,9 +43,9 @@ #include "camerabincapturedestination.h" #include "camerabincapturebufferformat.h" #include "camerabinsession.h" -#include "qgstvideobuffer.h" -#include "qvideosurfacegstsink.h" -#include "qgstutils.h" +#include <private/qgstvideobuffer_p.h> +#include <private/qvideosurfacegstsink_p.h> +#include <private/qgstutils_p.h> #include <QtCore/qdebug.h> #include <QtCore/qbuffer.h> #include <QtGui/qimagereader.h> diff --git a/src/plugins/gstreamer/camerabin/camerabinservice.cpp b/src/plugins/gstreamer/camerabin/camerabinservice.cpp index 3c994b0ff..f0aaca7b9 100644 --- a/src/plugins/gstreamer/camerabin/camerabinservice.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinservice.cpp @@ -46,7 +46,6 @@ #include "camerabinaudioencoder.h" #include "camerabinvideoencoder.h" #include "camerabinimageencoder.h" -#include "qgstreamerbushelper.h" #include "camerabincontrol.h" #include "camerabinlocks.h" #include "camerabinmetadata.h" @@ -57,6 +56,7 @@ #include "camerabinimageprocessing.h" #include "camerabincapturebufferformat.h" #include "camerabincapturedestination.h" +#include <private/qgstreamerbushelper_p.h> #include "qgstreameraudioinputendpointselector.h" #include "qgstreamervideoinputdevicecontrol.h" diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp index 251d44d8b..996e1495f 100644 --- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp @@ -51,7 +51,7 @@ #include "camerabinlocks.h" #include "camerabincapturedestination.h" #include "camerabincapturebufferformat.h" -#include "qgstreamerbushelper.h" +#include <private/qgstreamerbushelper_p.h> #include "qgstreamervideorendererinterface.h" #include <qmediarecorder.h> #include <gst/interfaces/photography.h> diff --git a/src/plugins/gstreamer/gstreamer.pro b/src/plugins/gstreamer/gstreamer.pro index baec7175c..28becfb5b 100644 --- a/src/plugins/gstreamer/gstreamer.pro +++ b/src/plugins/gstreamer/gstreamer.pro @@ -8,6 +8,8 @@ PLUGIN_TYPE=mediaservice load(qt_plugin) DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} +LIBS += -lqgsttools_p + unix:!maemo*:contains(QT_CONFIG, alsa) { DEFINES += HAVE_ALSA LIBS += \ @@ -48,33 +50,22 @@ maemo6 { # Input HEADERS += \ - qgstreamermessage.h \ - qgstreamerbushelper.h \ qgstreamervideorendererinterface.h \ qgstreamerserviceplugin.h \ qgstreameraudioinputendpointselector.h \ qgstreamervideorenderer.h \ - qgstvideobuffer.h \ - qvideosurfacegstsink.h \ qgstreamervideoinputdevicecontrol.h \ gstvideoconnector.h \ - qabstractgstbufferpool.h \ qgstcodecsinfo.h \ - qgstutils.h SOURCES += \ - qgstreamermessage.cpp \ - qgstreamerbushelper.cpp \ qgstreamervideorendererinterface.cpp \ qgstreamerserviceplugin.cpp \ qgstreameraudioinputendpointselector.cpp \ qgstreamervideorenderer.cpp \ - qgstvideobuffer.cpp \ - qvideosurfacegstsink.cpp \ qgstreamervideoinputdevicecontrol.cpp \ qgstcodecsinfo.cpp \ gstvideoconnector.c \ - qgstutils.cpp !win32:!contains(QT_CONFIG,embedded):!mac:!simulator:!contains(QT_CONFIG, qpa) { @@ -85,14 +76,12 @@ SOURCES += \ qgstreamervideowindow.h \ qgstreamervideowidget.h \ qx11videosurface.h \ - qgstxvimagebuffer.h SOURCES += \ qgstreamervideooverlay.cpp \ qgstreamervideowindow.cpp \ qgstreamervideowidget.cpp \ qx11videosurface.cpp \ - qgstxvimagebuffer.cpp } include(mediaplayer/mediaplayer.pri) include(mediacapture/mediacapture.pri) diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp index d063b0e13..ee64b2cc1 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp @@ -46,8 +46,8 @@ #include "qgstreameraudioencode.h" #include "qgstreamervideoencode.h" #include "qgstreamerimageencode.h" -#include "qgstreamerbushelper.h" #include "qgstreamercameracontrol.h" +#include <private/qgstreamerbushelper_p.h> #include "qgstreamerv4l2input.h" #include "qgstreamercapturemetadatacontrol.h" diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp index b685f5466..8d87bb387 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp @@ -46,8 +46,8 @@ #include "qgstreameraudioencode.h" #include "qgstreamervideoencode.h" #include "qgstreamerimageencode.h" -#include "qgstreamerbushelper.h" #include <qmediarecorder.h> +#include <private/qgstreamerbushelper_p.h> #include <gst/gsttagsetter.h> #include <gst/gstversion.h> diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.h b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.h index e4c734600..aa5a09cdc 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.h @@ -49,7 +49,7 @@ #include <gst/gst.h> -#include "qgstreamerbushelper.h" +#include <private/qgstreamerbushelper_p.h> QT_USE_NAMESPACE diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp index 7aef9065e..49aa3fb8f 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp @@ -40,11 +40,11 @@ ****************************************************************************/ #include "qgstreamerplayersession.h" -#include "qgstreamerbushelper.h" +#include <private/qgstreamerbushelper_p.h> #include "qgstreamervideorendererinterface.h" #include "gstvideoconnector.h" -#include "qgstutils.h" +#include <private/qgstutils_p.h> #include <gst/gstvalue.h> #include <gst/base/gstbasesrc.h> diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h index 208f0b5de..3380e6e7b 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h @@ -45,7 +45,7 @@ #include <QObject> #include <QtNetwork/qnetworkrequest.h> #include "qgstreamerplayercontrol.h" -#include "qgstreamerbushelper.h" +#include <private/qgstreamerbushelper_p.h> #include <qmediaplayer.h> #include <qmediastreamscontrol.h> diff --git a/src/plugins/gstreamer/qgstreamergltexturerenderer.cpp b/src/plugins/gstreamer/qgstreamergltexturerenderer.cpp index 615d23d82..d9633aa79 100644 --- a/src/plugins/gstreamer/qgstreamergltexturerenderer.cpp +++ b/src/plugins/gstreamer/qgstreamergltexturerenderer.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qvideosurfacegstsink.h" -#include "qabstractvideosurface.h" -#include "qgstutils.h" +#include <private/qvideosurfacegstsink_p.h> +#include <qabstractvideosurface.h> +#include <private/qgstutils_p.h> #include <QtGui/qevent.h> #include <QtWidgets/qapplication.h> diff --git a/src/plugins/gstreamer/qgstreamergltexturerenderer.h b/src/plugins/gstreamer/qgstreamergltexturerenderer.h index 7a1bc65df..244e07fd3 100644 --- a/src/plugins/gstreamer/qgstreamergltexturerenderer.h +++ b/src/plugins/gstreamer/qgstreamergltexturerenderer.h @@ -43,8 +43,8 @@ #define QGSTREAMERGLTEXTURERENDERER_H #include <qvideorenderercontrol.h> -#include "qvideosurfacegstsink.h" -#include "qgstreamerbushelper.h" +#include <private/qvideosurfacegstsink_p.h> +#include <private/qgstreamerbushelper_p.h> #include "qgstreamervideorendererinterface.h" #include <QtGui/qcolor.h> diff --git a/src/plugins/gstreamer/qgstreamervideooverlay.cpp b/src/plugins/gstreamer/qgstreamervideooverlay.cpp index 851ef2b87..f19ef6a83 100644 --- a/src/plugins/gstreamer/qgstreamervideooverlay.cpp +++ b/src/plugins/gstreamer/qgstreamervideooverlay.cpp @@ -40,11 +40,11 @@ ****************************************************************************/ #include "qgstreamervideooverlay.h" -#include "qvideosurfacegstsink.h" +#include <private/qvideosurfacegstsink_p.h> #include <qvideosurfaceformat.h> -#include "qx11videosurface.h" +#include <private/qx11videosurface_p.h> #ifndef QT_NO_XVIDEO diff --git a/src/plugins/gstreamer/qgstreamervideorenderer.cpp b/src/plugins/gstreamer/qgstreamervideorenderer.cpp index e924f8353..ead0bdcc0 100644 --- a/src/plugins/gstreamer/qgstreamervideorenderer.cpp +++ b/src/plugins/gstreamer/qgstreamervideorenderer.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include "qgstreamervideorenderer.h" -#include "qvideosurfacegstsink.h" -#include "qabstractvideosurface.h" +#include <private/qvideosurfacegstsink_p.h> +#include <qabstractvideosurface.h> #include <QEvent> #include <QtWidgets/QApplication> diff --git a/src/plugins/gstreamer/qgstreamervideorenderer.h b/src/plugins/gstreamer/qgstreamervideorenderer.h index 4fb8dda35..fbd76f6c6 100644 --- a/src/plugins/gstreamer/qgstreamervideorenderer.h +++ b/src/plugins/gstreamer/qgstreamervideorenderer.h @@ -43,7 +43,7 @@ #define QGSTREAMERVIDEORENDERER_H #include <qvideorenderercontrol.h> -#include "qvideosurfacegstsink.h" +#include <private/qvideosurfacegstsink_p.h> #include "qgstreamervideorendererinterface.h" diff --git a/src/plugins/gstreamer/qgstreamervideowidget.cpp b/src/plugins/gstreamer/qgstreamervideowidget.cpp index 61c47f01b..a0fdab726 100644 --- a/src/plugins/gstreamer/qgstreamervideowidget.cpp +++ b/src/plugins/gstreamer/qgstreamervideowidget.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qgstreamervideowidget.h" -#include "qgstutils.h" +#include <private/qgstutils_p.h> #include <QtCore/qcoreevent.h> #include <QtCore/qdebug.h> diff --git a/src/plugins/gstreamer/qgstreamervideowidget.h b/src/plugins/gstreamer/qgstreamervideowidget.h index 8f3d62316..53069faec 100644 --- a/src/plugins/gstreamer/qgstreamervideowidget.h +++ b/src/plugins/gstreamer/qgstreamervideowidget.h @@ -45,7 +45,7 @@ #include <qvideowidgetcontrol.h> #include "qgstreamervideorendererinterface.h" -#include "qgstreamerbushelper.h" +#include <private/qgstreamerbushelper_p.h> QT_USE_NAMESPACE diff --git a/src/plugins/gstreamer/qgstreamervideowindow.cpp b/src/plugins/gstreamer/qgstreamervideowindow.cpp index d8d822269..1c475bd55 100644 --- a/src/plugins/gstreamer/qgstreamervideowindow.cpp +++ b/src/plugins/gstreamer/qgstreamervideowindow.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qgstreamervideowindow.h" -#include "qgstutils.h" +#include <private/qgstutils_p.h> #include <QtCore/qdebug.h> diff --git a/src/plugins/gstreamer/qgstreamervideowindow.h b/src/plugins/gstreamer/qgstreamervideowindow.h index 3a483e2c1..2182148a0 100644 --- a/src/plugins/gstreamer/qgstreamervideowindow.h +++ b/src/plugins/gstreamer/qgstreamervideowindow.h @@ -45,7 +45,7 @@ #include <qvideowindowcontrol.h> #include "qgstreamervideorendererinterface.h" -#include "qgstreamerbushelper.h" +#include <private/qgstreamerbushelper_p.h> QT_BEGIN_NAMESPACE class QAbstractVideoSurface; diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 67cc6b701..09b9461ea 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -20,15 +20,8 @@ win32 { simulator: SUBDIRS += simulator unix:!mac { - TMP_GST_LIBS = \ - gstreamer-0.10 >= 0.10.19 \ - gstreamer-base-0.10 >= 0.10.19 \ - gstreamer-interfaces-0.10 >= 0.10.19 \ - gstreamer-audio-0.10 >= 0.10.19 \ - gstreamer-video-0.10 >= 0.10.19 - - system(pkg-config --exists \'$${TMP_GST_LIBS}\' --print-errors): { - SUBDIRS += gstreamer + contains(config_test_gstreamer, yes) { + SUBDIRS += gstreamer } else { SUBDIRS += audiocapture } diff --git a/src/src.pro b/src/src.pro index 735967f2b..f29fb118a 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,11 +1,18 @@ - TEMPLATE = subdirs CONFIG += ordered +library_qgsttools.subdir = $$IN_PWD/gsttools +library_qgsttools.depends = multimedia + library_qtmmwidgets.subdir = $$IN_PWD/multimediawidgets library_qtmmwidgets.depends = multimedia SUBDIRS += multimedia + +contains(config_test_gstreamer, yes) { + SUBDIRS += library_qgsttools +} + SUBDIRS += library_qtmmwidgets SUBDIRS += imports SUBDIRS += plugins diff --git a/sync.profile b/sync.profile index 6e444dcdf..41d2735a7 100644 --- a/sync.profile +++ b/sync.profile @@ -44,6 +44,7 @@ "evr" => {}, # Linux tests + "gstreamer" => {}, "gstreamer_photography" => {}, "gstreamer_appsrc" => {}, "pulseaudio" => {}, |