diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-04 21:40:02 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-04 21:40:02 +0100 |
| commit | 34d15785600f98faa4a51827b452d6c488e4c10c (patch) | |
| tree | e4dd1b11602f0b13bedd895df254a69fa9187fc0 /src/plugins/directshow/camera/dscamerasession.h | |
| parent | 46b10ce610cfa3957ed4be719b9a7f3f1f39dcf0 (diff) | |
| parent | 8c26502e386e76fa7db6ce8c4d073e9dabf00b44 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I5394a9d75850771068d43d2509b14a3ac4efcf83
Diffstat (limited to 'src/plugins/directshow/camera/dscamerasession.h')
| -rw-r--r-- | src/plugins/directshow/camera/dscamerasession.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/directshow/camera/dscamerasession.h b/src/plugins/directshow/camera/dscamerasession.h index 361a0220e..18fc0cca7 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. @@ -207,6 +207,7 @@ private: QVideoSurfaceFormat m_previewSurfaceFormat; QVideoFrame::PixelFormat m_previewPixelFormat; QSize m_previewSize; + int m_stride; QCameraViewfinderSettings m_viewfinderSettings; QCameraViewfinderSettings m_actualViewfinderSettings; |