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

winrt: Add logging to QWinRTAbstractVideoRendererControl

Browse Source 
Change-Id: I44620b8513fdf20ebc0e093368044133eabdd6b3
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
Maurice Kalinowski
2016-06-08 11:44:24 +02:00
parent b3af8f65fc
commit 20299cfc4a
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/winrt/qwinrtabstractvideorenderercontrol.cpp
View File

@@ -38,6 +38,7 @@
#include <QtCore/qfunctions_winrt.h> #include <QtCore/qfunctions_winrt.h>
#include <QtCore/QGlobalStatic> #include <QtCore/QGlobalStatic>
#include <QtCore/QLoggingCategory>
#include <QtCore/QMetaMethod> #include <QtCore/QMetaMethod>
#include <QtCore/QPointer> #include <QtCore/QPointer>
#include <QtGui/QOpenGLContext> #include <QtGui/QOpenGLContext>
@@ -58,6 +59,8 @@ using namespace Microsoft::WRL;
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(lcMMVideoRender, "qt.mm.videorender")
#define BREAK_IF_FAILED(msg) RETURN_IF_FAILED(msg, break) #define BREAK_IF_FAILED(msg) RETURN_IF_FAILED(msg, break)
#define CONTINUE_IF_FAILED(msg) RETURN_IF_FAILED(msg, continue) #define CONTINUE_IF_FAILED(msg) RETURN_IF_FAILED(msg, continue)
@@ -66,6 +69,7 @@ struct QWinRTVideoRendererControlGlobal
{ {
QWinRTVideoRendererControlGlobal() QWinRTVideoRendererControlGlobal()
{ {
qCDebug(lcMMVideoRender) << __FUNCTION__;
HRESULT hr; HRESULT hr;
D3D_FEATURE_LEVEL featureLevels[] = D3D_FEATURE_LEVEL featureLevels[] =
@@ -202,6 +206,7 @@ ID3D11Device *QWinRTAbstractVideoRendererControl::d3dDevice()
// This is required so that subclasses can stop the render thread before deletion // This is required so that subclasses can stop the render thread before deletion
void QWinRTAbstractVideoRendererControl::shutdown() void QWinRTAbstractVideoRendererControl::shutdown()
{ {
qCDebug(lcMMVideoRender) << __FUNCTION__;
Q_D(QWinRTAbstractVideoRendererControl); Q_D(QWinRTAbstractVideoRendererControl);
if (d->renderThread.isRunning()) { if (d->renderThread.isRunning()) {
d->renderThread.requestInterruption(); d->renderThread.requestInterruption();
@@ -212,6 +217,7 @@ void QWinRTAbstractVideoRendererControl::shutdown()
QWinRTAbstractVideoRendererControl::QWinRTAbstractVideoRendererControl(const QSize &size, QObject *parent) QWinRTAbstractVideoRendererControl::QWinRTAbstractVideoRendererControl(const QSize &size, QObject *parent)
: QVideoRendererControl(parent), d_ptr(new QWinRTAbstractVideoRendererControlPrivate) : QVideoRendererControl(parent), d_ptr(new QWinRTAbstractVideoRendererControlPrivate)
{ {
qCDebug(lcMMVideoRender) << __FUNCTION__;
Q_D(QWinRTAbstractVideoRendererControl); Q_D(QWinRTAbstractVideoRendererControl);
d->format = QVideoSurfaceFormat(size, QVideoFrame::Format_BGRA32, d->format = QVideoSurfaceFormat(size, QVideoFrame::Format_BGRA32,
@@ -232,6 +238,7 @@ QWinRTAbstractVideoRendererControl::QWinRTAbstractVideoRendererControl(const QSi
QWinRTAbstractVideoRendererControl::~QWinRTAbstractVideoRendererControl() QWinRTAbstractVideoRendererControl::~QWinRTAbstractVideoRendererControl()
{ {
qCDebug(lcMMVideoRender) << __FUNCTION__;
Q_D(QWinRTAbstractVideoRendererControl); Q_D(QWinRTAbstractVideoRendererControl);
CriticalSectionLocker locker(&d->mutex); CriticalSectionLocker locker(&d->mutex);
shutdown(); shutdown();
@@ -253,6 +260,7 @@ void QWinRTAbstractVideoRendererControl::setSurface(QAbstractVideoSurface *surfa
void QWinRTAbstractVideoRendererControl::syncAndRender() void QWinRTAbstractVideoRendererControl::syncAndRender()
{ {
qCDebug(lcMMVideoRender) << __FUNCTION__;
Q_D(QWinRTAbstractVideoRendererControl); Q_D(QWinRTAbstractVideoRendererControl);
QThread *currentThread = QThread::currentThread(); QThread *currentThread = QThread::currentThread();
@@ -334,6 +342,7 @@ void QWinRTAbstractVideoRendererControl::setScanLineDirection(QVideoSurfaceForma
void QWinRTAbstractVideoRendererControl::setActive(bool active) void QWinRTAbstractVideoRendererControl::setActive(bool active)
{ {
qCDebug(lcMMVideoRender) << __FUNCTION__ << active;
Q_D(QWinRTAbstractVideoRendererControl); Q_D(QWinRTAbstractVideoRendererControl);
if (d->active == active) if (d->active == active)