From abd4ba8b54a3f09103321f6f1e012a27892fd9e0 Mon Sep 17 00:00:00 2001 From: Pavel Krajcevski Date: Wed, 4 Sep 2013 20:20:37 -0400 Subject: [PATCH] Abstract away some utilities that we can use across all of our tests, and add a test for a gray image. The test currently seems to be failing, which is likely due to a bug in our bit depth manipulation code. --- PVRTCEncoder/test/DecompressorTest.cpp | 29 ++++++++- PVRTCEncoder/test/TestUtils.h | 83 ++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 PVRTCEncoder/test/TestUtils.h diff --git a/PVRTCEncoder/test/DecompressorTest.cpp b/PVRTCEncoder/test/DecompressorTest.cpp index f55200f..721509c 100644 --- a/PVRTCEncoder/test/DecompressorTest.cpp +++ b/PVRTCEncoder/test/DecompressorTest.cpp @@ -51,6 +51,9 @@ */ #include "gtest/gtest.h" + +#include "TestUtils.h" + #include "PVRTCCompressor.h" TEST(Decompressor, DecompressWhite) { @@ -72,7 +75,31 @@ TEST(Decompressor, DecompressWhite) { for(int i = 0; i < kWidth; i++) { for(int j = 0; j < kHeight; j++) { const uint32 *pixelData = reinterpret_cast(outData); - EXPECT_EQ(pixelData[j*kWidth + i], 0xFFFFFFFF); + EXPECT_EQ(PixelPrinter(pixelData[j*kWidth + i]), PixelPrinter(0xFFFFFFFF)); + } + } +} + +TEST(Decompressor, DecompressGray) { + const uint32 kWidth = 32; + const uint32 kHeight = 32; + + uint8 pvrData[512]; + + for(int i = 0; i < 512; i += 8) { + uint8 grayBlock[8] = { 0xAA, 0xAA, 0xAA, 0xAA, 0xF0, 0xBD, 0x0F, 0xC2 }; + memcpy(pvrData + i, grayBlock, 8); + } + + uint8 outData[4 * kWidth * kHeight]; + + DecompressionJob dcj (pvrData, outData, kWidth, kHeight); + PVRTCC::Decompress(dcj); + + for(int i = 0; i < kWidth; i++) { + for(int j = 0; j < kHeight; j++) { + const uint32 *pixelData = reinterpret_cast(outData); + EXPECT_EQ(PixelPrinter(pixelData[j*kWidth + i]), PixelPrinter(0xFF808081)); } } } diff --git a/PVRTCEncoder/test/TestUtils.h b/PVRTCEncoder/test/TestUtils.h new file mode 100644 index 0000000..b907f07 --- /dev/null +++ b/PVRTCEncoder/test/TestUtils.h @@ -0,0 +1,83 @@ +/* FasTC + * Copyright (c) 2013 University of North Carolina at Chapel Hill. + * All rights reserved. + * + * Permission to use, copy, modify, and distribute this software and its + * documentation for educational, research, and non-profit purposes, without + * fee, and without a written agreement is hereby granted, provided that the + * above copyright notice, this paragraph, and the following four paragraphs + * appear in all copies. + * + * Permission to incorporate this software into commercial products may be + * obtained by contacting the authors or the Office of Technology Development + * at the University of North Carolina at Chapel Hill . + * + * This software program and documentation are copyrighted by the University of + * North Carolina at Chapel Hill. The software program and documentation are + * supplied "as is," without any accompanying services from the University of + * North Carolina at Chapel Hill or the authors. The University of North + * Carolina at Chapel Hill and the authors do not warrant that the operation of + * the program will be uninterrupted or error-free. The end-user understands + * that the program was developed for research purposes and is advised not to + * rely exclusively on the program for any reason. + * + * IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE + * AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, + * OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF + * THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA + * AT CHAPEL HILL OR THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY + * DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY + * STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON + * AN "AS IS" BASIS, AND THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND + * THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, + * ENHANCEMENTS, OR MODIFICATIONS. + * + * Please send all BUG REPORTS to . + * + * The authors may be contacted via: + * + * Pavel Krajcevski + * Dept of Computer Science + * 201 S Columbia St + * Frederick P. Brooks, Jr. Computer Science Bldg + * Chapel Hill, NC 27599-3175 + * USA + * + * + */ + +#ifndef PVRTCENCODER_TEST_TESTUTILS_H_ +#define PVRTCENCODER_TEST_TESTUTILS_H_ + +#include "Core/include/TexCompTypes.h" +#include + +class PixelPrinter { + private: + uint32 m_PixelValue; + public: + PixelPrinter(uint32 p) : m_PixelValue(p) { } + bool operator==(const PixelPrinter &other) const { + return other.m_PixelValue == this->m_PixelValue; + } + uint32 Value() const { return m_PixelValue; } +}; + +inline ::std::ostream& operator<<(::std::ostream& os, const PixelPrinter& pp) { + uint32 p = pp.Value(); + uint32 r = p & 0xFF; + uint32 g = (p >> 8) & 0xFF; + uint32 b = (p >> 16) & 0xFF; + uint32 a = (p >> 24) & 0xFF; + return os << + "R: 0x" << ::std::hex << r << " " << + "G: 0x" << ::std::hex << g << " " << + "B: 0x" << ::std::hex << b << " " << + "A: 0x" << ::std::hex << a; +} + +#endif // PVRTCENCODER_TEST_TESTUTILS_H_