X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=jpeg.c;h=6fbf0eec7c678e0759e3dec27b6ae15e058c4568;hb=4d4118c0c9d234c6055a17672fb49353947e886d;hp=51fd81cbc6e30709b4c7355c63260bdb62ff18df;hpb=08512a8aed6a1d87a47987ffc2800c7080f9d439;p=xonotic%2Fdarkplaces.git diff --git a/jpeg.c b/jpeg.c index 51fd81cb..6fbf0eec 100644 --- a/jpeg.c +++ b/jpeg.c @@ -26,7 +26,34 @@ #include "image.h" #include "jpeg.h" +cvar_t sv_writepicture_quality = {CVAR_SAVE, "sv_writepicture_quality", "10", "WritePicture quality offset (higher means better quality, but slower)"}; +// 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 jpeg_dll true +#else /* ================================================================= @@ -38,18 +65,12 @@ ================================================================= */ -// 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, @@ -81,16 +102,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; @@ -429,9 +450,11 @@ static dllfunction_t jpegfuncs[] = // 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 qboolean error_in_jpeg; +static jmp_buf error_in_jpeg; +static qboolean jpeg_toolarge; // Our own output manager for JPEG compression typedef struct @@ -462,6 +485,9 @@ Try to load the JPEG DLL */ qboolean JPEG_OpenLibrary (void) { +#ifdef LINK_TO_LIBJPEG + return true; +#else const char* dllnames [] = { #if defined(WIN64) @@ -488,6 +514,7 @@ qboolean JPEG_OpenLibrary (void) // Load the DLL return Sys_LoadLibrary (dllnames, &jpeg_dll, jpegfuncs); +#endif } @@ -500,7 +527,10 @@ Unload the JPEG DLL */ void JPEG_CloseLibrary (void) { +#ifndef LINK_TO_LIBJPEG Sys_UnloadLibrary (&jpeg_dll); + jpeg_tried_loading = false; // allow retry +#endif } @@ -552,7 +582,7 @@ static void JPEG_MemSrc (j_decompress_ptr cinfo, const unsigned char *buffer, si static void JPEG_ErrorExit (j_common_ptr cinfo) { ((struct jpeg_decompress_struct*)cinfo)->err->output_message (cinfo); - error_in_jpeg = true; + longjmp(error_in_jpeg, 1); } @@ -567,7 +597,7 @@ unsigned char* JPEG_LoadImage_BGRA (const unsigned char *f, int filesize) { struct jpeg_decompress_struct cinfo; struct jpeg_error_mgr jerr; - unsigned char *image_buffer, *scanline; + unsigned char *image_buffer = NULL, *scanline = NULL; unsigned int line; // No DLL = no JPEGs @@ -576,6 +606,10 @@ unsigned char* JPEG_LoadImage_BGRA (const unsigned char *f, int filesize) cinfo.err = qjpeg_std_error (&jerr); qjpeg_create_decompress (&cinfo); + if(setjmp(error_in_jpeg)) + goto error_caught; + cinfo.err = qjpeg_std_error (&jerr); + cinfo.err->error_exit = JPEG_ErrorExit; JPEG_MemSrc (&cinfo, f, filesize); qjpeg_read_header (&cinfo, TRUE); qjpeg_start_decompress (&cinfo); @@ -649,6 +683,14 @@ unsigned char* JPEG_LoadImage_BGRA (const unsigned char *f, int filesize) qjpeg_destroy_decompress (&cinfo); return image_buffer; + +error_caught: + if(scanline) + Mem_Free (scanline); + if(image_buffer) + Mem_Free (image_buffer); + qjpeg_destroy_decompress (&cinfo); + return NULL; } @@ -674,10 +716,7 @@ static jboolean JPEG_EmptyOutputBuffer (j_compress_ptr cinfo) my_dest_ptr dest = (my_dest_ptr)cinfo->dest; if (FS_Write (dest->outfile, dest->buffer, JPEG_OUTPUT_BUF_SIZE) != (size_t) JPEG_OUTPUT_BUF_SIZE) - { - error_in_jpeg = true; - return false; - } + longjmp(error_in_jpeg, 1); dest->pub.next_output_byte = dest->buffer; dest->pub.free_in_buffer = JPEG_OUTPUT_BUF_SIZE; @@ -692,7 +731,7 @@ static void JPEG_TermDestination (j_compress_ptr cinfo) // Write any data remaining in the buffer if (datacount > 0) if (FS_Write (dest->outfile, dest->buffer, datacount) != (fs_offset_t)datacount) - error_in_jpeg = true; + longjmp(error_in_jpeg, 1); } static void JPEG_FileDest (j_compress_ptr cinfo, qfile_t* outfile) @@ -719,8 +758,11 @@ static void JPEG_Mem_InitDestination (j_compress_ptr cinfo) static jboolean JPEG_Mem_EmptyOutputBuffer (j_compress_ptr cinfo) { - error_in_jpeg = true; - return false; + my_dest_ptr dest = (my_dest_ptr)cinfo->dest; + jpeg_toolarge = true; + dest->pub.next_output_byte = dest->buffer; + dest->pub.free_in_buffer = dest->bufsize; + return true; } static void JPEG_Mem_TermDestination (j_compress_ptr cinfo) @@ -742,7 +784,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; } @@ -770,13 +812,14 @@ 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; + if(setjmp(error_in_jpeg)) + goto error_caught; cinfo.err = qjpeg_std_error (&jerr); cinfo.err->error_exit = JPEG_ErrorExit; - error_in_jpeg = false; qjpeg_create_compress (&cinfo); JPEG_FileDest (&cinfo, file); @@ -808,8 +851,6 @@ qboolean JPEG_SaveImage_preflipped (const char *filename, int width, int height, scanline = &data[offset - cinfo.next_scanline * linesize]; qjpeg_write_scanlines (&cinfo, &scanline, 1); - if (error_in_jpeg) - break; } qjpeg_finish_compress (&cinfo); @@ -817,16 +858,19 @@ qboolean JPEG_SaveImage_preflipped (const char *filename, int width, int height, FS_Close (file); return true; + +error_caught: + qjpeg_destroy_compress (&cinfo); + FS_Close (file); + return false; } static size_t JPEG_try_SaveImage_to_Buffer (struct jpeg_compress_struct *cinfo, char *jpegbuf, size_t jpegsize, int quality, int width, int height, unsigned char *data) { unsigned char *scanline; unsigned int linesize; - int offset; - - error_in_jpeg = false; + jpeg_toolarge = false; JPEG_MemDest (cinfo, jpegbuf, jpegsize); // Set the parameters for compression @@ -849,19 +893,19 @@ static size_t JPEG_try_SaveImage_to_Buffer (struct jpeg_compress_struct *cinfo, // Compress each scanline linesize = width * 3; - offset = linesize * (cinfo->image_height - 1); while (cinfo->next_scanline < cinfo->image_height) { - scanline = &data[offset - cinfo->next_scanline * linesize]; + scanline = &data[cinfo->next_scanline * linesize]; qjpeg_write_scanlines (cinfo, &scanline, 1); - if (error_in_jpeg) - break; } qjpeg_finish_compress (cinfo); - return error_in_jpeg ? 0 : ((my_dest_ptr) cinfo->dest)->bufsize; + if(jpeg_toolarge) + return 0; + + return ((my_dest_ptr) cinfo->dest)->bufsize; } size_t JPEG_SaveImage_to_Buffer (char *jpegbuf, size_t jpegsize, int width, int height, unsigned char *data) @@ -880,6 +924,8 @@ size_t JPEG_SaveImage_to_Buffer (char *jpegbuf, size_t jpegsize, int width, int return false; } + if(setjmp(error_in_jpeg)) + goto error_caught; cinfo.err = qjpeg_std_error (&jerr); cinfo.err->error_exit = JPEG_ErrorExit; @@ -908,8 +954,8 @@ size_t JPEG_SaveImage_to_Buffer (char *jpegbuf, size_t jpegsize, int width, int //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 = bound(0, quality_guess, 90); - quality = quality_guess + 10; // 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 while(!(result = JPEG_try_SaveImage_to_Buffer(&cinfo, jpegbuf, jpegsize, quality, width, height, data))) { @@ -920,9 +966,14 @@ size_t JPEG_SaveImage_to_Buffer (char *jpegbuf, size_t jpegsize, int width, int return 0; } } + qjpeg_destroy_compress (&cinfo); Con_DPrintf("JPEG_SaveImage_to_Buffer: guessed quality/size %d/%d, actually got %d/%d\n", quality_guess, (int)jpegsize, quality, (int)result); return result; + +error_caught: + qjpeg_destroy_compress (&cinfo); + return 0; } typedef struct CompressedImageCacheItem @@ -946,7 +997,7 @@ static void CompressedImageCache_Add(const char *imagename, size_t maxsize, void 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; @@ -966,6 +1017,7 @@ static CompressedImageCacheItem *CompressedImageCache_Find(const char *imagename if(i->maxsize == maxsize) if(!strcmp(i->imagename, imagename)) return i; + i = i->next; } return NULL; } @@ -1014,7 +1066,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); @@ -1022,7 +1074,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);