X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=jpeg.c;h=44e53e4216074c20d62bd08952205923fc0a8343;hp=6b21c232a5a5df5c13d2c3dded8c6aa04ad7fd53;hb=1ff3bc8e953680793a28ea923f2d1e58cdf2c9f0;hpb=e1229ad9d6f49317dd8a9fa895f2d937badde185 diff --git a/jpeg.c b/jpeg.c index 6b21c232..44e53e42 100644 --- a/jpeg.c +++ b/jpeg.c @@ -25,9 +25,38 @@ #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 +typedef unsigned char jboolean; +#else +typedef int jboolean; +#endif + +#ifdef LINK_TO_LIBJPEG +#include +#define qjpeg_create_compress jpeg_create_compress +#define qjpeg_create_decompress jpeg_create_decompress +#define qjpeg_destroy_compress jpeg_destroy_compress +#define qjpeg_destroy_decompress jpeg_destroy_decompress +#define qjpeg_finish_compress jpeg_finish_compress +#define qjpeg_finish_decompress jpeg_finish_decompress +#define qjpeg_resync_to_restart jpeg_resync_to_restart +#define qjpeg_read_header jpeg_read_header +#define qjpeg_read_scanlines jpeg_read_scanlines +#define qjpeg_set_defaults jpeg_set_defaults +#define qjpeg_set_quality jpeg_set_quality +#define qjpeg_start_compress jpeg_start_compress +#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 /* ================================================================= @@ -39,18 +68,12 @@ cvar_t sv_writepicture_quality = {CVAR_SAVE, "sv_writepicture_quality", "10", "W ================================================================= */ -// jboolean is unsigned char instead of int on Win32 -#ifdef WIN32 -typedef unsigned char jboolean; -#else -typedef int jboolean; -#endif - -#define JPEG_LIB_VERSION 62 // Version 6b - typedef void *j_common_ptr; typedef struct jpeg_compress_struct *j_compress_ptr; typedef struct jpeg_decompress_struct *j_decompress_ptr; + +#define JPEG_LIB_VERSION 62 // Version 6b + typedef enum { JCS_UNKNOWN, @@ -82,16 +105,16 @@ typedef unsigned int JDIMENSION; 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; @@ -406,6 +429,7 @@ static jboolean (*qjpeg_start_compress) (j_compress_ptr cinfo, jboolean write_al 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[] = { @@ -424,12 +448,14 @@ 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} }; // Handle for JPEG DLL dllhandle_t jpeg_dll = NULL; qboolean jpeg_tried_loading = 0; +#endif static unsigned char jpeg_eoi_marker [2] = {0xFF, JPEG_EOI}; static jmp_buf error_in_jpeg; @@ -464,11 +490,12 @@ Try to load the JPEG DLL */ qboolean JPEG_OpenLibrary (void) { +#ifdef LINK_TO_LIBJPEG + return true; +#else const char* dllnames [] = { -#if defined(WIN64) - "libjpeg64.dll", -#elif defined(WIN32) +#if defined(WIN32) "libjpeg.dll", #elif defined(MACOSX) "libjpeg.62.dylib", @@ -488,8 +515,15 @@ qboolean JPEG_OpenLibrary (void) 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 } @@ -502,8 +536,10 @@ Unload the JPEG DLL */ void JPEG_CloseLibrary (void) { +#ifndef LINK_TO_LIBJPEG Sys_UnloadLibrary (&jpeg_dll); jpeg_tried_loading = false; // allow retry +#endif } @@ -566,17 +602,21 @@ JPEG_LoadImage 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)) @@ -585,12 +625,14 @@ unsigned char* JPEG_LoadImage_BGRA (const unsigned char *f, int filesize) 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; @@ -650,11 +692,14 @@ unsigned char* JPEG_LoadImage_BGRA (const unsigned char *f, int filesize) 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: @@ -757,7 +802,7 @@ static void JPEG_MemDest (j_compress_ptr cinfo, void* buf, size_t bufsize) dest->pub.term_destination = JPEG_Mem_TermDestination; dest->outfile = NULL; - dest->buffer = buf; + dest->buffer = (unsigned char *) buf; dest->bufsize = bufsize; } @@ -785,7 +830,7 @@ qboolean JPEG_SaveImage_preflipped (const char *filename, int width, int height, } // Open the file - file = FS_Open (filename, "wb", true, false); + file = FS_OpenRealFile(filename, "wb", true); if (!file) return false; @@ -804,6 +849,7 @@ qboolean JPEG_SaveImage_preflipped (const char *filename, int width, int height, 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; @@ -924,8 +970,8 @@ size_t JPEG_SaveImage_to_Buffer (char *jpegbuf, size_t jpegsize, int width, int } #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 @@ -963,14 +1009,15 @@ static CompressedImageCacheItem *CompressedImageCache[COMPRESSEDIMAGECACHE_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 - i = Z_Malloc(sizeof(CompressedImageCacheItem)); + i = (CompressedImageCacheItem*) Z_Malloc(sizeof(CompressedImageCacheItem)); strlcpy(i->imagename, imagename, sizeof(i->imagename)); i->maxsize = maxsize; i->compressed = compressed; @@ -981,7 +1028,8 @@ static void CompressedImageCache_Add(const char *imagename, size_t maxsize, void 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]; @@ -990,6 +1038,7 @@ static CompressedImageCacheItem *CompressedImageCache_Find(const char *imagename if(i->maxsize == maxsize) if(!strcmp(i->imagename, imagename)) return i; + i = i->next; } return NULL; } @@ -1002,6 +1051,7 @@ qboolean Image_Compress(const char *imagename, size_t maxsize, void **buf, size_ 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) @@ -1018,7 +1068,7 @@ qboolean Image_Compress(const char *imagename, size_t maxsize, void **buf, size_ } // load the image - imagedata = loadimagepixelsbgra(imagename, true, false); + imagedata = loadimagepixelsbgra(imagename, true, false, false, NULL); if(!imagedata) return false; @@ -1038,7 +1088,7 @@ qboolean Image_Compress(const char *imagename, size_t maxsize, void **buf, size_ Image_MipReduce32(imagedata, imagedata, &image_width, &image_height, &one, image_width/2, image_height/2, 1); } - newimagedata = Mem_Alloc(tempmempool, image_width * image_height * 3); + newimagedata = (unsigned char *) Mem_Alloc(tempmempool, image_width * image_height * 3); // convert the image from BGRA to RGB Image_CopyMux(newimagedata, imagedata, image_width, image_height, false, false, false, 3, 4, components); @@ -1046,7 +1096,9 @@ qboolean Image_Compress(const char *imagename, size_t maxsize, void **buf, size_ // try to compress it to JPEG *buf = Z_Malloc(maxsize); - *size = JPEG_SaveImage_to_Buffer(*buf, maxsize, image_width, image_height, newimagedata); + *size = JPEG_SaveImage_to_Buffer((char *) *buf, maxsize, image_width, image_height, newimagedata); + Mem_Free(newimagedata); + if(!*size) { Z_Free(*buf);