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

winrt: Add categorized logging to camera control

Browse Source 
Change-Id: I6d823ac07950212d766905c9409469f2b1b84954
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
This commit is contained in:
Maurice Kalinowski
2016-04-15 07:36:34 +02:00
committed by Maurice Kalinowski
parent 5206d37836
commit 65c9e24c10
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/winrt/qwinrtcameracontrol.cpp
View File

@@ -81,6 +81,8 @@ QT_BEGIN_NAMESPACE
#define FOCUS_RECT_POSITION_MAX 0.995f // FOCUS_RECT_BOUNDARY - FOCUS_RECT_HALF_SIZE
#define ASPECTRATIO_EPSILON 0.01f
Q_LOGGING_CATEGORY(lcMMCamera, "qt.mm.camera")
HRESULT getMediaStreamResolutions(IMediaDeviceController *device,
MediaStreamType type,
IVectorView<IMediaEncodingProperties *> **propertiesList,
@@ -532,6 +534,7 @@ public:
QWinRTCameraControl::QWinRTCameraControl(QObject *parent)
: QCameraControl(parent), d_ptr(new QWinRTCameraControlPrivate)
{
qCDebug(lcMMCamera) << __FUNCTION__ << parent;
Q_D(QWinRTCameraControl);
d->delayClose = nullptr;
@@ -568,6 +571,7 @@ QCamera::State QWinRTCameraControl::state() const
void QWinRTCameraControl::setState(QCamera::State state)
{
qCDebug(lcMMCamera) << __FUNCTION__ << state;
Q_D(QWinRTCameraControl);
if (d->state == state)
@@ -713,6 +717,7 @@ QCamera::CaptureModes QWinRTCameraControl::captureMode() const
void QWinRTCameraControl::setCaptureMode(QCamera::CaptureModes mode)
{
qCDebug(lcMMCamera) << __FUNCTION__ << mode;
Q_D(QWinRTCameraControl);
if (d->captureMode == mode)
@@ -791,6 +796,7 @@ void QWinRTCameraControl::onBufferRequested()
void QWinRTCameraControl::onApplicationStateChanged(Qt::ApplicationState state)
{
qCDebug(lcMMCamera) << __FUNCTION__ << state;
Q_D(QWinRTCameraControl);
static QCamera::State savedState = d->state;
switch (state) {
@@ -810,6 +816,7 @@ void QWinRTCameraControl::onApplicationStateChanged(Qt::ApplicationState state)
HRESULT QWinRTCameraControl::initialize()
{
qCDebug(lcMMCamera) << __FUNCTION__;
Q_D(QWinRTCameraControl);
if (d->status != QCamera::LoadingStatus) {
@@ -1284,6 +1291,7 @@ void QWinRTCameraControl::frameUnmapped()
HRESULT QWinRTCameraControl::onCaptureFailed(IMediaCapture *, IMediaCaptureFailedEventArgs *args)
{
qCDebug(lcMMCamera) << __FUNCTION__ << args;
HRESULT hr;
UINT32 code;
hr = args->get_Code(&code);
@@ -1300,6 +1308,7 @@ HRESULT QWinRTCameraControl::onCaptureFailed(IMediaCapture *, IMediaCaptureFaile
HRESULT QWinRTCameraControl::onRecordLimitationExceeded(IMediaCapture *)
{
qCDebug(lcMMCamera) << __FUNCTION__;
emit error(QCamera::CameraError, QStringLiteral("Recording limit exceeded."));
setState(QCamera::LoadedState);
return S_OK;
@@ -1307,6 +1316,7 @@ HRESULT QWinRTCameraControl::onRecordLimitationExceeded(IMediaCapture *)
void QWinRTCameraControl::emitError(int errorCode, const QString &errorString)
{
qCDebug(lcMMCamera) << __FUNCTION__ << errorString << errorCode;
emit error(errorCode, errorString);
}

3
src/plugins/winrt/qwinrtcameracontrol.h
View File

@@ -38,6 +38,7 @@
#define QWINRTCAMERACONTROL_H
#include <QtMultimedia/QCameraControl>
#include <QtCore/QLoggingCategory>
#include <QtCore/qt_windows.h>
#include <wrl.h>
@@ -59,6 +60,8 @@ namespace ABI {
QT_BEGIN_NAMESPACE
Q_DECLARE_LOGGING_CATEGORY(lcMMCamera)
class QVideoRendererControl;
class QVideoDeviceSelectorControl;
class QCameraImageCaptureControl;

4
src/plugins/winrt/qwinrtcameraimagecapturecontrol.cpp
View File

@@ -118,6 +118,7 @@ public:
QWinRTCameraImageCaptureControl::QWinRTCameraImageCaptureControl(QWinRTCameraControl *parent)
: QCameraImageCaptureControl(parent), d_ptr(new QWinRTCameraImageCaptureControlPrivate)
{
qCDebug(lcMMCamera) << __FUNCTION__ << parent;
Q_D(QWinRTCameraImageCaptureControl);
d->cameraControl = parent;
@@ -144,6 +145,7 @@ void QWinRTCameraImageCaptureControl::setDriveMode(QCameraImageCapture::DriveMod
int QWinRTCameraImageCaptureControl::capture(const QString &fileName)
{
qCDebug(lcMMCamera) << __FUNCTION__ << fileName;
Q_D(QWinRTCameraImageCaptureControl);
++d->currentCaptureId;
@@ -191,6 +193,7 @@ int QWinRTCameraImageCaptureControl::capture(const QString &fileName)
void QWinRTCameraImageCaptureControl::cancelCapture()
{
qCDebug(lcMMCamera) << __FUNCTION__;
Q_D(QWinRTCameraImageCaptureControl);
QHash<IAsyncAction *, CaptureRequest>::iterator it = d->requests.begin();
@@ -205,6 +208,7 @@ void QWinRTCameraImageCaptureControl::cancelCapture()
HRESULT QWinRTCameraImageCaptureControl::onCaptureCompleted(IAsyncAction *asyncInfo, AsyncStatus status)
{
qCDebug(lcMMCamera) << __FUNCTION__;
Q_D(QWinRTCameraImageCaptureControl);
if (status == Canceled || !d->requests.contains(asyncInfo))