mirror of
https://github.com/libjpeg-turbo/libjpeg-turbo.git
synced 2026-01-18 21:41:20 +01:00
- Rename jpeg_simple_lossless() to jpeg_enable_lossless() and modify the
function so that it stores the lossless parameters directly in the Ss
and Al fields of jpeg_compress_struct rather than using a scan script.
- Move the cjpeg -lossless switch into "Switches for advanced users".
- Document the libjpeg API and run-time features that are unavailable in
lossless mode, and ensure that all parameters, functions, and switches
related to unavailable features are ignored or generate errors in
lossless mode.
- Defer any action that depends on whether lossless mode is enabled
until jpeg_start_compress()/jpeg_start_decompress() is called.
- Document the purpose of the point transform value.
- "Codec" stands for coder/decoder, so it is a bit awkward to say
"lossless compression codec" and "lossless decompression codec".
Use "lossless compressor" and "lossless decompressor" instead.
- Restore backward API/ABI compatibility with libjpeg v6b:
* Move the new 'lossless' field from the exposed jpeg_compress_struct
and jpeg_decompress_struct structures into the opaque
jpeg_comp_master and jpeg_decomp_master structures, and allocate the
master structures in the body of jpeg_create_compress() and
jpeg_create_decompress().
* Remove the new 'process' field from jpeg_compress_struct and
jpeg_decompress_struct and replace it with the old
'progressive_mode' field and the new 'lossless' field.
* Remove the new 'data_unit' field from jpeg_compress_struct and
jpeg_decompress_struct and replace it with a locally-computed
data unit variable.
* Restore the names of macros and fields that refer to DCT blocks, and
document that they have a different meaning in lossless mode. (Most
of them aren't very meaningful in lossless mode anyhow.)
* Remove the new alloc_darray() method from jpeg_memory_mgr and
replace it with an internal macro that wraps the alloc_sarray()
method.
* Move the JDIFF* data types from jpeglib.h and jmorecfg.h into
jpegint.h.
* Remove the new 'codec' field from jpeg_compress_struct and
jpeg_decompress_struct and instead reuse the existing internal
coefficient control, forward/inverse DCT, and entropy
encoding/decoding structures for lossless compression/decompression.
* Repurpose existing error codes rather than introducing new ones.
(The new JERR_BAD_RESTART and JWRN_MUST_DOWNSCALE codes remain,
although JWRN_MUST_DOWNSCALE will probably be removed in
libjpeg-turbo, since we have a different way of handling multiple
data precisions.)
- Automatically enable lossless mode when a scan script with parameters
that are only valid for lossless mode is detected, and document the
use of scan scripts to generate lossless JPEG images.
- Move the sequential and shared Huffman routines back into jchuff.c and
jdhuff.c, and document that those routines are shared with jclhuff.c
and jdlhuff.c as well as with jcphuff.c and jdphuff.c.
- Move MAX_DIFF_BITS from jchuff.h into jclhuff.c, the only place where
it is used.
- Move the predictor and scaler code into jclossls.c and jdlossls.c.
- Streamline register usage in the [un]differencers (inspired by similar
optimizations in the color [de]converters.)
- Restructure the logic in a few places to reduce duplicated code.
- Ensure that all lossless-specific code is guarded by
C_LOSSLESS_SUPPORTED or D_LOSSLESS_SUPPORTED and that the library can
be built successfully if either or both of those macros is undefined.
- Remove all short forms of external names introduced by the lossless
JPEG patch. (These will not be needed by libjpeg-turbo, so there is
no use cleaning them up.)
- Various wordsmithing, formatting, and punctuation tweaks
- Eliminate various compiler warnings.
318 lines
8.4 KiB
C
318 lines
8.4 KiB
C
/*
|
|
* jclossls.c
|
|
*
|
|
* This file was part of the Independent JPEG Group's software:
|
|
* Copyright (C) 1998, Thomas G. Lane.
|
|
* Lossless JPEG Modifications:
|
|
* Copyright (C) 1999, Ken Murchison.
|
|
* Copyright (C) 2022, D. R. Commander.
|
|
* For conditions of distribution and use, see the accompanying README file.
|
|
*
|
|
* This file contains prediction, sample differencing, and point transform
|
|
* routines for the lossless JPEG compressor.
|
|
*/
|
|
|
|
#define JPEG_INTERNALS
|
|
#include "jinclude.h"
|
|
#include "jpeglib.h"
|
|
#include "jlossls.h"
|
|
|
|
#ifdef C_LOSSLESS_SUPPORTED
|
|
|
|
|
|
/************************** Sample differencing **************************/
|
|
|
|
/*
|
|
* In order to avoid a performance penalty for checking which predictor is
|
|
* being used and which row is being processed for each call of the
|
|
* undifferencer, and to promote optimization, we have separate differencing
|
|
* functions for each predictor selection value.
|
|
*
|
|
* We are able to avoid duplicating source code by implementing the predictors
|
|
* and differencers as macros. Each of the differencing functions is simply a
|
|
* wrapper around a DIFFERENCE macro with the appropriate PREDICTOR macro
|
|
* passed as an argument.
|
|
*/
|
|
|
|
/* Forward declarations */
|
|
LOCAL(void) reset_predictor JPP((j_compress_ptr cinfo, int ci));
|
|
|
|
|
|
/* Predictor for the first column of the first row: 2^(P-Pt-1) */
|
|
#define INITIAL_PREDICTORx (1 << (cinfo->data_precision - cinfo->Al - 1))
|
|
|
|
/* Predictor for the first column of the remaining rows: Rb */
|
|
#define INITIAL_PREDICTOR2 GETJSAMPLE(prev_row[0])
|
|
|
|
|
|
/*
|
|
* 1-Dimensional differencer routine.
|
|
*
|
|
* This macro implements the 1-D horizontal predictor (1). INITIAL_PREDICTOR
|
|
* is used as the special case predictor for the first column, which must be
|
|
* either INITIAL_PREDICTOR2 or INITIAL_PREDICTORx. The remaining samples
|
|
* use PREDICTOR1.
|
|
*/
|
|
|
|
#define DIFFERENCE_1D(INITIAL_PREDICTOR) \
|
|
lossless_comp_ptr losslessc = (lossless_comp_ptr) cinfo->fdct; \
|
|
boolean restart = FALSE; \
|
|
int samp, Ra; \
|
|
\
|
|
samp = GETJSAMPLE(*input_buf++); \
|
|
*diff_buf++ = samp - INITIAL_PREDICTOR; \
|
|
\
|
|
while (--width) { \
|
|
Ra = samp; \
|
|
samp = GETJSAMPLE(*input_buf++); \
|
|
*diff_buf++ = samp - PREDICTOR1; \
|
|
} \
|
|
\
|
|
/* Account for restart interval (no-op if not using restarts) */ \
|
|
if (cinfo->restart_interval) { \
|
|
if (--(losslessc->restart_rows_to_go[ci]) == 0) { \
|
|
reset_predictor(cinfo, ci); \
|
|
restart = TRUE; \
|
|
} \
|
|
}
|
|
|
|
|
|
/*
|
|
* 2-Dimensional differencer routine.
|
|
*
|
|
* This macro implements the 2-D horizontal predictors (#2-7). PREDICTOR2 is
|
|
* used as the special case predictor for the first column. The remaining
|
|
* samples use PREDICTOR, which is a function of Ra, Rb, and Rc.
|
|
*
|
|
* Because prev_row and output_buf may point to the same storage area (in an
|
|
* interleaved image with Vi=1, for example), we must take care to buffer Rb/Rc
|
|
* before writing the current reconstructed sample value into output_buf.
|
|
*/
|
|
|
|
#define DIFFERENCE_2D(PREDICTOR) \
|
|
lossless_comp_ptr losslessc = (lossless_comp_ptr) cinfo->fdct; \
|
|
int samp, Ra, Rb, Rc; \
|
|
\
|
|
Rb = GETJSAMPLE(*prev_row++); \
|
|
samp = GETJSAMPLE(*input_buf++); \
|
|
*diff_buf++ = samp - PREDICTOR2; \
|
|
\
|
|
while (--width) { \
|
|
Rc = Rb; \
|
|
Rb = GETJSAMPLE(*prev_row++); \
|
|
Ra = samp; \
|
|
samp = GETJSAMPLE(*input_buf++); \
|
|
*diff_buf++ = samp - PREDICTOR; \
|
|
} \
|
|
\
|
|
/* Account for restart interval (no-op if not using restarts) */ \
|
|
if (cinfo->restart_interval) { \
|
|
if (--losslessc->restart_rows_to_go[ci] == 0) \
|
|
reset_predictor(cinfo, ci); \
|
|
}
|
|
|
|
|
|
/*
|
|
* Differencers for the second and subsequent rows in a scan or restart
|
|
* interval. The first sample in the row is differenced using the vertical
|
|
* predictor (2). The rest of the samples are differenced using the predictor
|
|
* specified in the scan header.
|
|
*/
|
|
|
|
METHODDEF(void)
|
|
jpeg_difference1(j_compress_ptr cinfo, int ci,
|
|
JSAMPROW input_buf, JSAMPROW prev_row,
|
|
JDIFFROW diff_buf, JDIMENSION width)
|
|
{
|
|
DIFFERENCE_1D(INITIAL_PREDICTOR2);
|
|
(void)(restart);
|
|
}
|
|
|
|
METHODDEF(void)
|
|
jpeg_difference2(j_compress_ptr cinfo, int ci,
|
|
JSAMPROW input_buf, JSAMPROW prev_row,
|
|
JDIFFROW diff_buf, JDIMENSION width)
|
|
{
|
|
DIFFERENCE_2D(PREDICTOR2);
|
|
(void)(Ra);
|
|
(void)(Rc);
|
|
}
|
|
|
|
METHODDEF(void)
|
|
jpeg_difference3(j_compress_ptr cinfo, int ci,
|
|
JSAMPROW input_buf, JSAMPROW prev_row,
|
|
JDIFFROW diff_buf, JDIMENSION width)
|
|
{
|
|
DIFFERENCE_2D(PREDICTOR3);
|
|
(void)(Ra);
|
|
}
|
|
|
|
METHODDEF(void)
|
|
jpeg_difference4(j_compress_ptr cinfo, int ci,
|
|
JSAMPROW input_buf, JSAMPROW prev_row,
|
|
JDIFFROW diff_buf, JDIMENSION width)
|
|
{
|
|
DIFFERENCE_2D(PREDICTOR4);
|
|
}
|
|
|
|
METHODDEF(void)
|
|
jpeg_difference5(j_compress_ptr cinfo, int ci,
|
|
JSAMPROW input_buf, JSAMPROW prev_row,
|
|
JDIFFROW diff_buf, JDIMENSION width)
|
|
{
|
|
DIFFERENCE_2D(PREDICTOR5);
|
|
}
|
|
|
|
METHODDEF(void)
|
|
jpeg_difference6(j_compress_ptr cinfo, int ci,
|
|
JSAMPROW input_buf, JSAMPROW prev_row,
|
|
JDIFFROW diff_buf, JDIMENSION width)
|
|
{
|
|
DIFFERENCE_2D(PREDICTOR6);
|
|
}
|
|
|
|
METHODDEF(void)
|
|
jpeg_difference7(j_compress_ptr cinfo, int ci,
|
|
JSAMPROW input_buf, JSAMPROW prev_row,
|
|
JDIFFROW diff_buf, JDIMENSION width)
|
|
{
|
|
DIFFERENCE_2D(PREDICTOR7);
|
|
(void)(Rc);
|
|
}
|
|
|
|
|
|
/*
|
|
* Differencer for the first row in a scan or restart interval. The first
|
|
* sample in the row is differenced using the special predictor constant
|
|
* x=2^(P-Pt-1). The rest of the samples are differenced using the
|
|
* 1-D horizontal predictor (1).
|
|
*/
|
|
|
|
METHODDEF(void)
|
|
jpeg_difference_first_row(j_compress_ptr cinfo, int ci,
|
|
JSAMPROW input_buf, JSAMPROW prev_row,
|
|
JDIFFROW diff_buf, JDIMENSION width)
|
|
{
|
|
DIFFERENCE_1D(INITIAL_PREDICTORx);
|
|
|
|
/*
|
|
* Now that we have differenced the first row, we want to use the
|
|
* differencer that corresponds to the predictor specified in the
|
|
* scan header.
|
|
*
|
|
* Note that we don't do this if we have just reset the predictor
|
|
* for a new restart interval.
|
|
*/
|
|
if (! restart) {
|
|
switch (cinfo->Ss) {
|
|
case 1:
|
|
losslessc->predict_difference[ci] = jpeg_difference1;
|
|
break;
|
|
case 2:
|
|
losslessc->predict_difference[ci] = jpeg_difference2;
|
|
break;
|
|
case 3:
|
|
losslessc->predict_difference[ci] = jpeg_difference3;
|
|
break;
|
|
case 4:
|
|
losslessc->predict_difference[ci] = jpeg_difference4;
|
|
break;
|
|
case 5:
|
|
losslessc->predict_difference[ci] = jpeg_difference5;
|
|
break;
|
|
case 6:
|
|
losslessc->predict_difference[ci] = jpeg_difference6;
|
|
break;
|
|
case 7:
|
|
losslessc->predict_difference[ci] = jpeg_difference7;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Reset predictor at the start of a pass or restart interval.
|
|
*/
|
|
|
|
LOCAL(void)
|
|
reset_predictor (j_compress_ptr cinfo, int ci)
|
|
{
|
|
lossless_comp_ptr losslessc = (lossless_comp_ptr) cinfo->fdct;
|
|
|
|
/* Initialize restart counter */
|
|
losslessc->restart_rows_to_go[ci] =
|
|
cinfo->restart_interval / cinfo->MCUs_per_row;
|
|
|
|
/* Set difference function to first row function */
|
|
losslessc->predict_difference[ci] = jpeg_difference_first_row;
|
|
}
|
|
|
|
|
|
/********************** Sample downscaling by 2^Pt ***********************/
|
|
|
|
METHODDEF(void)
|
|
simple_downscale(j_compress_ptr cinfo,
|
|
JSAMPROW input_buf, JSAMPROW output_buf, JDIMENSION width)
|
|
{
|
|
while (width--)
|
|
*output_buf++ = (JSAMPLE) RIGHT_SHIFT(GETJSAMPLE(*input_buf++), cinfo->Al);
|
|
}
|
|
|
|
|
|
METHODDEF(void)
|
|
noscale(j_compress_ptr cinfo,
|
|
JSAMPROW input_buf, JSAMPROW output_buf, JDIMENSION width)
|
|
{
|
|
MEMCOPY(output_buf, input_buf, width * SIZEOF(JSAMPLE));
|
|
return;
|
|
}
|
|
|
|
|
|
/*
|
|
* Initialize for a processing pass.
|
|
*/
|
|
|
|
METHODDEF(void)
|
|
start_pass_lossless (j_compress_ptr cinfo)
|
|
{
|
|
lossless_comp_ptr losslessc = (lossless_comp_ptr) cinfo->fdct;
|
|
int ci;
|
|
|
|
/* Set scaler function based on Pt */
|
|
if (cinfo->Al)
|
|
losslessc->scaler_scale = simple_downscale;
|
|
else
|
|
losslessc->scaler_scale = noscale;
|
|
|
|
/* Check that the restart interval is an integer multiple of the number
|
|
* of MCUs in an MCU row.
|
|
*/
|
|
if (cinfo->restart_interval % cinfo->MCUs_per_row != 0)
|
|
ERREXIT2(cinfo, JERR_BAD_RESTART,
|
|
cinfo->restart_interval, cinfo->MCUs_per_row);
|
|
|
|
/* Set predictors for start of pass */
|
|
for (ci = 0; ci < cinfo->num_components; ci++)
|
|
reset_predictor(cinfo, ci);
|
|
}
|
|
|
|
|
|
/*
|
|
* Initialize the lossless compressor.
|
|
*/
|
|
|
|
GLOBAL(void)
|
|
jinit_lossless_compressor(j_compress_ptr cinfo)
|
|
{
|
|
lossless_comp_ptr losslessc;
|
|
|
|
/* Create subobject in permanent pool */
|
|
losslessc = (lossless_comp_ptr)
|
|
(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
|
|
SIZEOF(jpeg_lossless_compressor));
|
|
cinfo->fdct = (struct jpeg_forward_dct *) losslessc;
|
|
losslessc->pub.start_pass = start_pass_lossless;
|
|
}
|
|
|
|
#endif /* C_LOSSLESS_SUPPORTED */
|