#include "quakedef.h"
#include "image.h"
#include "jpeg.h"
+#include "image_png.h"
cvar_t sv_writepicture_quality = {CVAR_SAVE, "sv_writepicture_quality", "10", "WritePicture quality offset (higher means better quality, but slower)"};
+cvar_t r_texture_jpeg_fastpicmip = {CVAR_SAVE, "r_texture_jpeg_fastpicmip", "1", "perform gl_picmip during decompression for JPEG files (faster)"};
// jboolean is unsigned char instead of int on Win32
#ifdef WIN32
#define qjpeg_start_decompress jpeg_start_decompress
#define qjpeg_std_error jpeg_std_error
#define qjpeg_write_scanlines jpeg_write_scanlines
+#define qjpeg_simple_progression jpeg_simple_progression
#define jpeg_dll true
#else
/*
struct jpeg_memory_mgr
{
void* (*alloc_small) (j_common_ptr cinfo, int pool_id, size_t sizeofobject);
- void (*alloc_large) ();
- void (*alloc_sarray) ();
- void (*alloc_barray) ();
- void (*request_virt_sarray) ();
- void (*request_virt_barray) ();
- void (*realize_virt_arrays) ();
- void (*access_virt_sarray) ();
- void (*access_virt_barray) ();
- void (*free_pool) ();
- void (*self_destruct) ();
+ void (*_reserve_space_for_alloc_large) (void *dummy, ...);
+ void (*_reserve_space_for_alloc_sarray) (void *dummy, ...);
+ void (*_reserve_space_for_alloc_barray) (void *dummy, ...);
+ void (*_reserve_space_for_request_virt_sarray) (void *dummy, ...);
+ void (*_reserve_space_for_request_virt_barray) (void *dummy, ...);
+ void (*_reserve_space_for_realize_virt_arrays) (void *dummy, ...);
+ void (*_reserve_space_for_access_virt_sarray) (void *dummy, ...);
+ void (*_reserve_space_for_access_virt_barray) (void *dummy, ...);
+ void (*_reserve_space_for_free_pool) (void *dummy, ...);
+ void (*_reserve_space_for_self_destruct) (void *dummy, ...);
long max_memory_to_use;
long max_alloc_chunk;
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 void (*qjpeg_simple_progression) (j_compress_ptr cinfo);
static dllfunction_t jpegfuncs[] =
{
{"jpeg_start_decompress", (void **) &qjpeg_start_decompress},
{"jpeg_std_error", (void **) &qjpeg_std_error},
{"jpeg_write_scanlines", (void **) &qjpeg_write_scanlines},
+ {"jpeg_simple_progression", (void **) &qjpeg_simple_progression},
{NULL, NULL}
};
#else
const char* dllnames [] =
{
-#if defined(WIN64)
- "libjpeg64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
"libjpeg.dll",
#elif defined(MACOSX)
"libjpeg.62.dylib",
jpeg_tried_loading = true;
+#ifdef __ANDROID__
+ // loading the native Android libjpeg.so causes crashes
+ Con_Printf("Not opening libjpeg.so dynamically on Android - use LINK_TO_LIBJPEG instead if it is needed.\n");
+ return false;
+#endif
+
// Load the DLL
return Sys_LoadLibrary (dllnames, &jpeg_dll, jpegfuncs);
#endif
Load a JPEG image into a BGRA buffer
====================
*/
-unsigned char* JPEG_LoadImage_BGRA (const unsigned char *f, int filesize)
+unsigned char* JPEG_LoadImage_BGRA (const unsigned char *f, int filesize, int *miplevel)
{
struct jpeg_decompress_struct cinfo;
struct jpeg_error_mgr jerr;
unsigned char *image_buffer = NULL, *scanline = NULL;
unsigned int line;
+ int submip = 0;
// No DLL = no JPEGs
if (!jpeg_dll)
return NULL;
+ if(miplevel && r_texture_jpeg_fastpicmip.integer)
+ submip = bound(0, *miplevel, 3);
+
cinfo.err = qjpeg_std_error (&jerr);
qjpeg_create_decompress (&cinfo);
if(setjmp(error_in_jpeg))
cinfo.err->error_exit = JPEG_ErrorExit;
JPEG_MemSrc (&cinfo, f, filesize);
qjpeg_read_header (&cinfo, TRUE);
+ cinfo.scale_num = 1;
+ cinfo.scale_denom = (1 << submip);
qjpeg_start_decompress (&cinfo);
- image_width = cinfo.image_width;
- image_height = cinfo.image_height;
+ image_width = cinfo.output_width;
+ image_height = cinfo.output_height;
- if (image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0)
+ if (image_width > 32768 || image_height > 32768 || image_width <= 0 || image_height <= 0)
{
Con_Printf("JPEG_LoadImage: invalid image size %ix%i\n", image_width, image_height);
return NULL;
line++;
}
- Mem_Free (scanline);
+ Mem_Free (scanline); scanline = NULL;
qjpeg_finish_decompress (&cinfo);
qjpeg_destroy_decompress (&cinfo);
+ if(miplevel)
+ *miplevel -= submip;
+
return image_buffer;
error_caught:
cinfo.input_components = 3;
qjpeg_set_defaults (&cinfo);
qjpeg_set_quality (&cinfo, (int)(scr_screenshot_jpeg_quality.value * 100), TRUE);
+ qjpeg_simple_progression (&cinfo);
// turn off subsampling (to make text look better)
cinfo.optimize_coding = 1;
}
#endif
- //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
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;
static CompressedImageCacheItem *CompressedImageCache_Find(const char *imagename, size_t 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];
CompressedImageCacheItem *i;
JPEG_OpenLibrary (); // for now; LH had the idea of replacing this by a better format
+ PNG_OpenLibrary (); // for loading
// No DLL = no JPEGs
if (!jpeg_dll)
}
// load the image
- imagedata = loadimagepixelsbgra(imagename, true, false);
+ imagedata = loadimagepixelsbgra(imagename, true, false, false, NULL);
if(!imagedata)
return false;
projects / xonotic / darkplaces.git / blobdiff