summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2021-05-06 23:24:30 +0200
committerLars Knoll <lars.knoll@qt.io>2021-05-07 07:05:28 +0000
commit85947d16cd2766d13862f6ec9c43469bbcaf8aeb (patch)
treeee6b05d97354b909d883fa6d26b285c69fdb7068 /tests
parent3bde26e1395c9dd1e477cf271daf4090463691a0 (diff)
Make QVideoFrame(Format) movable, smaller API cleanups
Rename nPlanes to planeCount, remove QVideoFrameFormat::sizeHint. Change-Id: Ib176934f4960d01f6bec5258e552e41140dc101a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/unit/multimedia/qvideoframeformat/tst_qvideoframeformat.cpp30
1 files changed, 0 insertions, 30 deletions
diff --git a/tests/auto/unit/multimedia/qvideoframeformat/tst_qvideoframeformat.cpp b/tests/auto/unit/multimedia/qvideoframeformat/tst_qvideoframeformat.cpp
index dea9260b9..22b6b739a 100644
--- a/tests/auto/unit/multimedia/qvideoframeformat/tst_qvideoframeformat.cpp
+++ b/tests/auto/unit/multimedia/qvideoframeformat/tst_qvideoframeformat.cpp
@@ -63,8 +63,6 @@ private slots:
void scanLineDirection();
void frameRate_data();
void frameRate();
- void sizeHint_data();
- void sizeHint();
void yCbCrColorSpaceEnum_data();
void yCbCrColorSpaceEnum ();
void compare();
@@ -315,34 +313,6 @@ void tst_QVideoFrameFormat::frameRate()
QCOMPARE(format.frameRate(), frameRate);
}
-void tst_QVideoFrameFormat::sizeHint_data()
-{
- QTest::addColumn<QSize>("frameSize");
- QTest::addColumn<QRect>("viewport");
- QTest::addColumn<QSize>("sizeHint");
-
- QTest::newRow("(0, 0, 1024x768), 1:1")
- << QSize(1024, 768)
- << QRect(0, 0, 1024, 768)
- << QSize(1024, 768);
- QTest::newRow("(168, 84, 800x600), 1:1")
- << QSize(1024, 768)
- << QRect(168, 84, 800, 600)
- << QSize(800, 600);
-}
-
-void tst_QVideoFrameFormat::sizeHint()
-{
- QFETCH(QSize, frameSize);
- QFETCH(QRect, viewport);
- QFETCH(QSize, sizeHint);
-
- QVideoFrameFormat format(frameSize, QVideoFrameFormat::Format_RGB32);
- format.setViewport(viewport);
-
- QCOMPARE(format.sizeHint(), sizeHint);
-}
-
void tst_QVideoFrameFormat::compare()
{
QVideoFrameFormat format1(