-cvar_t sv_writepicture_quality = {CVAR_SAVE, "sv_writepicture_quality", "10", "WritePicture quality offset (higher means better quality, but slower)"};
+extern cvar_t sv_writepicture_quality;
+cvar_t r_texture_jpeg_fastpicmip = {CF_CLIENT | CF_ARCHIVE, "r_texture_jpeg_fastpicmip", "1", "perform gl_picmip during decompression for JPEG files (faster)"};
#define qjpeg_start_decompress jpeg_start_decompress
#define qjpeg_std_error jpeg_std_error
#define qjpeg_write_scanlines jpeg_write_scanlines
#define qjpeg_start_decompress jpeg_start_decompress
#define qjpeg_std_error jpeg_std_error
#define qjpeg_write_scanlines jpeg_write_scanlines
/* The decompressor output side may not use these variables. */
int dc_tbl_no; /* DC entropy table selector (0..3) */
int ac_tbl_no; /* AC entropy table selector (0..3) */
/* The decompressor output side may not use these variables. */
int dc_tbl_no; /* DC entropy table selector (0..3) */
int ac_tbl_no; /* AC entropy table selector (0..3) */
/* These values are computed during compression or decompression startup: */
/* Component's size in DCT blocks.
* Any dummy blocks added to complete an MCU are not counted; therefore
/* These values are computed during compression or decompression startup: */
/* Component's size in DCT blocks.
* Any dummy blocks added to complete an MCU are not counted; therefore
static jboolean (*qjpeg_start_decompress) (j_decompress_ptr cinfo);
static struct jpeg_error_mgr* (*qjpeg_std_error) (struct jpeg_error_mgr *err);
static JDIMENSION (*qjpeg_write_scanlines) (j_compress_ptr cinfo, unsigned char** scanlines, JDIMENSION num_lines);
static jboolean (*qjpeg_start_decompress) (j_decompress_ptr cinfo);
static struct jpeg_error_mgr* (*qjpeg_std_error) (struct jpeg_error_mgr *err);
static JDIMENSION (*qjpeg_write_scanlines) (j_compress_ptr cinfo, unsigned char** scanlines, JDIMENSION num_lines);
{"jpeg_start_decompress", (void **) &qjpeg_start_decompress},
{"jpeg_std_error", (void **) &qjpeg_std_error},
{"jpeg_write_scanlines", (void **) &qjpeg_write_scanlines},
{"jpeg_start_decompress", (void **) &qjpeg_start_decompress},
{"jpeg_std_error", (void **) &qjpeg_std_error},
{"jpeg_write_scanlines", (void **) &qjpeg_write_scanlines},
#endif
static unsigned char jpeg_eoi_marker [2] = {0xFF, JPEG_EOI};
static jmp_buf error_in_jpeg;
#endif
static unsigned char jpeg_eoi_marker [2] = {0xFF, JPEG_EOI};
static jmp_buf error_in_jpeg;
{
struct jpeg_decompress_struct cinfo;
struct jpeg_error_mgr jerr;
unsigned char *image_buffer = NULL, *scanline = NULL;
unsigned int line;
{
struct jpeg_decompress_struct cinfo;
struct jpeg_error_mgr jerr;
unsigned char *image_buffer = NULL, *scanline = NULL;
unsigned int line;
cinfo.err = qjpeg_std_error (&jerr);
qjpeg_create_decompress (&cinfo);
if(setjmp(error_in_jpeg))
cinfo.err = qjpeg_std_error (&jerr);
qjpeg_create_decompress (&cinfo);
if(setjmp(error_in_jpeg))
cinfo.err = qjpeg_std_error (&jerr);
cinfo.err->error_exit = JPEG_ErrorExit;
JPEG_MemSrc (&cinfo, f, filesize);
cinfo.err = qjpeg_std_error (&jerr);
cinfo.err->error_exit = JPEG_ErrorExit;
JPEG_MemSrc (&cinfo, f, filesize);
-qboolean JPEG_SaveImage_preflipped (const char *filename, int width, int height, unsigned char *data)
+qbool JPEG_SaveImage_preflipped (const char *filename, int width, int height, unsigned char *data)
cinfo.in_color_space = JCS_RGB;
cinfo.input_components = 3;
qjpeg_set_defaults (&cinfo);
cinfo.in_color_space = JCS_RGB;
cinfo.input_components = 3;
qjpeg_set_defaults (&cinfo);
- qjpeg_set_quality (&cinfo, (int)(scr_screenshot_jpeg_quality.value * 100), TRUE);
+ qjpeg_set_quality (&cinfo, (int)(scr_screenshot_jpeg_quality.value * 100), true);
+ qjpeg_simple_progression (&cinfo);
cinfo->in_color_space = JCS_RGB;
cinfo->input_components = 3;
qjpeg_set_defaults (cinfo);
cinfo->in_color_space = JCS_RGB;
cinfo->input_components = 3;
qjpeg_set_defaults (cinfo);
- //quality_guess = (100 * jpegsize - 41000) / (width*height) + 2; // fits random data
- quality_guess = (256 * jpegsize - 81920) / (width*height) - 8; // fits Nexuiz's map pictures
+ //quality_guess = (int)((100 * jpegsize - 41000) / (width*height) + 2); // fits random data
+ quality_guess = (int)((256 * jpegsize - 81920) / (width*height) - 8); // fits Nexuiz's/Xonotic's map pictures
quality_guess = bound(0, quality_guess, 100);
quality = bound(0, quality_guess + sv_writepicture_quality.integer, 100); // assume it can do 10 failed attempts
quality_guess = bound(0, quality_guess, 100);
quality = bound(0, quality_guess + sv_writepicture_quality.integer, 100); // assume it can do 10 failed attempts
static void CompressedImageCache_Add(const char *imagename, size_t maxsize, void *compressed, size_t compressed_size)
{
static void CompressedImageCache_Add(const char *imagename, size_t maxsize, void *compressed, size_t compressed_size)
{
- const char *hashkey = va("%s:%d", imagename, (int) maxsize);
+ char vabuf[1024];
+ const char *hashkey = va(vabuf, sizeof(vabuf), "%s:%d", imagename, (int) maxsize);
int hashindex = CRC_Block((unsigned char *) hashkey, strlen(hashkey)) % COMPRESSEDIMAGECACHE_SIZE;
CompressedImageCacheItem *i;
if(strlen(imagename) >= MAX_QPATH)
return; // can't add this
int hashindex = CRC_Block((unsigned char *) hashkey, strlen(hashkey)) % COMPRESSEDIMAGECACHE_SIZE;
CompressedImageCacheItem *i;
if(strlen(imagename) >= MAX_QPATH)
return; // can't add this
i = (CompressedImageCacheItem*) Z_Malloc(sizeof(CompressedImageCacheItem));
strlcpy(i->imagename, imagename, sizeof(i->imagename));
i->maxsize = maxsize;
i = (CompressedImageCacheItem*) Z_Malloc(sizeof(CompressedImageCacheItem));
strlcpy(i->imagename, imagename, sizeof(i->imagename));
i->maxsize = maxsize;
- const char *hashkey = va("%s:%d", imagename, (int) maxsize);
+ char vabuf[1024];
+ const char *hashkey = va(vabuf, sizeof(vabuf), "%s:%d", imagename, (int) maxsize);
int hashindex = CRC_Block((unsigned char *) hashkey, strlen(hashkey)) % COMPRESSEDIMAGECACHE_SIZE;
CompressedImageCacheItem *i = CompressedImageCache[hashindex];
int hashindex = CRC_Block((unsigned char *) hashkey, strlen(hashkey)) % COMPRESSEDIMAGECACHE_SIZE;
CompressedImageCacheItem *i = CompressedImageCache[hashindex];
-qboolean Image_Compress(const char *imagename, size_t maxsize, void **buf, size_t *size)
+qbool Image_Compress(const char *imagename, size_t maxsize, void **buf, size_t *size)
CompressedImageCacheItem *i;
JPEG_OpenLibrary (); // for now; LH had the idea of replacing this by a better format
CompressedImageCacheItem *i;
JPEG_OpenLibrary (); // for now; LH had the idea of replacing this by a better format
- imagedata = loadimagepixelsbgra(imagename, true, false);
+ imagedata = loadimagepixelsbgra(imagename, true, false, false, NULL);