X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=jpeg.c;h=8d6ceec2376cb21fa50d5257e18b31266b8023b0;hb=60b66168f294813392ec91c4943f181a0e77520a;hp=359a3cd08adf0fb52478b686dd97fd750c7a31ca;hpb=57afd20092f91625f58eb7f2bc1732a319ef0a82;p=xonotic%2Fdarkplaces.git

diff --git a/jpeg.c b/jpeg.c
index 359a3cd0..8d6ceec2 100644
--- a/jpeg.c
+++ b/jpeg.c
@@ -22,11 +22,14 @@
 */
 
 
-#include "quakedef.h"
+#include "darkplaces.h"
+#include "cl_screen.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 sv_writepicture_quality = {CF_SERVER | CF_ARCHIVE, "sv_writepicture_quality", "10", "WritePicture quality offset (higher means better quality, but slower)"};
+cvar_t r_texture_jpeg_fastpicmip = {CF_CLIENT | CF_ARCHIVE, "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
@@ -452,12 +455,12 @@ static dllfunction_t jpegfuncs[] =
 
 // Handle for JPEG DLL
 dllhandle_t jpeg_dll = NULL;
-qboolean jpeg_tried_loading = 0;
+qbool jpeg_tried_loading = 0;
 #endif
 
 static unsigned char jpeg_eoi_marker [2] = {0xFF, JPEG_EOI};
 static jmp_buf error_in_jpeg;
-static qboolean jpeg_toolarge;
+static qbool jpeg_toolarge;
 
 // Our own output manager for JPEG compression
 typedef struct
@@ -486,7 +489,7 @@ JPEG_OpenLibrary
 Try to load the JPEG DLL
 ====================
 */
-qboolean JPEG_OpenLibrary (void)
+qbool JPEG_OpenLibrary (void)
 {
 #ifdef LINK_TO_LIBJPEG
 	return true;
@@ -513,6 +516,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
@@ -551,7 +560,7 @@ static jboolean JPEG_FillInputBuffer (j_decompress_ptr cinfo)
     cinfo->src->next_input_byte = jpeg_eoi_marker;
     cinfo->src->bytes_in_buffer = 2;
 
-	return TRUE;
+	return true;
 }
 
 static void JPEG_SkipInputData (j_decompress_ptr cinfo, long num_bytes)
@@ -594,17 +603,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,13 +625,15 @@ unsigned char* JPEG_LoadImage_BGRA (const unsigned char *f, int filesize)
 	cinfo.err = qjpeg_std_error (&jerr);
 	cinfo.err->error_exit = JPEG_ErrorExit;
 	JPEG_MemSrc (&cinfo, f, filesize);
-	qjpeg_read_header (&cinfo, TRUE);
+	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;
@@ -678,11 +693,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:
@@ -797,7 +815,7 @@ JPEG_SaveImage_preflipped
 Save a preflipped JPEG image to a file
 ====================
 */
-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)
 {
 	struct jpeg_compress_struct cinfo;
 	struct jpeg_error_mgr jerr;
@@ -831,7 +849,7 @@ qboolean JPEG_SaveImage_preflipped (const char *filename, int width, int height,
 	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);
 
 	// turn off subsampling (to make text look better)
@@ -953,8 +971,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
@@ -992,7 +1010,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;
 
@@ -1010,7 +1029,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];
 
@@ -1024,7 +1044,7 @@ static CompressedImageCacheItem *CompressedImageCache_Find(const char *imagename
 	return NULL;
 }
 
-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)
 {
 	unsigned char *imagedata, *newimagedata;
 	int maxPixelCount;
@@ -1032,6 +1052,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)
@@ -1045,10 +1066,11 @@ qboolean Image_Compress(const char *imagename, size_t maxsize, void **buf, size_
 	{
 		*size = i->compressed_size;
 		*buf = i->compressed;
+        return (*buf != NULL);
 	}
 
 	// load the image
-	imagedata = loadimagepixelsbgra(imagename, true, false);
+	imagedata = loadimagepixelsbgra(imagename, true, false, false, NULL);
 	if(!imagedata)
 		return false;