diff options
Diffstat (limited to 'tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp')
| -rw-r--r-- | tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp | 123 |
1 files changed, 113 insertions, 10 deletions
diff --git a/tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp b/tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp index 00565c4f31..2d4a453b58 100644 --- a/tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp +++ b/tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -43,12 +43,18 @@ private slots: void convertRgb888ToRgb32_data(); void convertRgb888ToRgb32(); + void convertRgb888ToRgbx8888_data(); + void convertRgb888ToRgbx8888(); + void convertRgb32ToRgb888_data(); void convertRgb32ToRgb888(); void convertGeneric_data(); void convertGeneric(); + void convertGenericInplace_data(); + void convertGenericInplace(); + private: QImage generateImageRgb888(int width, int height); QImage generateImageRgb16(int width, int height); @@ -71,8 +77,8 @@ void tst_QImageConversion::convertRgb888ToRgb32_data() // 16 pixels, minimum for the SSSE3 implementation QTest::newRow("width: 16px; height: 5000px;") << generateImageRgb888(16, 5000); - // 50 pixels, more realistic use case - QTest::newRow("width: 50px; height: 5000px;") << generateImageRgb888(50, 5000); + // 200 pixels, more realistic use case + QTest::newRow("width: 200px; height: 5000px;") << generateImageRgb888(200, 5000); // 2000 pixels -> typical values for pictures QTest::newRow("width: 2000px; height: 2000px;") << generateImageRgb888(2000, 2000); @@ -90,6 +96,23 @@ void tst_QImageConversion::convertRgb888ToRgb32() } } +void tst_QImageConversion::convertRgb888ToRgbx8888_data() +{ + convertRgb888ToRgb32_data(); +} + +void tst_QImageConversion::convertRgb888ToRgbx8888() +{ + QFETCH(QImage, inputImage); + + QBENCHMARK { + volatile QImage output = inputImage.convertToFormat(QImage::Format_RGBX8888); + // we need the volatile and the following to make sure the compiler does not do + // anything stupid :) + (void)output; + } +} + void tst_QImageConversion::convertRgb32ToRgb888_data() { QTest::addColumn<QImage>("inputImage"); @@ -131,6 +154,9 @@ void tst_QImageConversion::convertGeneric_data() QImage rgb16 = generateImageRgb16(1000, 1000); QImage rgb32 = generateImageRgb32(1000, 1000); QImage argb32 = generateImageArgb32(1000, 1000); + QImage argb32pm = argb32.convertToFormat(QImage::Format_ARGB32_Premultiplied); + QImage rgba32 = argb32.convertToFormat(QImage::Format_RGBA8888); + QImage a2rgb30 = argb32.convertToFormat(QImage::Format_A2RGB30_Premultiplied); QTest::newRow("rgb16 -> rgb32") << rgb16 << QImage::Format_RGB32; QTest::newRow("rgb16 -> rgb888") << rgb16 << QImage::Format_RGB888; @@ -141,12 +167,50 @@ void tst_QImageConversion::convertGeneric_data() QTest::newRow("rgb32 -> rgb888") << rgb32 << QImage::Format_RGB888; QTest::newRow("rgb32 -> rgb666") << rgb32 << QImage::Format_RGB666; QTest::newRow("rgb32 -> rgb555") << rgb32 << QImage::Format_RGB555; + QTest::newRow("rgb32 -> argb32") << rgb32 << QImage::Format_ARGB32; + QTest::newRow("rgb32 -> argb32pm") << rgb32 << QImage::Format_ARGB32_Premultiplied; + QTest::newRow("rgb32 -> rgbx8888") << rgb32 << QImage::Format_RGBX8888; + QTest::newRow("rgb32 -> rgba8888") << rgb32 << QImage::Format_RGBA8888; + QTest::newRow("rgb32 -> rgba8888pm") << rgb32 << QImage::Format_RGBA8888_Premultiplied; + QTest::newRow("rgb32 -> rgb30") << rgb32 << QImage::Format_RGB30; + QTest::newRow("rgb32 -> bgr30") << rgb32 << QImage::Format_BGR30; - QTest::newRow("argb32 -> rgba8888") << argb32 << QImage::Format_RGBA8888; QTest::newRow("argb32 -> rgb888") << argb32 << QImage::Format_RGB888; QTest::newRow("argb32 -> rgb666") << argb32 << QImage::Format_RGB666; QTest::newRow("argb32 -> argb8565pm") << argb32 << QImage::Format_ARGB8565_Premultiplied; QTest::newRow("argb32 -> argb4444pm") << argb32 << QImage::Format_ARGB4444_Premultiplied; + QTest::newRow("argb32 -> rgb32") << argb32 << QImage::Format_RGB32; + QTest::newRow("argb32 -> argb32pm") << argb32 << QImage::Format_ARGB32_Premultiplied; + QTest::newRow("argb32 -> rgbx8888") << argb32 << QImage::Format_RGBX8888; + QTest::newRow("argb32 -> rgba8888") << argb32 << QImage::Format_RGBA8888; + QTest::newRow("argb32 -> rgba8888pm") << argb32 << QImage::Format_RGBA8888_Premultiplied; + QTest::newRow("argb32 -> rgb30") << argb32 << QImage::Format_RGB30; + QTest::newRow("argb32 -> a2rgb30") << argb32 << QImage::Format_A2RGB30_Premultiplied; + + QTest::newRow("argb32pm -> argb4444pm") << argb32pm << QImage::Format_ARGB4444_Premultiplied; + QTest::newRow("argb32pm -> rgb32") << argb32pm << QImage::Format_RGB32; + QTest::newRow("argb32pm -> argb32") << argb32pm << QImage::Format_ARGB32; + QTest::newRow("argb32pm -> rgbx8888") << argb32pm << QImage::Format_RGBX8888; + QTest::newRow("argb32pm -> rgba8888") << argb32pm << QImage::Format_RGBA8888; + QTest::newRow("argb32pm -> rgba8888pm") << argb32pm << QImage::Format_RGBA8888_Premultiplied; + QTest::newRow("argb32pm -> rgb30") << argb32pm << QImage::Format_RGB30; + QTest::newRow("argb32pm -> a2rgb30") << argb32pm << QImage::Format_A2RGB30_Premultiplied; + + QTest::newRow("rgba8888 -> rgb32") << rgba32 << QImage::Format_RGB32; + QTest::newRow("rgba8888 -> argb32") << rgba32 << QImage::Format_ARGB32; + QTest::newRow("rgba8888 -> argb32pm") << rgba32 << QImage::Format_ARGB32_Premultiplied; + QTest::newRow("rgba8888 -> rgbx8888") << rgba32 << QImage::Format_RGBX8888; + QTest::newRow("rgba8888 -> rgba8888pm") << rgba32 << QImage::Format_RGBA8888_Premultiplied; + QTest::newRow("rgba8888 -> rgb30") << rgba32 << QImage::Format_RGB30; + QTest::newRow("rgba8888 -> a2rgb30") << rgba32 << QImage::Format_A2RGB30_Premultiplied; + + QTest::newRow("a2rgb30 -> rgb32") << a2rgb30 << QImage::Format_RGB32; + QTest::newRow("a2rgb30 -> argb32") << a2rgb30 << QImage::Format_ARGB32; + QTest::newRow("a2rgb30 -> argb32pm") << a2rgb30 << QImage::Format_ARGB32_Premultiplied; + QTest::newRow("a2rgb30 -> rgbx8888") << a2rgb30 << QImage::Format_RGBX8888; + QTest::newRow("a2rgb30 -> rgba8888") << a2rgb30 << QImage::Format_RGBA8888; + QTest::newRow("a2rgb30 -> rgba8888pm") << a2rgb30 << QImage::Format_RGBA8888_Premultiplied; + QTest::newRow("a2rgb30 -> bgr30") << a2rgb30 << QImage::Format_BGR30; } void tst_QImageConversion::convertGeneric() @@ -160,6 +224,45 @@ void tst_QImageConversion::convertGeneric() } } +void tst_QImageConversion::convertGenericInplace_data() +{ + QTest::addColumn<QImage>("inputImage"); + QTest::addColumn<QImage::Format>("outputFormat"); + + QImage argb32 = generateImageArgb32(1000, 1000); + QImage argb32pm = argb32.convertToFormat(QImage::Format_ARGB32_Premultiplied); + QImage rgba8888 = argb32.convertToFormat(QImage::Format_RGBA8888); + + QTest::newRow("argb32 -> argb32pm -> argb32") << argb32 << QImage::Format_ARGB32_Premultiplied; + QTest::newRow("argb32 -> rgb32 -> argb32") << argb32 << QImage::Format_RGB32; + QTest::newRow("argb32 -> rgba8888 -> argb32") << argb32 << QImage::Format_RGBA8888; + QTest::newRow("argb32 -> rgba8888pm -> argb32") << argb32 << QImage::Format_RGBA8888_Premultiplied; + + QTest::newRow("argb32pm -> argb32 -> argb32pm") << argb32pm << QImage::Format_ARGB32; + QTest::newRow("argb32pm -> rgb32 -> argb32pm") << argb32pm << QImage::Format_RGB32; + QTest::newRow("argb32pm -> rgba8888pm -> argb32pm") << argb32pm << QImage::Format_RGBA8888_Premultiplied; + QTest::newRow("argb32pm -> rgba8888 -> argb32pm") << argb32pm << QImage::Format_RGBA8888; + QTest::newRow("argb32pm -> rgbx8888 -> argb32pm") << argb32pm << QImage::Format_RGBX8888; + + QTest::newRow("rgba8888 -> argb32 -> rgba8888") << rgba8888 << QImage::Format_ARGB32; + QTest::newRow("rgba8888 -> rgb32 -> rgba8888") << rgba8888 << QImage::Format_RGB32; + QTest::newRow("rgba8888 -> argb32pm -> rgba8888") << rgba8888 << QImage::Format_ARGB32_Premultiplied; + QTest::newRow("rgba8888 -> rgba8888pm -> rgba8888") << rgba8888 << QImage::Format_RGBA8888_Premultiplied; +} + +void tst_QImageConversion::convertGenericInplace() +{ + QFETCH(QImage, inputImage); + QFETCH(QImage::Format, outputFormat); + + QImage::Format inputFormat = inputImage.format(); + QImage tmpImage = qMove(inputImage); + + QBENCHMARK { + tmpImage = (qMove(tmpImage).convertToFormat(outputFormat)).convertToFormat(inputFormat); + } +} + /* Fill a RGB888 image with "random" pixel values. */ |