diff --git a/CLTool/CMakeLists.txt b/CLTool/CMakeLists.txt index abbc48f..2205688 100644 --- a/CLTool/CMakeLists.txt +++ b/CLTool/CMakeLists.txt @@ -40,19 +40,13 @@ # # -IF( MSVC ) - SET( SOURCES "src/clwin32.cpp" ) -ELSE() - SET( SOURCES "src/clunix.cpp" ) -ENDIF() - INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/Base/include ) INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/Core/include ) INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/IO/include ) ADD_EXECUTABLE( tc - ${SOURCES} + "src/tc.cpp" ) ADD_EXECUTABLE( @@ -60,14 +54,13 @@ ADD_EXECUTABLE( "src/compare.cpp" ) -# Add flag for link time code generation. This was used to build the libpng libraries, so we should -# probably also include it for this project as well... +# Add flag for link time code generation. This was used to build the libpng +# libraries, so we should probably also include it for this project as well... IF( MSVC ) SET_TARGET_PROPERTIES(tc PROPERTIES LINK_FLAGS "/LTCG") SET_TARGET_PROPERTIES(compare PROPERTIES LINK_FLAGS "/LTCG") ENDIF() -TARGET_LINK_LIBRARIES( tc BPTCEncoder ) TARGET_LINK_LIBRARIES( tc FasTCBase ) TARGET_LINK_LIBRARIES( tc FasTCIO ) TARGET_LINK_LIBRARIES( tc FasTCCore ) diff --git a/CLTool/src/clwin32.cpp b/CLTool/src/clwin32.cpp deleted file mode 100644 index 11fa4bb..0000000 --- a/CLTool/src/clwin32.cpp +++ /dev/null @@ -1,293 +0,0 @@ -/* FasTC - * Copyright (c) 2012 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 - * - * - */ - -#define _CRT_SECURE_NO_WARNINGS - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "ThreadSafeStreambuf.h" -#include "TexComp.h" -#include "ImageFile.h" -#include "Image.h" - -void PrintUsage() { - fprintf(stderr, "Usage: tc [OPTIONS] imagefile\n"); - fprintf(stderr, "\n"); - fprintf(stderr, "\t-f\t\tFormat to use. Either \"ETC1\", \"BPTC\" or \"PVRTC\". Default: BPTC\n"); - fprintf(stderr, "\t-l\t\tSave an output log.\n"); - fprintf(stderr, "\t-q \tSet compression quality level. Default: 50\n"); - fprintf(stderr, "\t-n \tCompress the image num times and give the average time and PSNR. Default: 1\n"); - fprintf(stderr, "\t-simd\t\tUse SIMD compression path\n"); - fprintf(stderr, "\t-t \tCompress the image using threads. Default: 1\n"); - fprintf(stderr, "\t-a \t\tCompress the image using synchronization via atomic operations. Default: Off\n"); - fprintf(stderr, "\t-j \tUse blocks for each work item in a worker queue threading model. Default: (Blocks / Threads)\n"); -} - -void ExtractBasename(const char *filename, char *buf, size_t bufSz) { - size_t len = strlen(filename); - const char *end = filename + len; - const char *ext = end; - const char *base = NULL; - while(--end != filename && !base) { - if(*end == '.') { - ext = end; - } else if(*end == '\\' || *end == '/') { - base = end + 1; - } - } - - size_t numChars = ext - base + 1; - size_t toCopy = (::std::min)(numChars, bufSz); - memcpy(buf, base, toCopy); - buf[toCopy - 1] = '\0'; - return; -} - -int _tmain(int argc, _TCHAR* argv[]) -{ - int fileArg = 1; - if(fileArg == argc) { - PrintUsage(); - exit(1); - } - - int numJobs = 0; - int quality = 50; - int numThreads = 1; - int numCompressions = 1; - bool bUseSIMD = false; - bool bSaveLog = false; - bool bUseAtomics = false; - bool bUsePVRTexLib = false; - ECompressionFormat format = eCompressionFormat_BPTC; - - bool knowArg = false; - do { - knowArg = false; - - if(strcmp(argv[fileArg], "-n") == 0) { - fileArg++; - - if(fileArg == argc || (numCompressions = atoi(argv[fileArg])) < 0) { - PrintUsage(); - exit(1); - } - - fileArg++; - knowArg = true; - continue; - } - - if(strcmp(argv[fileArg], "-f") == 0) { - fileArg++; - - if(fileArg == argc) { - PrintUsage(); - exit(1); - } else { - if(!strcmp(argv[fileArg], "PVRTC")) { - format = eCompressionFormat_PVRTC; - } else if(!strcmp(argv[fileArg], "PVRTCLib")) { - format = eCompressionFormat_PVRTC; - bUsePVRTexLib = true; - } else if(!strcmp(argv[fileArg], "ETC1")) { - format = eCompressionFormat_ETC1; - } - } - - fileArg++; - knowArg = true; - continue; - } - - if(strcmp(argv[fileArg], "-l") == 0) { - fileArg++; - bSaveLog = true; - knowArg = true; - continue; - } - - if(strcmp(argv[fileArg], "-simd") == 0) { - fileArg++; - bUseSIMD = true; - knowArg = true; - continue; - } - - if(strcmp(argv[fileArg], "-t") == 0) { - fileArg++; - - if(fileArg == argc || (numThreads = atoi(argv[fileArg])) < 1) { - PrintUsage(); - exit(1); - } - - fileArg++; - knowArg = true; - continue; - } - - if(strcmp(argv[fileArg], "-q") == 0) { - fileArg++; - - if(fileArg == argc || (quality = atoi(argv[fileArg])) < 0) { - PrintUsage(); - exit(1); - } - - fileArg++; - knowArg = true; - continue; - } - - if(strcmp(argv[fileArg], "-j") == 0) { - fileArg++; - - if(fileArg == argc || (numJobs = atoi(argv[fileArg])) < 0) { - PrintUsage(); - exit(1); - } - - fileArg++; - knowArg = true; - continue; - } - - if(strcmp(argv[fileArg], "-a") == 0) { - fileArg++; - bUseAtomics = true; - knowArg = true; - continue; - } - - } while(knowArg && fileArg < argc); - - if(fileArg == argc) { - PrintUsage(); - exit(1); - } - - char basename[256]; - ExtractBasename(argv[fileArg], basename, 256); - - ImageFile file (argv[fileArg]); - if(!file.Load()) { - fprintf(stderr, "Error loading file: %s\n", argv[fileArg]); - return 1; - } - - FasTC::Image<> img (*file.GetImage()); - if(format == eCompressionFormat_PVRTC) { - img.SetBlockStreamOrder(false); - } - - std::ofstream logFile; - ThreadSafeStreambuf streamBuf(logFile); - std::ostream logStream(&streamBuf); - if(bSaveLog) { - char logname[256]; - sprintf(logname, "%s.log", basename); - logFile.open(logname); - } - - SCompressionSettings settings; - settings.format = format; - settings.bUseSIMD = bUseSIMD; - settings.bUseAtomics = bUseAtomics; - settings.iNumThreads = numThreads; - settings.iQuality = quality; - settings.iNumCompressions = numCompressions; - settings.iJobSize = numJobs; - settings.bUsePVRTexLib = bUsePVRTexLib; - if(bSaveLog) { - settings.logStream = &logStream; - } else { - settings.logStream = NULL; - } - - CompressedImage *ci = CompressImage(&img, settings); - if(NULL == ci) { - fprintf(stderr, "Error compressing image!\n"); - return 1; - } - - double PSNR = img.ComputePSNR(ci); - if(PSNR > 0.0) { - fprintf(stdout, "PSNR: %.3f\n", PSNR); - } - else { - fprintf(stderr, "Error computing PSNR\n"); - } - - double SSIM = img.ComputeSSIM(ci); - if(SSIM > 0.0) { - fprintf(stdout, "SSIM: %.9f\n", SSIM); - } else { - fprintf(stderr, "Error computing MSSIM\n"); - } - - if(format == eCompressionFormat_BPTC) { - strcat_s(basename, "-bc7.png"); - } else if(format == eCompressionFormat_PVRTC) { - strcat_s(basename, "-pvrtc.png"); - } else if(format == eCompressionFormat_ETC1) { - strcat_s(basename, "-etc1.png"); - } - - ImageFile cImgFile (basename, eFileFormat_PNG, *ci); - cImgFile.Write(); - - // Cleanup - delete ci; - if(bSaveLog) { - logFile.close(); - } - return 0; -} diff --git a/CLTool/src/clunix.cpp b/CLTool/src/tc.cpp similarity index 77% rename from CLTool/src/clunix.cpp rename to CLTool/src/tc.cpp index 5ed22c5..04438b9 100644 --- a/CLTool/src/clunix.cpp +++ b/CLTool/src/tc.cpp @@ -1,30 +1,39 @@ /* FasTC - * Copyright (c) 2012 University of North Carolina at Chapel Hill. All rights reserved. + * 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 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 . + * 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. + * 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. + * 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, + * 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 . @@ -41,12 +50,21 @@ * */ +#define _CRT_SECURE_NO_WARNINGS +#define WIN32_LEAN_AND_MEAN + #include #include #include #include #include #include +#ifdef _MSC_VER +# include +# include +# undef min +# undef max +#endif #include "Image.h" #include "ImageFile.h" @@ -67,8 +85,8 @@ void PrintUsage() { fprintf(stderr, "\t-j \tUse blocks for each work item in a worker queue threading model. Default: (Blocks / Threads)\n"); } -void ExtractBasename(const char *filename, char *buf, int bufSz) { - int len = strlen(filename); +void ExtractBasename(const char *filename, char *buf, size_t bufSz) { + size_t len = strlen(filename); const char *end = filename + len; const char *ext = end; const char *base = NULL; @@ -80,8 +98,8 @@ void ExtractBasename(const char *filename, char *buf, int bufSz) { } } - int numChars = ext - base + 1; - int toCopy = ::std::min(numChars, bufSz); + uint64 numChars = ext - base + 1; + size_t toCopy = ::std::min(numChars, bufSz); memcpy(buf, base, toCopy); buf[toCopy - 1] = '\0'; return; @@ -305,4 +323,4 @@ int main(int argc, char **argv) { logFile.close(); } return 0; -} +} \ No newline at end of file