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

winrt: Wait for focus to finish when camera stopped

Browse Source 
Change-Id: I53918a8f7c5f50331593ad09233cd737e040e650
Task-Id: QTBUG-49527
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Reviewed-by: Matti Malinen <matti.malinen@digia.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
This commit is contained in:
Samuel Nevala
2015-11-19 09:34:08 +02:00
parent 5c09c4c3c7
commit 4b25972f9b
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -517,6 +517,7 @@ public:
ComPtr<MediaSink> mediaSink; ComPtr<MediaSink> mediaSink;
ComPtr<IFocusControl> focusControl; ComPtr<IFocusControl> focusControl;
ComPtr<IRegionsOfInterestControl> regionsOfInterestControl; ComPtr<IRegionsOfInterestControl> regionsOfInterestControl;
ComPtr<IAsyncAction> focusOperation;
QPointer<QWinRTCameraVideoRendererControl> videoRenderer; QPointer<QWinRTCameraVideoRendererControl> videoRenderer;
QPointer<QWinRTVideoDeviceSelectorControl> videoDeviceSelector; QPointer<QWinRTVideoDeviceSelectorControl> videoDeviceSelector;
@@ -620,6 +621,11 @@ void QWinRTCameraControl::setState(QCamera::State state)
case QCamera::UnloadedState: { case QCamera::UnloadedState: {
// Stop the camera if it is running (transition to LoadedState) // Stop the camera if it is running (transition to LoadedState)
if (d->status == QCamera::ActiveStatus) { if (d->status == QCamera::ActiveStatus) {
HRESULT hr;
if (d->focusOperation) {
hr = QWinRTFunctions::await(d->focusOperation);
Q_ASSERT_SUCCEEDED(hr);
}
if (d->framesMapped > 0) { if (d->framesMapped > 0) {
qWarning("%d QVideoFrame(s) mapped when closing down camera. Camera will wait for unmap before closing down.", qWarning("%d QVideoFrame(s) mapped when closing down camera. Camera will wait for unmap before closing down.",
d->framesMapped); d->framesMapped);
@@ -1150,17 +1156,26 @@ bool QWinRTCameraControl::setFocusPoint(const QPointF &focusPoint)
bool QWinRTCameraControl::focus() bool QWinRTCameraControl::focus()
{ {
Q_D(QWinRTCameraControl); Q_D(QWinRTCameraControl);
if (!d->focusControl) HRESULT hr;
AsyncStatus status = AsyncStatus::Completed;
if (d->focusOperation) {
ComPtr<IAsyncInfo> info;
hr = d->focusOperation.As(&info);
Q_ASSERT_SUCCEEDED(hr);
info->get_Status(&status);
}
if (!d->focusControl || status == AsyncStatus::Started)
return false; return false;
ComPtr<IAsyncAction> op;
HRESULT hr = d->focusControl->FocusAsync(&op); hr = d->focusControl->FocusAsync(&d->focusOperation);
const long errorCode = HRESULT_CODE(hr); const long errorCode = HRESULT_CODE(hr);
if (errorCode == ERROR_OPERATION_IN_PROGRESS if (errorCode == ERROR_OPERATION_IN_PROGRESS
|| errorCode == ERROR_WRITE_PROTECT) { || errorCode == ERROR_WRITE_PROTECT) {
return false; return false;
} }
Q_ASSERT_SUCCEEDED(hr); Q_ASSERT_SUCCEEDED(hr);
hr = QWinRTFunctions::await(op, QWinRTFunctions::ProcessThreadEvents); hr = QWinRTFunctions::await(d->focusOperation, QWinRTFunctions::ProcessThreadEvents);
Q_ASSERT_SUCCEEDED(hr); Q_ASSERT_SUCCEEDED(hr);
return hr == S_OK; return hr == S_OK;
} }