slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix X11 and QPA compilation problems

Browse Source 
The X11 buffer pool was using outdated APIs, and as the 'qpa'
configuration value is being removed, it caused the X11 code
to be pulled in, and therefore cause compilation failures.

Change-Id: I5fdaed854c6525716fccca44b5fbd0b850880cb9
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Jonas Rabbe
2011-12-09 11:45:11 +10:00
committed by Qt by Nokia
parent 9d526fca67
commit 4f3294930a
18 changed files with 150 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gsttools/gsttools.pro
View File

@@ -43,7 +43,6 @@ PRIVATE_HEADERS += \
qgstvideobuffer_p.h \
qvideosurfacegstsink_p.h \
SOURCES += \
qgstbufferpoolinterface.cpp \
qgstreamerbushelper.cpp \
@@ -52,13 +51,14 @@ SOURCES += \
qgstvideobuffer.cpp \
qvideosurfacegstsink.cpp \
!win32:!contains(QT_CONFIG,embedded):!mac:!simulator:!contains(QT_CONFIG, qpa) {
contains(config_test_xvideo, yes) {
DEFINES += HAVE_XVIDEO
LIBS += -lXv -lX11 -lXext
PRIVATE_HEADERS += \
qgstxvimagebuffer_p.h \
SOURCES += \
qgstxvimagebuffer.cpp \
}

41
src/gsttools/qgstxvimagebuffer.cpp
View File

@@ -42,14 +42,14 @@
#include <QtCore/qdebug.h>
#include <QtCore/qthread.h>
#include <QtCore/qvariant.h>
#include <QtWidgets/qx11info_x11.h>
#include <QtGui/qguiapplication.h>
#include <QtGui/qwindow.h>
#include <QtGui/qplatformnativeinterface_qpa.h>
#include "qgstxvimagebuffer_p.h"
#include "qvideosurfacegstsink_p.h"
#include "qgstvideobuffer_p.h"
#ifndef QT_NO_XVIDEO
QT_BEGIN_NAMESPACE
GstBufferClass *QGstXvImageBuffer::parent_class = NULL;
@@ -182,6 +182,11 @@ QAbstractVideoBuffer *QGstXvImageBufferPool::prepareVideoBuffer(GstBuffer *buffe
return new QGstVideoBuffer(buffer, bytesPerLine, QAbstractVideoBuffer::XvShmImageHandle, handle);
}
QStringList QGstXvImageBufferPool::keys() const
{
return QStringList() << QGstBufferPoolPluginKey;
}
void QGstXvImageBufferPool::queuedAlloc()
{
QMutexLocker lock(&m_poolMutex);
@@ -194,7 +199,7 @@ void QGstXvImageBufferPool::doAlloc()
//should be always called from the main thread with m_poolMutex locked
//Q_ASSERT(QThread::currentThread() == thread());
XSync(QX11Info::display(), false);
XSync(display(), false);
QGstXvImageBuffer *xvBuffer = (QGstXvImageBuffer *)gst_mini_object_new(QGstXvImageBuffer::get_type());
@@ -202,7 +207,7 @@ void QGstXvImageBufferPool::doAlloc()
int xvFormatId = m_format.property("xvFormatId").toInt();
xvBuffer->xvImage = XvShmCreateImage(
QX11Info::display(),
display(),
portId,
xvFormatId,
0,
@@ -216,18 +221,18 @@ void QGstXvImageBufferPool::doAlloc()
return;
}
XSync(QX11Info::display(), false);
XSync(display(), false);
xvBuffer->shmInfo.shmid = shmget(IPC_PRIVATE, xvBuffer->xvImage->data_size, IPC_CREAT | 0777);
xvBuffer->shmInfo.shmaddr = xvBuffer->xvImage->data = (char*)shmat(xvBuffer->shmInfo.shmid, 0, 0);
xvBuffer->shmInfo.readOnly = False;
if (!XShmAttach(QX11Info::display(), &xvBuffer->shmInfo)) {
if (!XShmAttach(display(), &xvBuffer->shmInfo)) {
qWarning() << "QGstXvImageBufferPool: XShmAttach failed";
return;
}
XSync(QX11Info::display(), false);
XSync(display(), false);
shmctl (xvBuffer->shmInfo.shmid, IPC_RMID, NULL);
@@ -240,7 +245,7 @@ void QGstXvImageBufferPool::doAlloc()
m_allBuffers.append(xvBuffer);
m_pool.append(xvBuffer);
XSync(QX11Info::display(), false);
XSync(display(), false);
}
@@ -269,12 +274,12 @@ void QGstXvImageBufferPool::queuedDestroy()
{
QMutexLocker lock(&m_destroyMutex);
XSync(QX11Info::display(), false);
XSync(display(), false);
foreach(XvShmImage xvImage, m_imagesToDestroy) {
if (xvImage.shmInfo.shmaddr != ((void *) -1)) {
XShmDetach(QX11Info::display(), &xvImage.shmInfo);
XSync(QX11Info::display(), false);
XShmDetach(display(), &xvImage.shmInfo);
XSync(display(), false);
shmdt(xvImage.shmInfo.shmaddr);
}
@@ -285,7 +290,7 @@ void QGstXvImageBufferPool::queuedDestroy()
m_imagesToDestroy.clear();
XSync(QX11Info::display(), false);
XSync(display(), false);
}
void QGstXvImageBufferPool::recycleBuffer(QGstXvImageBuffer *xvBuffer)
@@ -309,7 +314,13 @@ void QGstXvImageBufferPool::destroyBuffer(QGstXvImageBuffer *xvBuffer)
QMetaObject::invokeMethod(this, "queuedDestroy", Qt::QueuedConnection);
}
Display *QGstXvImageBufferPool::display() const
{
QWindow *window = QGuiApplication::topLevelWindows().first();
Display *display = static_cast<Display *>(QGuiApplication::platformNativeInterface()->nativeResourceForWindow("Display", window));
return display;
}
QT_END_NAMESPACE
#endif //QT_NO_XVIDEO

5
src/gsttools/qvideosurfacegstsink.cpp
View File

@@ -49,8 +49,7 @@
#include <private/qmediapluginloader_p.h>
#include "qgstvideobuffer_p.h"
#if defined(Q_WS_X11) && !defined(QT_NO_XVIDEO)
#include <QtWidgets/qx11info_x11.h>
#if defined(HAVE_XVIDEO)
#include "qgstxvimagebuffer_p.h"
#endif
@@ -77,7 +76,7 @@ QVideoSurfaceGstDelegate::QVideoSurfaceGstDelegate(
m_pools.append(plugin);
}
}
#if defined(Q_WS_X11) && !defined(QT_NO_XVIDEO)
#ifdef HAVE_XVIDEO
m_pools.append(new QGstXvImageBufferPool());
#endif
updateSupportedFormats();

16
src/multimedia/gsttools_headers/qgstxvimagebuffer_p.h
View File

@@ -59,8 +59,6 @@
#include <QtCore/qwaitcondition.h>
#include <QtCore/qqueue.h>
#ifndef QT_NO_XVIDEO
#include <X11/Xlib.h>
#include <sys/ipc.h>
#include <sys/shm.h>
@@ -69,10 +67,11 @@
#include <X11/extensions/Xv.h>
#include <X11/extensions/Xvlib.h>
#include <gst/gst.h>
#include "qgstbufferpoolinterface_p.h"
QT_BEGIN_NAMESPACE
class QGstXvImageBufferPool;
struct QGstXvImageBuffer {
@@ -92,8 +91,9 @@ struct QGstXvImageBuffer {
Q_DECLARE_METATYPE(XvImage*)
class QGstXvImageBufferPool : public QObject, public QGstBufferPoolInterface {
Q_OBJECT
friend class QGstXvImageBuffer;
Q_OBJECT
Q_INTERFACES(QGstBufferPoolInterface)
friend class QGstXvImageBuffer;
public:
QGstXvImageBufferPool(QObject *parent = 0);
virtual ~QGstXvImageBufferPool();
@@ -107,6 +107,8 @@ public:
QAbstractVideoBuffer::HandleType handleType() const;
QAbstractVideoBuffer *prepareVideoBuffer(GstBuffer *buffer, int bytesPerLine);
virtual QStringList keys() const;
private slots:
void queuedAlloc();
void queuedDestroy();
@@ -119,6 +121,8 @@ private slots:
private:
void doAlloc();
Display *display() const;
struct XvShmImage {
XvImage *xvImage;
XShmSegmentInfo shmInfo;
@@ -136,6 +140,6 @@ private:
Qt::HANDLE m_threadId;
};
#endif //QT_NO_XVIDEO
QT_END_NAMESPACE
#endif

2
src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h
View File

@@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE
class QAbstractVideoSurface;
QT_END_NAMESPACE
#if defined(Q_WS_X11) && !defined(QT_NO_XVIDEO)
#ifdef HAVE_XVIDEO
class QGstXvImageBuffer;
class QGstXvImageBufferPool;
#endif

2
src/plugins/gstreamer/camerabin/camerabinservice.cpp
View File

@@ -114,7 +114,7 @@ CameraBinService::CameraBinService(const QString &service, QObject *parent):
m_videoRenderer = new QGstreamerVideoRenderer(this);
#endif
#if defined(Q_WS_X11) && !defined(QT_NO_XVIDEO)
#ifdef HAVE_XVIDEO
#ifdef Q_WS_MAEMO_6
m_videoWindow = new QGstreamerVideoWindow(this, "omapxvsink");

4
src/plugins/gstreamer/gstreamer.pro
View File

@@ -68,7 +68,9 @@ SOURCES += \
gstvideoconnector.c \
!win32:!contains(QT_CONFIG,embedded):!mac:!simulator:!contains(QT_CONFIG, qpa) {
contains(config_test_xvideo, yes) {
DEFINES += HAVE_XVIDEO
LIBS += -lXv -lX11 -lXext
HEADERS += \

2
src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp
View File

@@ -100,7 +100,7 @@ QGstreamerCaptureService::QGstreamerCaptureService(const QString &service, QObje
m_videoRenderer = new QGstreamerVideoRenderer(this);
#if defined(Q_WS_X11) && !defined(QT_NO_XVIDEO)
#ifdef HAVE_XVIDEO
m_videoWindow = new QGstreamerVideoOverlay(this);
m_videoWidgetControl = new QGstreamerVideoWidgetControl(this);
#endif

2
src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp
View File

@@ -82,7 +82,7 @@ QGstreamerPlayerService::QGstreamerPlayerService(QObject *parent):
m_videoRenderer = new QGstreamerVideoRenderer(this);
#endif
#if defined(Q_WS_X11) && !defined(QT_NO_XVIDEO)
#ifdef HAVE_XVIDEO
#ifdef Q_WS_MAEMO_6
m_videoWindow = new QGstreamerVideoWindow(this, "omapxvsink");

6
src/plugins/gstreamer/qgstreamervideooverlay.cpp
View File

@@ -44,9 +44,7 @@
#include <qvideosurfaceformat.h>
#include <private/qx11videosurface_p.h>
#ifndef QT_NO_XVIDEO
#include <qx11videosurface.h>
QGstreamerVideoOverlay::QGstreamerVideoOverlay(QObject *parent)
: QVideoWindowControl(parent)
@@ -228,5 +226,3 @@ void QGstreamerVideoOverlay::setScaledDisplayRect()
break;
};
}
#endif //QT_NO_XVIDEO

4
src/plugins/gstreamer/qgstreamervideooverlay.h
View File

@@ -51,8 +51,6 @@ class QAbstractVideoSurface;
QT_END_NAMESPACE
class QX11VideoSurface;
#if defined(Q_WS_X11) && !defined(QT_NO_XVIDEO)
QT_BEGIN_NAMESPACE
class QGstreamerVideoOverlay : public QVideoWindowControl, public QGstreamerVideoRendererInterface
@@ -116,6 +114,4 @@ private:
QT_END_NAMESPACE
#endif //QT_NO_XVIDEO
#endif

5
src/plugins/gstreamer/qgstreamervideowindow.cpp
View File

@@ -48,9 +48,6 @@
#include <gst/interfaces/xoverlay.h>
#include <gst/interfaces/propertyprobe.h>
#ifndef QT_NO_XVIDEO
/*
QGstreamerVideoWindow is similar to QGstreamerVideoOverlay,
but uses xvimagesink like gstreamer element instead of QX11VideoSurface.
@@ -347,5 +344,3 @@ GstElement *QGstreamerVideoWindow::videoSink()
{
return m_videoSink;
}
#endif //QT_NO_XVIDEO

4
src/plugins/gstreamer/qgstreamervideowindow.h
View File

@@ -52,8 +52,6 @@ class QAbstractVideoSurface;
QT_END_NAMESPACE
class QX11VideoSurface;
#if defined(Q_WS_X11) && !defined(QT_NO_XVIDEO)
QT_BEGIN_NAMESPACE
class QGstreamerVideoWindow : public QVideoWindowControl,
@@ -131,6 +129,4 @@ private:
QT_END_NAMESPACE
#endif //QT_NO_XVIDEO
#endif

51
src/plugins/gstreamer/qx11videosurface.cpp
View File

@@ -41,11 +41,10 @@
#include <QtCore/qvariant.h>
#include <QtCore/qdebug.h>
#include <QtWidgets/qx11info_x11.h>
#include <QtGui/qguiapplication.h>
#include <QtGui/qplatformnativeinterface_qpa.h>
#include <qvideosurfaceformat.h>
#ifndef QT_NO_XVIDEO
#include "qx11videosurface.h"
Q_DECLARE_METATYPE(XvImage*);
@@ -149,10 +148,10 @@ QX11VideoSurface::QX11VideoSurface(QObject *parent)
QX11VideoSurface::~QX11VideoSurface()
{
if (m_gc)
XFreeGC(QX11Info::display(), m_gc);
XFreeGC(display(), m_gc);
if (m_portId != 0)
XvUngrabPort(QX11Info::display(), m_portId, 0);
XvUngrabPort(display(), m_portId, 0);
}
WId QX11VideoSurface::winId() const
@@ -171,12 +170,12 @@ void QX11VideoSurface::setWinId(WId id)
XFree(m_image);
if (m_gc) {
XFreeGC(QX11Info::display(), m_gc);
XFreeGC(display(), m_gc);
m_gc = 0;
}
if (m_portId != 0)
XvUngrabPort(QX11Info::display(), m_portId, 0);
XvUngrabPort(display(), m_portId, 0);
m_supportedPixelFormats.clear();
m_formatIds.clear();
@@ -186,7 +185,7 @@ void QX11VideoSurface::setWinId(WId id)
if (m_winId && findPort()) {
querySupportedFormats();
m_gc = XCreateGC(QX11Info::display(), m_winId, 0, 0);
m_gc = XCreateGC(display(), m_winId, 0, 0);
if (m_image) {
m_image = 0;
@@ -271,13 +270,13 @@ void QX11VideoSurface::setSaturation(int saturation)
int QX11VideoSurface::getAttribute(const char *attribute, int minimum, int maximum) const
{
if (m_portId != 0) {
Display *display = QX11Info::display();
Display *disp = display();
Atom atom = XInternAtom(display, attribute, True);
Atom atom = XInternAtom(disp, attribute, True);
int value = 0;
XvGetPortAttribute(display, m_portId, atom, &value);
XvGetPortAttribute(disp, m_portId, atom, &value);
return redistribute(value, minimum, maximum, -100, 100);
} else {
@@ -288,12 +287,12 @@ int QX11VideoSurface::getAttribute(const char *attribute, int minimum, int maxim
void QX11VideoSurface::setAttribute(const char *attribute, int value, int minimum, int maximum)
{
if (m_portId != 0) {
Display *display = QX11Info::display();
Display *disp = display();
Atom atom = XInternAtom(display, attribute, True);
Atom atom = XInternAtom(disp, attribute, True);
XvSetPortAttribute(
display, m_portId, atom, redistribute(value, -100, 100, minimum, maximum));
disp, m_portId, atom, redistribute(value, -100, 100, minimum, maximum));
}
}
@@ -330,7 +329,7 @@ bool QX11VideoSurface::start(const QVideoSurfaceFormat &format)
setError(UnsupportedFormatError);
} else {
XvImage *image = XvCreateImage(
QX11Info::display(),
display(),
m_portId,
xvFormatId,
0,
@@ -403,7 +402,7 @@ bool QX11VideoSurface::present(const QVideoFrame &frame)
//qDebug() << "copy frame";
XvPutImage(
QX11Info::display(),
display(),
m_portId,
m_winId,
m_gc,
@@ -424,7 +423,7 @@ bool QX11VideoSurface::present(const QVideoFrame &frame)
//qDebug() << "render directly";
if (img)
XvShmPutImage(
QX11Info::display(),
display(),
m_portId,
m_winId,
m_gc,
@@ -450,19 +449,27 @@ bool QX11VideoSurface::present(const QVideoFrame &frame)
}
}
Display *QX11VideoSurface::display() const
{
QWindow *window = QGuiApplication::focusWindow();
Display *display = (Display *)QGuiApplication::platformNativeInterface()->nativeResourceForWindow("Display", window);
return display;
}
bool QX11VideoSurface::findPort()
{
unsigned int count = 0;
XvAdaptorInfo *adaptors = 0;
bool portFound = false;
if (XvQueryAdaptors(QX11Info::display(), m_winId, &count, &adaptors) == Success) {
if (XvQueryAdaptors(display(), m_winId, &count, &adaptors) == Success) {
for (unsigned int i = 0; i < count && !portFound; ++i) {
if (adaptors[i].type & XvImageMask) {
m_portId = adaptors[i].base_id;
for (unsigned int j = 0; j < adaptors[i].num_ports && !portFound; ++j, ++m_portId)
portFound = XvGrabPort(QX11Info::display(), m_portId, 0) == Success;
portFound = XvGrabPort(display(), m_portId, 0) == Success;
}
}
XvFreeAdaptorInfo(adaptors);
@@ -475,7 +482,7 @@ void QX11VideoSurface::querySupportedFormats()
{
int count = 0;
if (XvImageFormatValues *imageFormats = XvListImageFormats(
QX11Info::display(), m_portId, &count)) {
display(), m_portId, &count)) {
const int rgbCount = sizeof(qt_xvRgbLookup) / sizeof(XvFormatRgb);
const int yuvCount = sizeof(qt_xvYuvLookup) / sizeof(XvFormatYuv);
@@ -509,7 +516,7 @@ void QX11VideoSurface::querySupportedFormats()
m_hueRange = qMakePair(0, 0);
m_saturationRange = qMakePair(0, 0);
if (XvAttribute *attributes = XvQueryPortAttributes(QX11Info::display(), m_portId, &count)) {
if (XvAttribute *attributes = XvQueryPortAttributes(display(), m_portId, &count)) {
for (int i = 0; i < count; ++i) {
if (qstrcmp(attributes[i].name, "XV_BRIGHTNESS") == 0)
m_brightnessRange = qMakePair(attributes[i].min_value, attributes[i].max_value);
@@ -525,5 +532,3 @@ void QX11VideoSurface::querySupportedFormats()
}
}
#endif //QT_NO_XVIDEO

8
src/plugins/gstreamer/qx11videosurface.h
View File

@@ -45,8 +45,6 @@
#include <QtWidgets/qwidget.h>
#include <qabstractvideosurface.h>
#ifndef QT_NO_XVIDEO
#include <X11/Xlib.h>
#include <X11/extensions/Xv.h>
#include <X11/extensions/Xvlib.h>
@@ -89,7 +87,9 @@ public:
bool present(const QVideoFrame &frame);
private:
private:
Display *display() const;
WId m_winId;
XvPortID m_portId;
GC m_gc;
@@ -114,6 +114,4 @@ private:
QT_END_NAMESPACE
#endif //QT_NO_XVIDEO
#endif