X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=jpeg.c;h=44e53e4216074c20d62bd08952205923fc0a8343;hp=5d09b498e21d65fd20cb570283dacfd9d66885f9;hb=8e10530c0564b56ff02e689d3d6839b8fcb88553;hpb=a854130c17f1490cf5fb25650994c12d8c9ad0a7

diff --git a/jpeg.c b/jpeg.c
index 5d09b498..44e53e42 100644
--- a/jpeg.c
+++ b/jpeg.c
@@ -25,8 +25,10 @@
 #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
@@ -52,6 +54,7 @@ typedef int jboolean;
 #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
 /*
@@ -102,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;
@@ -426,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[] =
 {
@@ -444,6 +448,7 @@ 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}
 };
 
@@ -490,9 +495,7 @@ qboolean JPEG_OpenLibrary (void)
 #else
 	const char* dllnames [] =
 	{
-#if defined(WIN64)
-		"libjpeg64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
 		"libjpeg.dll",
 #elif defined(MACOSX)
 		"libjpeg.62.dylib",
@@ -512,6 +515,12 @@ 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
@@ -593,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))
@@ -612,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;
@@ -677,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:
@@ -831,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;
@@ -951,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
@@ -990,7 +1009,8 @@ 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;
 
@@ -1008,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];
 
@@ -1030,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)
@@ -1046,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;