summaryrefslogtreecommitdiffstats
path: root/src/plugins/mediaservices
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/mediaservices')
-rw-r--r--src/plugins/mediaservices/directshow/dsserviceplugin.cpp2
-rw-r--r--src/plugins/mediaservices/directshow/mediaplayer/directshowiosource.cpp4
-rw-r--r--src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp2
-rw-r--r--src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.cpp7
-rw-r--r--src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.cpp4
-rw-r--r--src/plugins/mediaservices/gstreamer/qgstxvimagebuffer.cpp4
-rw-r--r--src/plugins/mediaservices/gstreamer/qvideosurfacegstsink.cpp3
-rw-r--r--src/plugins/mediaservices/mediaservices.pro24
-rw-r--r--src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm8
-rw-r--r--src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm6
-rw-r--r--src/plugins/mediaservices/qt7/qt7movierenderer.mm25
-rw-r--r--src/plugins/mediaservices/qt7/qt7movievideowidget.mm4
-rw-r--r--src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm11
13 files changed, 51 insertions, 53 deletions
diff --git a/src/plugins/mediaservices/directshow/dsserviceplugin.cpp b/src/plugins/mediaservices/directshow/dsserviceplugin.cpp
index f3ab889..c482fd5 100644
--- a/src/plugins/mediaservices/directshow/dsserviceplugin.cpp
+++ b/src/plugins/mediaservices/directshow/dsserviceplugin.cpp
@@ -94,7 +94,7 @@ QMediaService* DSServicePlugin::create(QString const& key)
return new DirectShowPlayerService;
#endif
- qDebug() << "unsupported key:" << key;
+ qWarning() << "DirectShow service plugin: unsupported service -" << key;
return 0;
}
diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowiosource.cpp b/src/plugins/mediaservices/directshow/mediaplayer/directshowiosource.cpp
index c2fb0d4..1dca465 100644
--- a/src/plugins/mediaservices/directshow/mediaplayer/directshowiosource.cpp
+++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowiosource.cpp
@@ -624,11 +624,7 @@ bool DirectShowRcSource::open(const QUrl &url)
m_file.setFileName(QLatin1Char(':') + url.path());
- qDebug("qrc file %s", qPrintable(m_file.fileName()));
-
if (m_file.open(QIODevice::ReadOnly)) {
- qDebug("Size %d", m_file.size());
- qDebug("Sequential %d", int(m_file.isSequential()));
setDevice(&m_file);
diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
index 49eeb23..4d0ffe4 100644
--- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
+++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
@@ -41,7 +41,7 @@
#include "qgstreamermetadataprovider.h"
#include "qgstreamerplayersession.h"
-#include <QDebug>
+#include <QtCore/qdebug.h>
#include <gst/gstversion.h>
diff --git a/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.cpp b/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.cpp
index 9e5f425..589d2b5 100644
--- a/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.cpp
+++ b/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.cpp
@@ -43,7 +43,6 @@
#include <QtCore/qdebug.h>
#include <QtGui/QIcon>
#include <QtCore/QDir>
-#include <QtCore/QDebug>
#include "qgstreamerserviceplugin.h"
@@ -99,7 +98,7 @@ QMediaService* QGstreamerServicePlugin::create(const QString &key)
return new QGstreamerCaptureService(key);
#endif
- qDebug() << "unsupported key:" << key;
+ qWarning() << "GStreamer service plugin: unsupported service -" << key;
return 0;
}
@@ -145,7 +144,7 @@ void QGstreamerServicePlugin::updateDevices() const
QFileInfoList entries = devDir.entryInfoList(QStringList() << "video*");
foreach( const QFileInfo &entryInfo, entries ) {
- qDebug() << "Try" << entryInfo.filePath();
+// qDebug() << "Try" << entryInfo.filePath();
int fd = ::open(entryInfo.filePath().toLatin1().constData(), O_RDWR );
if (fd == -1)
@@ -172,7 +171,7 @@ void QGstreamerServicePlugin::updateDevices() const
name = entryInfo.fileName();
else
name = QString((const char*)vcap.card);
- qDebug() << "found camera: " << name;
+// qDebug() << "found camera: " << name;
m_cameraDevices.append(entryInfo.filePath().toLocal8Bit());
m_cameraDescriptions.append(name);
diff --git a/src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.cpp b/src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.cpp
index ac9a1e3..94ae847 100644
--- a/src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.cpp
+++ b/src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.cpp
@@ -120,7 +120,7 @@ void QGstreamerVideoInputDeviceControl::update()
QFileInfoList entries = devDir.entryInfoList(QStringList() << "video*");
foreach( const QFileInfo &entryInfo, entries ) {
- qDebug() << "Try" << entryInfo.filePath();
+// qDebug() << "Try" << entryInfo.filePath();
int fd = ::open(entryInfo.filePath().toLatin1().constData(), O_RDWR );
if (fd == -1)
@@ -147,7 +147,7 @@ void QGstreamerVideoInputDeviceControl::update()
name = entryInfo.fileName();
else
name = QString((const char*)vcap.card);
- qDebug() << "found camera: " << name;
+// qDebug() << "found camera: " << name;
m_names.append(entryInfo.filePath());
m_descriptions.append(name);
diff --git a/src/plugins/mediaservices/gstreamer/qgstxvimagebuffer.cpp b/src/plugins/mediaservices/gstreamer/qgstxvimagebuffer.cpp
index 0e47c98..5b99817 100644
--- a/src/plugins/mediaservices/gstreamer/qgstxvimagebuffer.cpp
+++ b/src/plugins/mediaservices/gstreamer/qgstxvimagebuffer.cpp
@@ -182,7 +182,7 @@ void QGstXvImageBufferPool::queuedAlloc()
);
if (!xvBuffer->xvImage) {
- qDebug() << "QGstXvImageBufferPool: XvShmCreateImage failed";
+// qDebug() << "QGstXvImageBufferPool: XvShmCreateImage failed";
m_allocWaitCondition.wakeOne();
return;
}
@@ -192,7 +192,7 @@ void QGstXvImageBufferPool::queuedAlloc()
xvBuffer->shmInfo.readOnly = False;
if (!XShmAttach(QX11Info::display(), &xvBuffer->shmInfo)) {
- qDebug() << "QGstXvImageBufferPool: XShmAttach failed";
+// qDebug() << "QGstXvImageBufferPool: XShmAttach failed";
m_allocWaitCondition.wakeOne();
return;
}
diff --git a/src/plugins/mediaservices/gstreamer/qvideosurfacegstsink.cpp b/src/plugins/mediaservices/gstreamer/qvideosurfacegstsink.cpp
index 9e3807b..402a225 100644
--- a/src/plugins/mediaservices/gstreamer/qvideosurfacegstsink.cpp
+++ b/src/plugins/mediaservices/gstreamer/qvideosurfacegstsink.cpp
@@ -41,9 +41,8 @@
#include <QtMultimedia/QAbstractVideoSurface>
#include <QtMultimedia/QVideoFrame>
-#include <QDebug>
+#include <QtCore/qdebug.h>
#include <QMap>
-#include <QDebug>
#include <QThread>
#include <QtGui/qx11info_x11.h>
diff --git a/src/plugins/mediaservices/mediaservices.pro b/src/plugins/mediaservices/mediaservices.pro
index 55e6aba..0cef605 100644
--- a/src/plugins/mediaservices/mediaservices.pro
+++ b/src/plugins/mediaservices/mediaservices.pro
@@ -1,18 +1,20 @@
TEMPLATE = subdirs
-win32:!wince: SUBDIRS += directshow
+contains(QT_CONFIG, mediaservice) {
+ win32:!wince: SUBDIRS += directshow
-mac: SUBDIRS += qt7
+ mac: SUBDIRS += qt7
-unix:!mac:!symbian {
- 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
+ unix:!mac:!symbian {
+ 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
+ system(pkg-config --exists \'$${TMP_GST_LIBS}\' --print-errors): {
+ SUBDIRS += gstreamer
+ }
}
}
diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm
index df15fa8..faf75d1 100644
--- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm
+++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm
@@ -79,7 +79,7 @@ QT7PlayerService::QT7PlayerService(QObject *parent):
#if defined(QT_MAC_USE_COCOA)
m_videoWidnowControl = new QT7MovieViewOutput(this);
m_videoOutputControl->enableOutput(QVideoOutputControl::WindowOutput);
- qDebug() << "Using cocoa";
+// qDebug() << "Using cocoa";
#endif
#ifdef QUICKTIME_C_API_AVAILABLE
@@ -88,11 +88,11 @@ QT7PlayerService::QT7PlayerService(QObject *parent):
m_videoWidgetControl = new QT7MovieVideoWidget(this);
m_videoOutputControl->enableOutput(QVideoOutputControl::WidgetOutput);
- qDebug() << "QuickTime C API is available";
+// qDebug() << "QuickTime C API is available";
#else
m_videoRendererControl = new QT7MovieViewRenderer(this);
m_videoOutputControl->enableOutput(QVideoOutputControl::RendererOutput);
- qDebug() << "QuickTime C API is not available";
+// qDebug() << "QuickTime C API is not available";
#endif
@@ -129,7 +129,7 @@ QMediaControl *QT7PlayerService::control(const char *name) const
void QT7PlayerService::updateVideoOutput()
{
- qDebug() << "QT7PlayerService::updateVideoOutput" << m_videoOutputControl->output();
+// qDebug() << "QT7PlayerService::updateVideoOutput" << m_videoOutputControl->output();
switch (m_videoOutputControl->output()) {
case QVideoOutputControl::WindowOutput:
diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm
index d516a99..3f198b9 100644
--- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm
+++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm
@@ -372,7 +372,7 @@ void QT7PlayerSession::setMedia(const QMediaContent &content, QIODevice *stream)
else
return;
- qDebug() << "Open media" << url;
+// qDebug() << "Open media" << url;
NSError *err = 0;
NSString *urlString = (NSString *)qString2CFStringRef(url.toString());
@@ -436,7 +436,7 @@ void QT7PlayerSession::processStateChange()
{
signed long state = [[(QTMovie*)m_QTMovie attributeForKey:QTMovieLoadStateAttribute]
longValue];
- qDebug() << "Moview load state changed:" << state;
+// qDebug() << "Moview load state changed:" << state;
#ifndef QUICKTIME_C_API_AVAILABLE
enum {
@@ -505,7 +505,7 @@ void QT7PlayerSession::processNaturalSizeChange()
{
if (m_videoOutput) {
NSSize size = [[(QTMovie*)m_QTMovie attributeForKey:@"QTMovieNaturalSizeAttribute"] sizeValue];
- qDebug() << "Native size changed:" << QSize(size.width, size.height);
+// qDebug() << "Native size changed:" << QSize(size.width, size.height);
m_videoOutput->updateNaturalSize(QSize(size.width, size.height));
}
}
diff --git a/src/plugins/mediaservices/qt7/qt7movierenderer.mm b/src/plugins/mediaservices/qt7/qt7movierenderer.mm
index 587f3b9..6b9fd21 100644
--- a/src/plugins/mediaservices/qt7/qt7movierenderer.mm
+++ b/src/plugins/mediaservices/qt7/qt7movierenderer.mm
@@ -169,7 +169,7 @@ QT7MovieRenderer::QT7MovieRenderer(QObject *parent)
#endif
m_surface(0)
{
- qDebug() << "QT7MovieRenderer";
+// qDebug() << "QT7MovieRenderer";
m_displayLink = new QCvDisplayLink(this);
connect(m_displayLink, SIGNAL(tick(CVTimeStamp)), SLOT(updateVideoFrame(CVTimeStamp)));
@@ -262,7 +262,7 @@ void QT7MovieRenderer::setupVideoOutput()
{
AutoReleasePool pool;
- qDebug() << "QT7MovieRenderer::setupVideoOutput" << m_movie;
+// qDebug() << "QT7MovieRenderer::setupVideoOutput" << m_movie;
if (m_movie == 0 || m_surface == 0) {
m_displayLink->stop();
@@ -286,9 +286,9 @@ void QT7MovieRenderer::setupVideoOutput()
if (m_surface->isActive())
m_surface->stop();
- qDebug() << "Starting the surface with format" << format;
+// qDebug() << "Starting the surface with format" << format;
if (!m_surface->start(format)) {
- qDebug() << "failed to start video surface" << m_surface->error();
+// qDebug() << "failed to start video surface" << m_surface->error();
glSupported = false;
} else {
m_usingGLContext = true;
@@ -301,14 +301,15 @@ void QT7MovieRenderer::setupVideoOutput()
QVideoSurfaceFormat format(m_nativeSize, QVideoFrame::Format_RGB32);
if (m_surface->isActive() && m_surface->surfaceFormat() != format) {
- qDebug() << "Surface format was changed, stop the surface.";
+// qDebug() << "Surface format was changed, stop the surface.";
m_surface->stop();
}
if (!m_surface->isActive()) {
- qDebug() << "Starting the surface with format" << format;
- if (!m_surface->start(format))
- qDebug() << "failed to start video surface" << m_surface->error();
+// qDebug() << "Starting the surface with format" << format;
+ m_surface->start(format);
+// if (!m_surface->start(format))
+// qDebug() << "failed to start video surface" << m_surface->error();
}
}
}
@@ -328,14 +329,14 @@ void QT7MovieRenderer::setupVideoOutput()
if (!m_nativeSize.isEmpty()) {
if (!m_visualContext) {
if (m_usingGLContext) {
- qDebug() << "Building OpenGL visual context" << m_nativeSize;
+// qDebug() << "Building OpenGL visual context" << m_nativeSize;
m_currentGLContext = QGLContext::currentContext();
if (!createGLVisualContext()) {
qWarning() << "QT7MovieRenderer: failed to create visual context";
return;
}
} else {
- qDebug() << "Building Pixel Buffer visual context" << m_nativeSize;
+// qDebug() << "Building Pixel Buffer visual context" << m_nativeSize;
if (!createPixelBufferVisualContext()) {
qWarning() << "QT7MovieRenderer: failed to create visual context";
return;
@@ -358,7 +359,7 @@ void QT7MovieRenderer::setEnabled(bool)
void QT7MovieRenderer::setMovie(void *movie)
{
- qDebug() << "QT7MovieRenderer::setMovie" << movie;
+// qDebug() << "QT7MovieRenderer::setMovie" << movie;
#ifdef QUICKTIME_C_API_AVAILABLE
QMutexLocker locker(&m_mutex);
@@ -393,7 +394,7 @@ QAbstractVideoSurface *QT7MovieRenderer::surface() const
void QT7MovieRenderer::setSurface(QAbstractVideoSurface *surface)
{
- qDebug() << "Set video surface" << surface;
+// qDebug() << "Set video surface" << surface;
if (surface == m_surface)
return;
diff --git a/src/plugins/mediaservices/qt7/qt7movievideowidget.mm b/src/plugins/mediaservices/qt7/qt7movievideowidget.mm
index 6e74fcd..4043330 100644
--- a/src/plugins/mediaservices/qt7/qt7movievideowidget.mm
+++ b/src/plugins/mediaservices/qt7/qt7movievideowidget.mm
@@ -184,7 +184,7 @@ QT7MovieVideoWidget::QT7MovieVideoWidget(QObject *parent)
m_hue(0),
m_saturation(0)
{
- qDebug() << "QT7MovieVideoWidget";
+// qDebug() << "QT7MovieVideoWidget";
QGLFormat format = QGLFormat::defaultFormat();
format.setSwapInterval(1); // Vertical sync (avoid tearing)
@@ -249,7 +249,7 @@ void QT7MovieVideoWidget::setupVideoOutput()
{
AutoReleasePool pool;
- qDebug() << "QT7MovieVideoWidget::setupVideoOutput" << m_movie;
+// qDebug() << "QT7MovieVideoWidget::setupVideoOutput" << m_movie;
if (m_movie == 0) {
m_displayLink->stop();
diff --git a/src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm b/src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm
index 7271f5b..5047853 100644
--- a/src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm
+++ b/src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm
@@ -247,7 +247,7 @@ void QT7MovieViewRenderer::setupVideoOutput()
{
AutoReleasePool pool;
- qDebug() << "QT7MovieViewRenderer::setupVideoOutput" << m_movie << m_surface;
+// qDebug() << "QT7MovieViewRenderer::setupVideoOutput" << m_movie << m_surface;
HiddenQTMovieView *movieView = (HiddenQTMovieView*)m_movieView;
@@ -274,14 +274,15 @@ void QT7MovieViewRenderer::setupVideoOutput()
QVideoSurfaceFormat format(m_nativeSize, QVideoFrame::Format_RGB32);
if (m_surface->isActive() && m_surface->surfaceFormat() != format) {
- qDebug() << "Surface format was changed, stop the surface.";
+// qDebug() << "Surface format was changed, stop the surface.";
m_surface->stop();
}
if (!m_surface->isActive()) {
- qDebug() << "Starting the surface with format" << format;
- if (!m_surface->start(format))
- qDebug() << "failed to start video surface" << m_surface->error();
+// qDebug() << "Starting the surface with format" << format;
+ m_surface->start(format);
+// if (!m_surface->start(format))
+// qDebug() << "failed to start video surface" << m_surface->error();
}
}
}
generated by cgit v0.12 at 2024-12-26 16:33:55 (GMT)