Add a command line switch to not produce decompressed output

This commit is contained in:
Pavel Krajcevski 2013-12-09 11:45:57 -05:00
parent 3734d643a6
commit f2c153feba

View File

@ -75,8 +75,10 @@ void PrintUsage() {
fprintf(stderr, "Usage: tc [OPTIONS] imagefile\n"); fprintf(stderr, "Usage: tc [OPTIONS] imagefile\n");
fprintf(stderr, "\n"); fprintf(stderr, "\n");
fprintf(stderr, "\t-v\t\tVerbose mode: prints out Entropy, Mean Local Entropy, and MSSIM\n"); fprintf(stderr, "\t-v\t\tVerbose mode: prints out Entropy, Mean Local Entropy, and MSSIM\n");
fprintf(stderr, "\t-f\t\tFormat to use. Either \"BPTC\", \"ETC1\", \"DXT1\", \"DXT5\", or \"PVRTC\". Default: BPTC\n"); fprintf(stderr, "\t-f <fmt>\tFormat to use. Either \"BPTC\", \"ETC1\", \"DXT1\", \"DXT5\", or \"PVRTC\". Default: BPTC\n");
fprintf(stderr, "\t-l\t\tSave an output log.\n"); fprintf(stderr, "\t-l\t\tSave an output log.\n");
fprintf(stderr, "\t-d <file>\tSpecify decompressed output (currently only png files supported, default: basename-<fmt>.png)\n");
fprintf(stderr, "\t-nd\t\tSuppress decompressed output\n");
fprintf(stderr, "\t-q <quality>\tSet compression quality level. Default: 50\n"); fprintf(stderr, "\t-q <quality>\tSet compression quality level. Default: 50\n");
fprintf(stderr, "\t-n <num>\tCompress the image num times and give the average time and PSNR. Default: 1\n"); fprintf(stderr, "\t-n <num>\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-simd\t\tUse SIMD compression path\n");
@ -113,6 +115,8 @@ int main(int argc, char **argv) {
exit(1); exit(1);
} }
char decompressedOutput[256]; decompressedOutput[0] = '\0';
bool bNoDecompress = false;
int numJobs = 0; int numJobs = 0;
int quality = 50; int quality = 50;
int numThreads = 1; int numThreads = 1;
@ -171,6 +175,30 @@ int main(int argc, char **argv) {
continue; continue;
} }
if(strcmp(argv[fileArg], "-d") == 0) {
fileArg++;
if(fileArg == argc) {
PrintUsage();
exit(1);
} else {
size_t sz = 255;
sz = ::std::min(sz, static_cast<size_t>(strlen(argv[fileArg])));
memcpy(decompressedOutput, argv[fileArg], sz + 1);
}
fileArg++;
knowArg = true;
continue;
}
if(strcmp(argv[fileArg], "-nd") == 0) {
fileArg++;
bNoDecompress = true;
knowArg = true;
continue;
}
if(strcmp(argv[fileArg], "-l") == 0) { if(strcmp(argv[fileArg], "-l") == 0) {
fileArg++; fileArg++;
bSaveLog = true; bSaveLog = true;
@ -309,7 +337,10 @@ int main(int argc, char **argv) {
} }
} }
if(format == FasTC::eCompressionFormat_BPTC) { if(!bNoDecompress) {
if(decompressedOutput[0] != '\0') {
memcpy(basename, decompressedOutput, 256);
} else if(format == FasTC::eCompressionFormat_BPTC) {
strcat(basename, "-bc7.png"); strcat(basename, "-bc7.png");
} else if(format == FasTC::eCompressionFormat_PVRTC) { } else if(format == FasTC::eCompressionFormat_PVRTC) {
strcat(basename, "-pvrtc.png"); strcat(basename, "-pvrtc.png");
@ -321,6 +352,7 @@ int main(int argc, char **argv) {
ImageFile cImgFile (basename, eFileFormat_PNG, *ci); ImageFile cImgFile (basename, eFileFormat_PNG, *ci);
cImgFile.Write(); cImgFile.Write();
}
// Cleanup // Cleanup
delete ci; delete ci;