diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-05-26 12:16:18 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-05-26 10:26:01 +0000 |
| commit | 31afd98059b351b7c9b14eb14c419c0aca50aa25 (patch) | |
| tree | bcf53cc393c09280a04bd67fc9c723a0fe3c0780 /src | |
| parent | e9932d8a07970f49c809167a91dda1fe09acac1c (diff) | |
Attempt to make the qcamerabackend test pass
Blacklist things that are not yet implemented. Fix a nullptr
dereference.
There is still some race condition in testCameraStartParallel()
that leads to occasional crashes.
Change-Id: I35242bc88853870386d09fd6150d7bb8bd137674
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimedia/platform/windows/mediacapture/qwindowscamerareader.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowscamerareader.cpp b/src/multimedia/platform/windows/mediacapture/qwindowscamerareader.cpp index 589585b9c..44f356757 100644 --- a/src/multimedia/platform/windows/mediacapture/qwindowscamerareader.cpp +++ b/src/multimedia/platform/windows/mediacapture/qwindowscamerareader.cpp @@ -453,8 +453,9 @@ STDMETHODIMP QWindowsCameraReader::OnReadSample(HRESULT hrStatus, DWORD dwStream } } // request the next frame - m_sourceReader->ReadSample(MF_SOURCE_READER_FIRST_VIDEO_STREAM, - 0, nullptr, nullptr, nullptr, nullptr); + if (m_sourceReader) + m_sourceReader->ReadSample(MF_SOURCE_READER_FIRST_VIDEO_STREAM, + 0, nullptr, nullptr, nullptr, nullptr); } return S_OK; |