diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2020-11-27 11:31:43 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2020-11-30 10:32:39 +0000 |
| commit | 67d1ff140e60e3372d05fc7af2cf85de891a31f0 (patch) | |
| tree | 39b007b420cbaf54926a6ccb307402fc4a142469 /tests/auto/unit/qvideoframe/tst_qvideoframe.cpp | |
| parent | bef870b733bb8676a9cbce3bcd9e7939e56b358c (diff) | |
Revert "Map QVideoFrame::Format_Y8=>QImage::Format_Grayscale8 in QVideoFrame"
This reverts commit 2b96c113cf7057b556856149114999b973b3f2c2, due to the
fact that it introduces a problem with existing cameras on Windows. So
reverting for now until a fix can be found.
Pick-to: 5.15
Change-Id: Ica59c8a68de7aecf6a4ebd1bd044363e9acefd93
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests/auto/unit/qvideoframe/tst_qvideoframe.cpp')
| -rw-r--r-- | tests/auto/unit/qvideoframe/tst_qvideoframe.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp b/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp index e99c4bf77..402ddf334 100644 --- a/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp +++ b/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp @@ -978,7 +978,7 @@ void tst_QVideoFrame::formatConversion_data() << QImage::Format_Invalid << QVideoFrame::Format_IMC4; QTest::newRow("QVideoFrame::Format_Y8") - << QImage::Format_Grayscale8 + << QImage::Format_Invalid << QVideoFrame::Format_Y8; QTest::newRow("QVideoFrame::Format_Y16") << QImage::Format_Invalid |