From 093576c9e73a399c27b6160e8da9e64a3ab02583 Mon Sep 17 00:00:00 2001 From: Pavel Krajcevski Date: Fri, 13 Sep 2013 13:10:22 -0400 Subject: [PATCH] Add initial code for our compressor. --- PVRTCEncoder/CMakeLists.txt | 1 + PVRTCEncoder/include/PVRTCCompressor.h | 7 +++ PVRTCEncoder/src/Compressor.cpp | 76 ++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) create mode 100644 PVRTCEncoder/src/Compressor.cpp diff --git a/PVRTCEncoder/CMakeLists.txt b/PVRTCEncoder/CMakeLists.txt index a36c3c9..d2c0bc3 100644 --- a/PVRTCEncoder/CMakeLists.txt +++ b/PVRTCEncoder/CMakeLists.txt @@ -64,6 +64,7 @@ SET( HEADERS ) SET( SOURCES + src/Compressor.cpp src/Decompressor.cpp src/Pixel.cpp src/Block.cpp diff --git a/PVRTCEncoder/include/PVRTCCompressor.h b/PVRTCEncoder/include/PVRTCCompressor.h index 62ea975..c9001cd 100644 --- a/PVRTCEncoder/include/PVRTCCompressor.h +++ b/PVRTCEncoder/include/PVRTCCompressor.h @@ -73,6 +73,13 @@ namespace PVRTCC { const EWrapMode wrapMode = eWrapMode_Wrap, bool bDebugImages = false); + // Takes a stream of uncompressed RGBA8 data and compresses it into PVRTC + // version one. The width and height must be specified in order to properly + // decompress the data. + void Compress(const DecompressionJob &, + bool bTwoBitMode = false, + const EWrapMode wrapMode = eWrapMode_Wrap); + } // namespace PVRTCC #endif // PVRTCENCODER_INCLUDE_PVRTCCOMPRESSOR_H_ diff --git a/PVRTCEncoder/src/Compressor.cpp b/PVRTCEncoder/src/Compressor.cpp new file mode 100644 index 0000000..b17484f --- /dev/null +++ b/PVRTCEncoder/src/Compressor.cpp @@ -0,0 +1,76 @@ +/* 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 + * + * + */ + +#include "PVRTCCompressor.h" + +#include "Pixel.h" +#include "Image.h" + +namespace PVRTCC { + + void Compress(const DecompressionJob &dcj, + bool bTwoBitMode, + const EWrapMode wrapMode) { + Image img(dcj.height, dcj.width); + for(uint32 j = 0; j < dcj.height; j++) { + for(uint32 i = 0; i < dcj.width; i++) { + const uint32 *pixels = reinterpret_cast(dcj.inBuf); + img(i, j).UnpackRGBA(pixels[j * dcj.width + i]); + } + } + + // Downscale it using anisotropic diffusion based scheme in order to preserve + // image features, then reupscale and compute deltas. Use deltas to generate + // initial A & B images followed by modulation data. + } + +} // namespace PVRTCC