summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/directshow/camera/dscamerasession.cpp9
-rw-r--r--src/plugins/directshow/camera/dscamerasession.h2
2 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp
index 8d0c72057..43cc9dbd1 100644
--- a/src/plugins/directshow/camera/dscamerasession.cpp
+++ b/src/plugins/directshow/camera/dscamerasession.cpp
@@ -502,7 +502,7 @@ failed:
if (m_surface && m_surface->isActive())
m_surface->stop();
disconnectGraph();
- setError(QCamera::CameraError, errorString);
+ setError(QCamera::CameraError, errorString, hr);
return false;
}
@@ -541,12 +541,13 @@ bool DSCameraSession::stopPreview()
return true;
failed:
- setError(QCamera::CameraError, errorString);
+ setError(QCamera::CameraError, errorString, hr);
return false;
}
-void DSCameraSession::setError(int error, const QString &errorString)
+void DSCameraSession::setError(int error, const QString &errorString, HRESULT hr)
{
+ qErrnoWarning(hr, "[0x%x] %s", hr, qPrintable(errorString));
emit cameraError(error, errorString);
setStatus(QCamera::UnloadedStatus);
}
@@ -839,7 +840,7 @@ failed:
SAFE_RELEASE(m_nullRendererFilter);
SAFE_RELEASE(m_filterGraph);
SAFE_RELEASE(m_graphBuilder);
- setError(QCamera::CameraError, errorString);
+ setError(QCamera::CameraError, errorString, hr);
return false;
}
diff --git a/src/plugins/directshow/camera/dscamerasession.h b/src/plugins/directshow/camera/dscamerasession.h
index 361a0220e..91bd53766 100644
--- a/src/plugins/directshow/camera/dscamerasession.h
+++ b/src/plugins/directshow/camera/dscamerasession.h
@@ -173,7 +173,7 @@ private:
void updateSourceCapabilities();
bool configurePreviewFormat();
void updateImageProcessingParametersInfos();
- void setError(int error, const QString &errorString);
+ void setError(int error, const QString &errorString, HRESULT hr);
// These static functions are used for scaling of adjustable parameters,
// which have the ranges from -1.0 to +1.0 in the QCameraImageProcessing API.