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
@@ -38,6 +38,7 @@
|
||||
|
||||
#include "qgstreamervideorendererinterface_p.h"
|
||||
#include <private/qgstreamerbushelper_p.h>
|
||||
#include <private/qgstreamerbufferprobe_p.h>
|
||||
#include <QtGui/qcolor.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
@@ -45,7 +46,8 @@ class QAbstractVideoSurface;
|
||||
|
||||
class QGstreamerVideoWindow : public QVideoWindowControl,
|
||||
public QGstreamerVideoRendererInterface,
|
||||
public QGstreamerSyncMessageFilter
|
||||
public QGstreamerSyncMessageFilter,
|
||||
private QGstreamerBufferProbe
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_INTERFACES(QGstreamerVideoRendererInterface QGstreamerSyncMessageFilter)
|
||||
@@ -101,10 +103,10 @@ signals:
|
||||
void readyChanged(bool);
|
||||
|
||||
private slots:
|
||||
void updateNativeVideoSize();
|
||||
void updateNativeVideoSize(const QSize &size);
|
||||
|
||||
private:
|
||||
static void padBufferProbe(GstPad *pad, GstBuffer *buffer, gpointer user_data);
|
||||
void probeCaps(GstCaps *caps);
|
||||
|
||||
GstElement *m_videoSink;
|
||||
WId m_windowId;
|
||||
@@ -113,7 +115,6 @@ private:
|
||||
bool m_fullScreen;
|
||||
QSize m_nativeSize;
|
||||
mutable QColor m_colorKey;
|
||||
int m_bufferProbeId;
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
Reference in New Issue
Block a user