Alexander Suvorov
3e12aff909
DXT Testing:
The modified algorithm has been tested on the Kodak test set using 64-bit build with default settings (running on Windows 10, i7-4790, 3.6GHz). All the decompressed test images are identical to the images being compressed and decompressed using original version of Crunch (revision ea9b8d8).
[Compressing Kodak set without mipmaps using DXT1 encoding]
Original: 1582222 bytes / 28.866 sec
Modified: 1468204 bytes / 11.858 sec
Improvement: 7.21% (compression ratio) / 58.92% (compression time)
[Compressing Kodak set with mipmaps using DXT1 encoding]
Original: 2065243 bytes / 36.878 sec
Modified: 1914805 bytes / 15.625 sec
Improvement: 7.28% (compression ratio) / 57.63% (compression time)
ETC Testing:
The modified algorithm has been tested on the Kodak test set using 64-bit build with default settings (running on Windows 10, i7-4790, 3.6GHz). The ETC1 quantization parameters have been selected in such a way, so that ETC1 compression gives approximately the same average Luma PSNR as the corresponding DXT1 compression (which is equal to 34.044 dB for the Kodak test set compressed without mipmaps using DXT1 encoding and default quality settings).
[Compressing Kodak set without mipmaps using ETC1 encoding]
Total size: 1607858 bytes
Total time: 17.181 sec
Average bitrate: 1.363 bpp
Average Luma PSNR: 34.050 dB
110 lines
2.8 KiB
C++
110 lines
2.8 KiB
C++
// File: crn_colorized_console.cpp
|
|
// See Copyright Notice and license at the end of inc/crnlib.h
|
|
#include "crn_core.h"
|
|
#include "crn_colorized_console.h"
|
|
#ifdef CRNLIB_USE_WIN32_API
|
|
#include "crn_winhdr.h"
|
|
#endif
|
|
|
|
namespace crnlib {
|
|
void colorized_console::init() {
|
|
console::init();
|
|
console::add_console_output_func(console_output_func, NULL);
|
|
}
|
|
|
|
void colorized_console::deinit() {
|
|
console::remove_console_output_func(console_output_func);
|
|
console::deinit();
|
|
}
|
|
|
|
void colorized_console::tick() {
|
|
}
|
|
|
|
#ifdef CRNLIB_USE_WIN32_API
|
|
bool colorized_console::console_output_func(eConsoleMessageType type, const char* pMsg, void*) {
|
|
if (console::get_output_disabled())
|
|
return true;
|
|
|
|
HANDLE cons = GetStdHandle(STD_OUTPUT_HANDLE);
|
|
|
|
DWORD attr = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
|
|
switch (type) {
|
|
case cDebugConsoleMessage:
|
|
attr = FOREGROUND_BLUE | FOREGROUND_INTENSITY;
|
|
break;
|
|
case cMessageConsoleMessage:
|
|
attr = FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY;
|
|
break;
|
|
case cWarningConsoleMessage:
|
|
attr = FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_INTENSITY;
|
|
break;
|
|
case cErrorConsoleMessage:
|
|
attr = FOREGROUND_RED | FOREGROUND_INTENSITY;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
if (INVALID_HANDLE_VALUE != cons)
|
|
SetConsoleTextAttribute(cons, (WORD)attr);
|
|
|
|
if ((console::get_prefixes()) && (console::get_at_beginning_of_line())) {
|
|
switch (type) {
|
|
case cDebugConsoleMessage:
|
|
printf("Debug: %s", pMsg);
|
|
break;
|
|
case cWarningConsoleMessage:
|
|
printf("Warning: %s", pMsg);
|
|
break;
|
|
case cErrorConsoleMessage:
|
|
printf("Error: %s", pMsg);
|
|
break;
|
|
default:
|
|
printf("%s", pMsg);
|
|
break;
|
|
}
|
|
} else {
|
|
printf("%s", pMsg);
|
|
}
|
|
|
|
if (console::get_crlf())
|
|
printf("\n");
|
|
|
|
if (INVALID_HANDLE_VALUE != cons)
|
|
SetConsoleTextAttribute(cons, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE);
|
|
|
|
return true;
|
|
}
|
|
#else
|
|
bool colorized_console::console_output_func(eConsoleMessageType type, const char* pMsg, void*) {
|
|
if (console::get_output_disabled())
|
|
return true;
|
|
|
|
if ((console::get_prefixes()) && (console::get_at_beginning_of_line())) {
|
|
switch (type) {
|
|
case cDebugConsoleMessage:
|
|
printf("Debug: %s", pMsg);
|
|
break;
|
|
case cWarningConsoleMessage:
|
|
printf("Warning: %s", pMsg);
|
|
break;
|
|
case cErrorConsoleMessage:
|
|
printf("Error: %s", pMsg);
|
|
break;
|
|
default:
|
|
printf("%s", pMsg);
|
|
break;
|
|
}
|
|
} else {
|
|
printf("%s", pMsg);
|
|
}
|
|
|
|
if (console::get_crlf())
|
|
printf("\n");
|
|
|
|
return true;
|
|
}
|
|
#endif
|
|
|
|
} // namespace crnlib
|