jdhuff.c - Issue 1939823002: Update to libjpeg_turbo 1.4.90

Unified Diff: jdhuff.c

Issue 1939823002: Update to libjpeg_turbo 1.4.90 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@master

Patch Set: Response to comments Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: jdhuff.c

diff --git a/jdhuff.c b/jdhuff.c

index e98dc52befaae1f3d56e90a913b2d009b927c9dd..3c6fdaf184de0a092b45f8c4b23b8557a7f1e24c 100644

--- a/jdhuff.c

+++ b/jdhuff.c

@@ -4,8 +4,9 @@

* This file was part of the Independent JPEG Group's software:

* libjpeg-turbo Modifications:

- * For conditions of distribution and use, see the accompanying README file.

+ * For conditions of distribution and use, see the accompanying README.ijg

+ * file.

* This file contains Huffman entropy decoding routines.

@@ -19,8 +20,9 @@

#define JPEG_INTERNALS

#include "jinclude.h"

#include "jpeglib.h"

-#include "jdhuff.h" /* Declarations shared with jdphuff.c */

+#include "jdhuff.h" /* Declarations shared with jdphuff.c */

#include "jpegcomp.h"

+#include "jstdhuff.c"

@@ -44,10 +46,10 @@ typedef struct {

#else

#if MAX_COMPS_IN_SCAN == 4

#define ASSIGN_STATE(dest,src) \

- ((dest).last_dc_val[0] = (src).last_dc_val[0], \

- (dest).last_dc_val[1] = (src).last_dc_val[1], \

- (dest).last_dc_val[2] = (src).last_dc_val[2], \

- (dest).last_dc_val[3] = (src).last_dc_val[3])

+ ((dest).last_dc_val[0] = (src).last_dc_val[0], \

+ (dest).last_dc_val[1] = (src).last_dc_val[1], \

+ (dest).last_dc_val[2] = (src).last_dc_val[2], \

+ (dest).last_dc_val[3] = (src).last_dc_val[3])

#endif

@@ -58,27 +60,27 @@ typedef struct {

/* These fields are loaded into local variables at start of each MCU.

* In case of suspension, we exit WITHOUT updating them.

- bitread_perm_state bitstate; /* Bit buffer at start of MCU */

- savable_state saved; /* Other state at start of MCU */

+ bitread_perm_state bitstate; /* Bit buffer at start of MCU */

+ savable_state saved; /* Other state at start of MCU */

/* These fields are NOT loaded into local working state. */

- unsigned int restarts_to_go; /* MCUs left in this restart interval */

+ unsigned int restarts_to_go; /* MCUs left in this restart interval */

/* Pointers to derived tables (these workspaces have image lifespan) */

- d_derived_tbl * dc_derived_tbls[NUM_HUFF_TBLS];

- d_derived_tbl * ac_derived_tbls[NUM_HUFF_TBLS];

+ d_derived_tbl *dc_derived_tbls[NUM_HUFF_TBLS];

+ d_derived_tbl *ac_derived_tbls[NUM_HUFF_TBLS];

/* Precalculated info set up by start_pass for use in decode_mcu: */

/* Pointers to derived tables to be used for each block within an MCU */

- d_derived_tbl * dc_cur_tbls[D_MAX_BLOCKS_IN_MCU];

- d_derived_tbl * ac_cur_tbls[D_MAX_BLOCKS_IN_MCU];

+ d_derived_tbl *dc_cur_tbls[D_MAX_BLOCKS_IN_MCU];

+ d_derived_tbl *ac_cur_tbls[D_MAX_BLOCKS_IN_MCU];

/* Whether we care about the DC and AC coefficient values for each block */

boolean dc_needed[D_MAX_BLOCKS_IN_MCU];

boolean ac_needed[D_MAX_BLOCKS_IN_MCU];

} huff_entropy_decoder;

-typedef huff_entropy_decoder * huff_entropy_ptr;

+typedef huff_entropy_decoder *huff_entropy_ptr;

@@ -90,7 +92,8 @@ start_pass_huff_decoder (j_decompress_ptr cinfo)

{

huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;

int ci, blkn, dctbl, actbl;

- jpeg_component_info * compptr;

+ d_derived_tbl **pdtbl;

+ jpeg_component_info *compptr;

/* Check that the scan parameters Ss, Se, Ah/Al are OK for sequential JPEG.

* This ought to be an error condition, but we make it a warning because

@@ -106,10 +109,10 @@ start_pass_huff_decoder (j_decompress_ptr cinfo)

actbl = compptr->ac_tbl_no;

/* Compute derived values for Huffman tables */

/* We may do this more than once for a table, but it's not expensive */

- jpeg_make_d_derived_tbl(cinfo, TRUE, dctbl,

- & entropy->dc_derived_tbls[dctbl]);

- jpeg_make_d_derived_tbl(cinfo, FALSE, actbl,

- & entropy->ac_derived_tbls[actbl]);

+ pdtbl = entropy->dc_derived_tbls + dctbl;

+ jpeg_make_d_derived_tbl(cinfo, TRUE, dctbl, pdtbl);

+ pdtbl = entropy->ac_derived_tbls + actbl;

+ jpeg_make_d_derived_tbl(cinfo, FALSE, actbl, pdtbl);

/* Initialize DC predictions to 0 */

entropy->saved.last_dc_val[ci] = 0;

}

@@ -150,7 +153,7 @@ start_pass_huff_decoder (j_decompress_ptr cinfo)

GLOBAL(void)

jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno,

- d_derived_tbl ** pdtbl)

+ d_derived_tbl **pdtbl)

{

JHUFF_TBL *htbl;

d_derived_tbl *dtbl;

@@ -176,26 +179,26 @@ jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno,

if (*pdtbl == NULL)

*pdtbl = (d_derived_tbl *)

(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

- SIZEOF(d_derived_tbl));

+ sizeof(d_derived_tbl));

dtbl = *pdtbl;

- dtbl->pub = htbl; /* fill in back link */

+ dtbl->pub = htbl; /* fill in back link */

/* Figure C.1: make table of Huffman code length for each symbol */

p = 0;

for (l = 1; l <= 16; l++) {

i = (int) htbl->bits[l];

- if (i < 0 || p + i > 256) /* protect against table overrun */

+ if (i < 0 || p + i > 256) /* protect against table overrun */

ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);

while (i--)

huffsize[p++] = (char) l;

}

huffsize[p] = 0;

numsymbols = p;

/* Figure C.2: generate the codes themselves */

/* We also validate that the counts represent a legal Huffman code tree. */

code = 0;

si = huffsize[0];

p = 0;

@@ -207,7 +210,7 @@ jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno,

/* code is now 1 more than the last code used for codelength si; but

* it must still fit in si bits, since no code is allowed to be all ones.

- if (((INT32) code) >= (((INT32) 1) << si))

+ if (((JLONG) code) >= (((JLONG) 1) << si))

ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);

code <<= 1;

si++;

@@ -221,11 +224,11 @@ jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno,

/* valoffset[l] = huffval[] index of 1st symbol of code length l,

* minus the minimum code of length l

- dtbl->valoffset[l] = (INT32) p - (INT32) huffcode[p];

+ dtbl->valoffset[l] = (JLONG) p - (JLONG) huffcode[p];

p += htbl->bits[l];

dtbl->maxcode[l] = huffcode[p-1]; /* maximum code of length l */

} else {

- dtbl->maxcode[l] = -1; /* -1 if no codes of this length */

+ dtbl->maxcode[l] = -1; /* -1 if no codes of this length */

}

dtbl->valoffset[17] = 0;

@@ -248,8 +251,8 @@ jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno,

/* Generate left-justified code followed by all possible bit sequences */

lookbits = huffcode[p] << (HUFF_LOOKAHEAD-l);

for (ctr = 1 << (HUFF_LOOKAHEAD-l); ctr > 0; ctr--) {

- dtbl->lookup[lookbits] = (l << HUFF_LOOKAHEAD) | htbl->huffval[p];

- lookbits++;

+ dtbl->lookup[lookbits] = (l << HUFF_LOOKAHEAD) | htbl->huffval[p];

+ lookbits++;

}

@@ -264,7 +267,7 @@ jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno,

for (i = 0; i < numsymbols; i++) {

int sym = htbl->huffval[i];

if (sym < 0 || sym > 15)

- ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);

+ ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);

}

@@ -286,20 +289,20 @@ jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno,

#ifdef SLOW_SHIFT_32

-#define MIN_GET_BITS 15 /* minimum allowable value */

+#define MIN_GET_BITS 15 /* minimum allowable value */

#else

#define MIN_GET_BITS (BIT_BUF_SIZE-7)

#endif

GLOBAL(boolean)

-jpeg_fill_bit_buffer (bitread_working_state * state,

- register bit_buf_type get_buffer, register int bits_left,

- int nbits)

+jpeg_fill_bit_buffer (bitread_working_state *state,

+ register bit_buf_type get_buffer, register int bits_left,

+ int nbits)

/* Load up the bit buffer to a depth of at least nbits */

{

/* Copy heavily used state fields into locals (hopefully registers) */

- register const JOCTET * next_input_byte = state->next_input_byte;

+ register const JOCTET *next_input_byte = state->next_input_byte;

j_decompress_ptr cinfo = state->cinfo;

@@ -307,54 +310,54 @@ jpeg_fill_bit_buffer (bitread_working_state * state,

/* (It is assumed that no request will be for more than that many bits.) */

/* We fail to do so only if we hit a marker or are forced to suspend. */

- if (cinfo->unread_marker == 0) { /* cannot advance past a marker */

+ if (cinfo->unread_marker == 0) { /* cannot advance past a marker */

while (bits_left < MIN_GET_BITS) {

/* Attempt to read a byte */

if (bytes_in_buffer == 0) {

- if (! (*cinfo->src->fill_input_buffer) (cinfo))

- return FALSE;

- next_input_byte = cinfo->src->next_input_byte;

- bytes_in_buffer = cinfo->src->bytes_in_buffer;

+ if (! (*cinfo->src->fill_input_buffer) (cinfo))

+ return FALSE;

+ next_input_byte = cinfo->src->next_input_byte;

+ bytes_in_buffer = cinfo->src->bytes_in_buffer;

}

bytes_in_buffer--;

c = GETJOCTET(*next_input_byte++);

/* If it's 0xFF, check and discard stuffed zero byte */

if (c == 0xFF) {

- /* Loop here to discard any padding FF's on terminating marker,

- * so that we can save a valid unread_marker value. NOTE: we will

- * accept multiple FF's followed by a 0 as meaning a single FF data

- * byte. This data pattern is not valid according to the standard.

- */

- do {

- if (bytes_in_buffer == 0) {

- if (! (*cinfo->src->fill_input_buffer) (cinfo))

- return FALSE;

- next_input_byte = cinfo->src->next_input_byte;

- bytes_in_buffer = cinfo->src->bytes_in_buffer;

- }

- bytes_in_buffer--;

- c = GETJOCTET(*next_input_byte++);

- } while (c == 0xFF);

- if (c == 0) {

- /* Found FF/00, which represents an FF data byte */

- c = 0xFF;

- } else {

- /* Oops, it's actually a marker indicating end of compressed data.

- * Save the marker code for later use.

- * Fine point: it might appear that we should save the marker into

- * bitread working state, not straight into permanent state. But

- * once we have hit a marker, we cannot need to suspend within the

- * current MCU, because we will read no more bytes from the data

- * source. So it is OK to update permanent state right away.

- */

- cinfo->unread_marker = c;

- /* See if we need to insert some fake zero bits. */

- goto no_more_bytes;

- }

+ /* Loop here to discard any padding FF's on terminating marker,

+ * so that we can save a valid unread_marker value. NOTE: we will

+ * accept multiple FF's followed by a 0 as meaning a single FF data

+ * byte. This data pattern is not valid according to the standard.

+ */

+ do {

+ if (bytes_in_buffer == 0) {

+ if (! (*cinfo->src->fill_input_buffer) (cinfo))

+ return FALSE;

+ next_input_byte = cinfo->src->next_input_byte;

+ bytes_in_buffer = cinfo->src->bytes_in_buffer;

+ }

+ bytes_in_buffer--;

+ c = GETJOCTET(*next_input_byte++);

+ } while (c == 0xFF);

+ if (c == 0) {

+ /* Found FF/00, which represents an FF data byte */

+ c = 0xFF;

+ } else {

+ /* Oops, it's actually a marker indicating end of compressed data.

+ * Save the marker code for later use.

+ * Fine point: it might appear that we should save the marker into

+ * bitread working state, not straight into permanent state. But

+ * once we have hit a marker, we cannot need to suspend within the

+ * current MCU, because we will read no more bytes from the data

+ * source. So it is OK to update permanent state right away.

+ */

+ cinfo->unread_marker = c;

+ /* See if we need to insert some fake zero bits. */

+ goto no_more_bytes;

+ }

}

/* OK, load c into get_buffer */

@@ -374,8 +377,8 @@ jpeg_fill_bit_buffer (bitread_working_state * state,

* appears per data segment.

if (! cinfo->entropy->insufficient_data) {

- WARNMS(cinfo, JWRN_HIT_MARKER);

- cinfo->entropy->insufficient_data = TRUE;

+ WARNMS(cinfo, JWRN_HIT_MARKER);

+ cinfo->entropy->insufficient_data = TRUE;

}

/* Fill the buffer with zero bits */

get_buffer <<= MIN_GET_BITS - bits_left;

@@ -418,11 +421,11 @@ jpeg_fill_bit_buffer (bitread_working_state * state,

} \

}

-#if __WORDSIZE == 64 || defined(_WIN64)

+#if SIZEOF_SIZE_T==8 || defined(_WIN64)

/* Pre-fetch 48 bytes, because the holding register is 64-bit */

#define FILL_BIT_BUFFER_FAST \

- if (bits_left < 16) { \

+ if (bits_left <= 16) { \

GET_BYTE GET_BYTE GET_BYTE GET_BYTE GET_BYTE GET_BYTE \

}

@@ -430,7 +433,7 @@ jpeg_fill_bit_buffer (bitread_working_state * state,

/* Pre-fetch 16 bytes, because the holding register is 32-bit */

#define FILL_BIT_BUFFER_FAST \

- if (bits_left < 16) { \

+ if (bits_left <= 16) { \

GET_BYTE GET_BYTE \

}

@@ -443,12 +446,12 @@ jpeg_fill_bit_buffer (bitread_working_state * state,

GLOBAL(int)

-jpeg_huff_decode (bitread_working_state * state,

- register bit_buf_type get_buffer, register int bits_left,

- d_derived_tbl * htbl, int min_bits)

+jpeg_huff_decode (bitread_working_state *state,

+ register bit_buf_type get_buffer, register int bits_left,

+ d_derived_tbl *htbl, int min_bits)

{

- register INT32 code;

+ register JLONG code;

/* HUFF_DECODE has determined that the code is at least min_bits */

/* bits long, so fetch that many bits in one swoop. */

@@ -474,7 +477,7 @@ jpeg_huff_decode (bitread_working_state * state,

if (l > 16) {

WARNMS(state->cinfo, JWRN_HUFF_BAD_CODE);

- return 0; /* fake a zero as the safest result */

+ return 0; /* fake a zero as the safest result */

}

return htbl->pub->huffval[ (int) (code + htbl->valoffset[l]) ];

@@ -489,7 +492,8 @@ jpeg_huff_decode (bitread_working_state * state,

#define AVOID_TABLES

#ifdef AVOID_TABLES

-#define HUFF_EXTEND(x,s) ((x) + ((((x) - (1<<((s)-1))) >> 31) & (((-1)<<(s)) + 1)))

+#define NEG_1 ((unsigned int)-1)

+#define HUFF_EXTEND(x,s) ((x) + ((((x) - (1<<((s)-1))) >> 31) & (((NEG_1)<<(s)) + 1)))

#else

@@ -562,8 +566,8 @@ decode_mcu_slow (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)

for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {

JBLOCKROW block = MCU_data ? MCU_data[blkn] : NULL;

- d_derived_tbl * dctbl = entropy->dc_cur_tbls[blkn];

- d_derived_tbl * actbl = entropy->ac_cur_tbls[blkn];

+ d_derived_tbl *dctbl = entropy->dc_cur_tbls[blkn];

+ d_derived_tbl *actbl = entropy->ac_cur_tbls[blkn];

/* Decode a single block's worth of coefficients */

@@ -596,7 +600,7 @@ decode_mcu_slow (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)

r = s >> 4;

s &= 15;

if (s) {

k += r;

CHECK_BIT_BUFFER(br_state, s, return FALSE);

@@ -661,8 +665,8 @@ decode_mcu_fast (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)

for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {

JBLOCKROW block = MCU_data ? MCU_data[blkn] : NULL;

- d_derived_tbl * dctbl = entropy->dc_cur_tbls[blkn];

- d_derived_tbl * actbl = entropy->ac_cur_tbls[blkn];

+ d_derived_tbl *dctbl = entropy->dc_cur_tbls[blkn];

+ d_derived_tbl *actbl = entropy->ac_cur_tbls[blkn];

HUFF_DECODE_FAST(s, l, dctbl, slow_decode_mcu);

@@ -686,7 +690,7 @@ decode_mcu_fast (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)

HUFF_DECODE_FAST(s, l, actbl, slow_decode_mcu);

r = s >> 4;

Noel Gordon 2016/05/04 15:53:35 slow_decode_mcu looks good.

s &= 15;

if (s) {

k += r;

FILL_BIT_BUFFER_FAST

@@ -747,7 +751,7 @@ slow_decode_mcu:

* this module, since we'll just re-assign them on the next call.)

-#define BUFSIZE (DCTSIZE2 * 2u)

+#define BUFSIZE (DCTSIZE2 * 8)

METHODDEF(boolean)

decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)

@@ -759,7 +763,7 @@ decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)

if (cinfo->restart_interval) {

if (entropy->restarts_to_go == 0)

if (! process_restart(cinfo))

- return FALSE;

+ return FALSE;

usefast = 0;

}

@@ -799,9 +803,15 @@ jinit_huff_decoder (j_decompress_ptr cinfo)

huff_entropy_ptr entropy;

int i;

+ /* Motion JPEG frames typically do not include the Huffman tables if they

+ are the default tables. Thus, if the tables are not set by the time

+ the Huffman decoder is initialized (usually within the body of

+ jpeg_start_decompress()), we set them to default values. */

+ std_huff_tables((j_common_ptr) cinfo);

entropy = (huff_entropy_ptr)

(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

- SIZEOF(huff_entropy_decoder));

+ sizeof(huff_entropy_decoder));

cinfo->entropy = (struct jpeg_entropy_decoder *) entropy;

entropy->pub.start_pass = start_pass_huff_decoder;

entropy->pub.decode_mcu = decode_mcu;

« jdhuff.h ('K') | « jdhuff.h ('k') | jdinput.c » ('j') | no next file with comments »