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>
This commit is contained in:
committed by
Andrew den Exter
parent
7e3d69668e
commit
108dda7a90
@@ -45,6 +45,18 @@
|
||||
// We mean it.
|
||||
//
|
||||
|
||||
#include <gst/gst.h>
|
||||
|
||||
#if GST_CHECK_VERSION(1,0,0)
|
||||
|
||||
#include "qgstvideorenderersink_p.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
typedef QGstVideoRendererSink QVideoSurfaceGstSink;
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#else
|
||||
|
||||
#include <gst/video/gstvideosink.h>
|
||||
|
||||
#include <QtCore/qlist.h>
|
||||
@@ -116,10 +128,6 @@ public:
|
||||
GstVideoSink parent;
|
||||
|
||||
static QVideoSurfaceGstSink *createSink(QAbstractVideoSurface *surface);
|
||||
static QVideoSurfaceFormat formatForCaps(GstCaps *caps,
|
||||
int *bytesPerLine = 0,
|
||||
QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle);
|
||||
static void setFrameTimeStamps(QVideoFrame *frame, GstBuffer *buffer);
|
||||
|
||||
private:
|
||||
static GType get_type();
|
||||
@@ -150,7 +158,6 @@ private:
|
||||
QVideoSurfaceFormat *lastSurfaceFormat;
|
||||
};
|
||||
|
||||
|
||||
class QVideoSurfaceGstSinkClass
|
||||
{
|
||||
public:
|
||||
@@ -160,3 +167,5 @@ public:
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user