X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=jpeg.c;h=28904b11a19c4a78d154d9e3599439ee0e6a8897;hb=892af9237609d72a8c9f4e563b52bf844ea3bf15;hp=ba1d8913aebcbe94d8d7ab19a784a575f6f32de5;hpb=95f66338c8144989970daa0fa4b38c87e9af94a0;p=xonotic%2Fdarkplaces.git diff --git a/jpeg.c b/jpeg.c index ba1d8913..28904b11 100644 --- a/jpeg.c +++ b/jpeg.c @@ -38,9 +38,9 @@ ================================================================= */ -// jboolean is qbyte instead of int on Win32 +// jboolean is unsigned char instead of int on Win32 #ifdef WIN32 -typedef qbyte jboolean; +typedef unsigned char jboolean; #else typedef int jboolean; #endif @@ -119,7 +119,7 @@ struct jpeg_error_mgr struct jpeg_source_mgr { - const qbyte *next_input_byte; + const unsigned char *next_input_byte; size_t bytes_in_buffer; void (*init_source) (j_decompress_ptr cinfo); @@ -129,6 +129,71 @@ struct jpeg_source_mgr void (*term_source) (j_decompress_ptr cinfo); }; +typedef struct { + /* These values are fixed over the whole image. */ + /* For compression, they must be supplied by parameter setup; */ + /* for decompression, they are read from the SOF marker. */ + int component_id; /* identifier for this component (0..255) */ + int component_index; /* its index in SOF or cinfo->comp_info[] */ + int h_samp_factor; /* horizontal sampling factor (1..4) */ + int v_samp_factor; /* vertical sampling factor (1..4) */ + int quant_tbl_no; /* quantization table selector (0..3) */ + /* These values may vary between scans. */ + /* For compression, they must be supplied by parameter setup; */ + /* for decompression, they are read from the SOS marker. */ + /* The decompressor output side may not use these variables. */ + int dc_tbl_no; /* DC entropy table selector (0..3) */ + int ac_tbl_no; /* AC entropy table selector (0..3) */ + + /* Remaining fields should be treated as private by applications. */ + + /* These values are computed during compression or decompression startup: */ + /* Component's size in DCT blocks. + * Any dummy blocks added to complete an MCU are not counted; therefore + * these values do not depend on whether a scan is interleaved or not. + */ + JDIMENSION width_in_blocks; + JDIMENSION height_in_blocks; + /* Size of a DCT block in samples. Always DCTSIZE for compression. + * For decompression this is the size of the output from one DCT block, + * reflecting any scaling we choose to apply during the IDCT step. + * Values of 1,2,4,8 are likely to be supported. Note that different + * components may receive different IDCT scalings. + */ + int DCT_scaled_size; + /* The downsampled dimensions are the component's actual, unpadded number + * of samples at the main buffer (preprocessing/compression interface), thus + * downsampled_width = ceil(image_width * Hi/Hmax) + * and similarly for height. For decompression, IDCT scaling is included, so + * downsampled_width = ceil(image_width * Hi/Hmax * DCT_scaled_size/DCTSIZE) + */ + JDIMENSION downsampled_width; /* actual width in samples */ + JDIMENSION downsampled_height; /* actual height in samples */ + /* This flag is used only for decompression. In cases where some of the + * components will be ignored (eg grayscale output from YCbCr image), + * we can skip most computations for the unused components. + */ + jboolean component_needed; /* do we need the value of this component? */ + + /* These values are computed before starting a scan of the component. */ + /* The decompressor output side may not use these variables. */ + int MCU_width; /* number of blocks per MCU, horizontally */ + int MCU_height; /* number of blocks per MCU, vertically */ + int MCU_blocks; /* MCU_width * MCU_height */ + int MCU_sample_width; /* MCU width in samples, MCU_width*DCT_scaled_size */ + int last_col_width; /* # of non-dummy blocks across in last MCU */ + int last_row_height; /* # of non-dummy blocks down in last MCU */ + + /* Saved quantization table for component; NULL if none yet saved. + * See jdinput.c comments about the need for this information. + * This field is currently used only for decompression. + */ + void *quant_table; + + /* Private per-component storage for DCT or IDCT subsystem. */ + void * dct_table; +} jpeg_component_info; + struct jpeg_decompress_struct { struct jpeg_error_mgr *err; // USED @@ -183,21 +248,21 @@ struct jpeg_decompress_struct void *dc_huff_tbl_ptrs[NUM_HUFF_TBLS]; void *ac_huff_tbl_ptrs[NUM_HUFF_TBLS]; int data_precision; - void *comp_info; + jpeg_component_info *comp_info; jboolean progressive_mode; jboolean arith_code; - qbyte arith_dc_L[NUM_ARITH_TBLS]; - qbyte arith_dc_U[NUM_ARITH_TBLS]; - qbyte arith_ac_K[NUM_ARITH_TBLS]; + unsigned char arith_dc_L[NUM_ARITH_TBLS]; + unsigned char arith_dc_U[NUM_ARITH_TBLS]; + unsigned char arith_ac_K[NUM_ARITH_TBLS]; unsigned int restart_interval; jboolean saw_JFIF_marker; - qbyte JFIF_major_version; - qbyte JFIF_minor_version; - qbyte density_unit; + unsigned char JFIF_major_version; + unsigned char JFIF_minor_version; + unsigned char density_unit; unsigned short X_density; unsigned short Y_density; jboolean saw_Adobe_marker; - qbyte Adobe_transform; + unsigned char Adobe_transform; jboolean CCIR601_sampling; void *marker_list; int max_h_samp_factor; @@ -206,7 +271,7 @@ struct jpeg_decompress_struct JDIMENSION total_iMCU_rows; void *sample_range_limit; int comps_in_scan; - void *cur_comp_info[MAX_COMPS_IN_SCAN]; + jpeg_component_info *cur_comp_info[MAX_COMPS_IN_SCAN]; JDIMENSION MCUs_per_row; JDIMENSION MCU_rows_in_scan; int blocks_in_MCU; @@ -246,13 +311,13 @@ struct jpeg_compress_struct int num_components; J_COLOR_SPACE jpeg_color_space; - void *comp_info; + jpeg_component_info *comp_info; void *quant_tbl_ptrs[NUM_QUANT_TBLS]; void *dc_huff_tbl_ptrs[NUM_HUFF_TBLS]; void *ac_huff_tbl_ptrs[NUM_HUFF_TBLS]; - qbyte arith_dc_L[NUM_ARITH_TBLS]; - qbyte arith_dc_U[NUM_ARITH_TBLS]; - qbyte arith_ac_K[NUM_ARITH_TBLS]; + unsigned char arith_dc_L[NUM_ARITH_TBLS]; + unsigned char arith_dc_U[NUM_ARITH_TBLS]; + unsigned char arith_ac_K[NUM_ARITH_TBLS]; int num_scans; const void *scan_info; @@ -267,9 +332,9 @@ struct jpeg_compress_struct int restart_in_rows; jboolean write_JFIF_header; - qbyte JFIF_major_version; - qbyte JFIF_minor_version; - qbyte density_unit; + unsigned char JFIF_major_version; + unsigned char JFIF_minor_version; + unsigned char density_unit; unsigned short X_density; unsigned short Y_density; jboolean write_Adobe_marker; @@ -280,7 +345,7 @@ struct jpeg_compress_struct int max_v_samp_factor; JDIMENSION total_iMCU_rows; int comps_in_scan; - void *cur_comp_info[MAX_COMPS_IN_SCAN]; + jpeg_component_info *cur_comp_info[MAX_COMPS_IN_SCAN]; JDIMENSION MCUs_per_row; JDIMENSION MCU_rows_in_scan; int blocks_in_MCU; @@ -302,7 +367,7 @@ struct jpeg_compress_struct struct jpeg_destination_mgr { - qbyte* next_output_byte; + unsigned char* next_output_byte; size_t free_in_buffer; void (*init_destination) (j_compress_ptr cinfo); @@ -333,13 +398,13 @@ static void (*qjpeg_finish_compress) (j_compress_ptr cinfo); static jboolean (*qjpeg_finish_decompress) (j_decompress_ptr cinfo); static jboolean (*qjpeg_resync_to_restart) (j_decompress_ptr cinfo, int desired); static int (*qjpeg_read_header) (j_decompress_ptr cinfo, jboolean require_image); -static JDIMENSION (*qjpeg_read_scanlines) (j_decompress_ptr cinfo, qbyte** scanlines, JDIMENSION max_lines); +static JDIMENSION (*qjpeg_read_scanlines) (j_decompress_ptr cinfo, unsigned char** scanlines, JDIMENSION max_lines); static void (*qjpeg_set_defaults) (j_compress_ptr cinfo); static void (*qjpeg_set_quality) (j_compress_ptr cinfo, int quality, jboolean force_baseline); static jboolean (*qjpeg_start_compress) (j_compress_ptr cinfo, jboolean write_all_tables); 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, qbyte** scanlines, JDIMENSION num_lines); +static JDIMENSION (*qjpeg_write_scanlines) (j_compress_ptr cinfo, unsigned char** scanlines, JDIMENSION num_lines); static dllfunction_t jpegfuncs[] = { @@ -364,7 +429,7 @@ static dllfunction_t jpegfuncs[] = // Handle for JPEG DLL dllhandle_t jpeg_dll = NULL; -static qbyte jpeg_eoi_marker [2] = {0xFF, JPEG_EOI}; +static unsigned char jpeg_eoi_marker [2] = {0xFF, JPEG_EOI}; static qboolean error_in_jpeg; // Our own output manager for JPEG compression @@ -373,7 +438,7 @@ typedef struct struct jpeg_destination_mgr pub; qfile_t* outfile; - qbyte* buffer; + unsigned char* buffer; } my_destination_mgr; typedef my_destination_mgr* my_dest_ptr; @@ -395,30 +460,27 @@ Try to load the JPEG DLL */ qboolean JPEG_OpenLibrary (void) { - const char* dllname; + const char* dllnames [] = + { +#if defined(WIN64) + "libjpeg64.dll", +#elif defined(WIN32) + "libjpeg.dll", +#elif defined(MACOSX) + "libjpeg.62.dylib", +#else + "libjpeg.so.62", + "libjpeg.so", +#endif + NULL + }; // Already loaded? if (jpeg_dll) return true; -// TODO: make Sys_LoadLibrary support multiple names -#ifdef WIN32 - dllname = "libjpeg.dll"; -#elif defined(__FreeBSD__) - dllname = "libjpeg.so"; -#else - dllname = "libjpeg.so.62"; -#endif - // Load the DLL - if (! Sys_LoadLibrary (dllname, &jpeg_dll, jpegfuncs)) - { - Con_Printf ("JPEG support disabled\n"); - return false; - } - - Con_Printf ("JPEG support enabled\n"); - return true; + return Sys_LoadLibrary (dllnames, &jpeg_dll, jpegfuncs); } @@ -466,12 +528,12 @@ static void JPEG_SkipInputData (j_decompress_ptr cinfo, long num_bytes) cinfo->src->bytes_in_buffer -= num_bytes; } -static void JPEG_MemSrc (j_decompress_ptr cinfo, qbyte *buffer) +static void JPEG_MemSrc (j_decompress_ptr cinfo, const unsigned char *buffer, size_t filesize) { - cinfo->src = cinfo->mem->alloc_small ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof (struct jpeg_source_mgr)); + cinfo->src = (struct jpeg_source_mgr *)cinfo->mem->alloc_small ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof (struct jpeg_source_mgr)); cinfo->src->next_input_byte = buffer; - cinfo->src->bytes_in_buffer = fs_filesize; + cinfo->src->bytes_in_buffer = filesize; cinfo->src->init_source = JPEG_Noop; cinfo->src->fill_input_buffer = JPEG_FillInputBuffer; @@ -491,14 +553,14 @@ static void JPEG_ErrorExit (j_common_ptr cinfo) ==================== JPEG_LoadImage -Load a JPEG image into a RGBA buffer +Load a JPEG image into a BGRA buffer ==================== */ -qbyte* JPEG_LoadImage (qbyte *f, int matchwidth, int matchheight) +unsigned char* JPEG_LoadImage_BGRA (const unsigned char *f, int filesize) { struct jpeg_decompress_struct cinfo; struct jpeg_error_mgr jerr; - qbyte *image_rgba, *scanline; + unsigned char *image_buffer, *scanline; unsigned int line; // No DLL = no JPEGs @@ -507,31 +569,27 @@ qbyte* JPEG_LoadImage (qbyte *f, int matchwidth, int matchheight) cinfo.err = qjpeg_std_error (&jerr); qjpeg_create_decompress (&cinfo); - JPEG_MemSrc (&cinfo, f); + JPEG_MemSrc (&cinfo, f, filesize); qjpeg_read_header (&cinfo, TRUE); qjpeg_start_decompress (&cinfo); image_width = cinfo.image_width; image_height = cinfo.image_height; - if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight)) - { - qjpeg_finish_decompress (&cinfo); - qjpeg_destroy_decompress (&cinfo); - return NULL; - } if (image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0) { Con_Printf("JPEG_LoadImage: invalid image size %ix%i\n", image_width, image_height); return NULL; } - image_rgba = Mem_Alloc(tempmempool, image_width * image_height * 4); - scanline = Mem_Alloc(tempmempool, image_width * cinfo.output_components); - if (!image_rgba || !scanline) + image_buffer = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4); + scanline = (unsigned char *)Mem_Alloc(tempmempool, image_width * cinfo.output_components); + if (!image_buffer || !scanline) { - if (!image_rgba) - Mem_Free (image_rgba); + if (image_buffer) + Mem_Free (image_buffer); + if (scanline) + Mem_Free (scanline); Con_Printf("JPEG_LoadImage: not enough memory for %i by %i image\n", image_width, image_height); qjpeg_finish_decompress (&cinfo); @@ -543,22 +601,22 @@ qbyte* JPEG_LoadImage (qbyte *f, int matchwidth, int matchheight) line = 0; while (cinfo.output_scanline < cinfo.output_height) { - qbyte *buffer_ptr; + unsigned char *buffer_ptr; int ind; qjpeg_read_scanlines (&cinfo, &scanline, 1); - // Convert the image to RGBA + // Convert the image to BGRA switch (cinfo.output_components) { // RGB images case 3: - buffer_ptr = &image_rgba[image_width * line * 4]; + buffer_ptr = &image_buffer[image_width * line * 4]; for (ind = 0; ind < image_width * 3; ind += 3, buffer_ptr += 4) { - buffer_ptr[0] = scanline[ind]; + buffer_ptr[2] = scanline[ind]; buffer_ptr[1] = scanline[ind + 1]; - buffer_ptr[2] = scanline[ind + 2]; + buffer_ptr[0] = scanline[ind + 2]; buffer_ptr[3] = 255; } break; @@ -566,7 +624,7 @@ qbyte* JPEG_LoadImage (qbyte *f, int matchwidth, int matchheight) // Greyscale images (default to it, just in case) case 1: default: - buffer_ptr = &image_rgba[image_width * line * 4]; + buffer_ptr = &image_buffer[image_width * line * 4]; for (ind = 0; ind < image_width; ind++, buffer_ptr += 4) { buffer_ptr[0] = scanline[ind]; @@ -583,7 +641,7 @@ qbyte* JPEG_LoadImage (qbyte *f, int matchwidth, int matchheight) qjpeg_finish_decompress (&cinfo); qjpeg_destroy_decompress (&cinfo); - return image_rgba; + return image_buffer; } @@ -599,7 +657,7 @@ qbyte* JPEG_LoadImage (qbyte *f, int matchwidth, int matchheight) static void JPEG_InitDestination (j_compress_ptr cinfo) { my_dest_ptr dest = (my_dest_ptr)cinfo->dest; - dest->buffer = (qbyte*)cinfo->mem->alloc_small ((j_common_ptr) cinfo, JPOOL_IMAGE, JPEG_OUTPUT_BUF_SIZE * sizeof(qbyte)); + dest->buffer = (unsigned char*)cinfo->mem->alloc_small ((j_common_ptr) cinfo, JPOOL_IMAGE, JPEG_OUTPUT_BUF_SIZE * sizeof(unsigned char)); dest->pub.next_output_byte = dest->buffer; dest->pub.free_in_buffer = JPEG_OUTPUT_BUF_SIZE; } @@ -626,7 +684,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) != datacount) + if (FS_Write (dest->outfile, dest->buffer, datacount) != (fs_offset_t)datacount) error_in_jpeg = true; } @@ -653,11 +711,11 @@ JPEG_SaveImage_preflipped Save a preflipped JPEG image to a file ==================== */ -qboolean JPEG_SaveImage_preflipped (const char *filename, int width, int height, qbyte *data) +qboolean JPEG_SaveImage_preflipped (const char *filename, int width, int height, unsigned char *data) { struct jpeg_compress_struct cinfo; struct jpeg_error_mgr jerr; - qbyte *scanline; + unsigned char *scanline; unsigned int offset, linesize; qfile_t* file; @@ -669,7 +727,7 @@ qboolean JPEG_SaveImage_preflipped (const char *filename, int width, int height, } // Open the file - file = FS_Open (filename, "wb", true); + file = FS_Open (filename, "wb", true, false); if (!file) return false; @@ -686,7 +744,17 @@ 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, scr_screenshot_jpeg_quality.value * 100, TRUE); + qjpeg_set_quality (&cinfo, (int)(scr_screenshot_jpeg_quality.value * 100), TRUE); + + // turn off subsampling (to make text look better) + cinfo.optimize_coding = 1; + cinfo.comp_info[0].h_samp_factor = 1; + cinfo.comp_info[0].v_samp_factor = 1; + cinfo.comp_info[1].h_samp_factor = 1; + cinfo.comp_info[1].v_samp_factor = 1; + cinfo.comp_info[2].h_samp_factor = 1; + cinfo.comp_info[2].v_samp_factor = 1; + qjpeg_start_compress (&cinfo, true); // Compress each scanline