e8b40f3c2b
The Gordian knot that 7fec5074f9 attempted
to unravel was caused by the fact that there are several
data-precision-dependent (JSAMPLE-dependent) fields and methods in the
exposed libjpeg API structures, and if you change the exposed libjpeg
API structures, then you have to change the whole API. If you change
the whole API, then you have to provide a whole new library to support
the new API, and that makes it difficult to support multiple data
precisions in the same application. (It is not impossible, as example.c
demonstrated, but using data-precision-dependent libjpeg API structures
would have made the cjpeg, djpeg, and jpegtran source code hard to read,
so it made more sense to build, install, and package 12-bit-specific
versions of those applications.)
Unfortunately, the result of that initial integration effort was an
unreadable and unmaintainable mess, which is a problem for a library
that is an ISO/ITU-T reference implementation. Also, as I dug into the
problem of lossless JPEG support, I realized that 16-bit lossless JPEG
images are a thing, and supporting yet another version of the libjpeg
API just for those images is untenable.
In fact, however, the touch points for JSAMPLE in the exposed libjpeg
API structures are minimal:
- The colormap and sample_range_limit fields in jpeg_decompress_struct
- The alloc_sarray() and access_virt_sarray() methods in
jpeg_memory_mgr
- jpeg_write_scanlines() and jpeg_write_raw_data()
- jpeg_read_scanlines() and jpeg_read_raw_data()
- jpeg_skip_scanlines() and jpeg_crop_scanline()
(This is subtle, but both of those functions use JSAMPLE-dependent
opaque structures behind the scenes.)
It is much more readable and maintainable to provide 12-bit-specific
versions of those six top-level API functions and to document that the
aforementioned methods and fields must be type-cast when using 12-bit
samples. Since that eliminates the need to provide a 12-bit-specific
version of the exposed libjpeg API structures, we can:
- Compile only the precision-dependent libjpeg modules (the
coefficient buffer controllers, the colorspace converters, the
DCT/IDCT managers, the main buffer controllers, the preprocessing
and postprocessing controller, the downsampler and upsamplers, the
quantizers, the integer DCT methods, and the IDCT methods) for
multiple data precisions.
- Introduce 12-bit-specific methods into the various internal
structures defined in jpegint.h.
- Create precision-independent data type, macro, method, field, and
function names that are prefixed by an underscore, and use an
internal header to convert those into precision-dependent data
type, macro, method, field, and function names, based on the value
of BITS_IN_JSAMPLE, when compiling the precision-dependent libjpeg
modules.
- Expose precision-dependent jinit*() functions for each of the
precision-dependent libjpeg modules.
- Abstract the precision-dependent libjpeg modules by calling the
appropriate precision-dependent jinit*() function, based on the
value of cinfo->data_precision, from top-level libjpeg API
functions.
143 lines
3.8 KiB
C
143 lines
3.8 KiB
C
/*
|
|
* jutils.c
|
|
*
|
|
* This file was part of the Independent JPEG Group's software:
|
|
* Copyright (C) 1991-1996, Thomas G. Lane.
|
|
* libjpeg-turbo Modifications:
|
|
* Copyright (C) 2022, D. R. Commander.
|
|
* For conditions of distribution and use, see the accompanying README.ijg
|
|
* file.
|
|
*
|
|
* This file contains tables and miscellaneous utility routines needed
|
|
* for both compression and decompression.
|
|
* Note we prefix all global names with "j" to minimize conflicts with
|
|
* a surrounding application.
|
|
*/
|
|
|
|
#define JPEG_INTERNALS
|
|
#include "jinclude.h"
|
|
#include "jpeglib.h"
|
|
#include "jsamplecomp.h"
|
|
|
|
|
|
#if BITS_IN_JSAMPLE == 8
|
|
|
|
/*
|
|
* jpeg_zigzag_order[i] is the zigzag-order position of the i'th element
|
|
* of a DCT block read in natural order (left to right, top to bottom).
|
|
*/
|
|
|
|
#if 0 /* This table is not actually needed in v6a */
|
|
|
|
const int jpeg_zigzag_order[DCTSIZE2] = {
|
|
0, 1, 5, 6, 14, 15, 27, 28,
|
|
2, 4, 7, 13, 16, 26, 29, 42,
|
|
3, 8, 12, 17, 25, 30, 41, 43,
|
|
9, 11, 18, 24, 31, 40, 44, 53,
|
|
10, 19, 23, 32, 39, 45, 52, 54,
|
|
20, 22, 33, 38, 46, 51, 55, 60,
|
|
21, 34, 37, 47, 50, 56, 59, 61,
|
|
35, 36, 48, 49, 57, 58, 62, 63
|
|
};
|
|
|
|
#endif
|
|
|
|
/*
|
|
* jpeg_natural_order[i] is the natural-order position of the i'th element
|
|
* of zigzag order.
|
|
*
|
|
* When reading corrupted data, the Huffman decoders could attempt
|
|
* to reference an entry beyond the end of this array (if the decoded
|
|
* zero run length reaches past the end of the block). To prevent
|
|
* wild stores without adding an inner-loop test, we put some extra
|
|
* "63"s after the real entries. This will cause the extra coefficient
|
|
* to be stored in location 63 of the block, not somewhere random.
|
|
* The worst case would be a run-length of 15, which means we need 16
|
|
* fake entries.
|
|
*/
|
|
|
|
const int jpeg_natural_order[DCTSIZE2 + 16] = {
|
|
0, 1, 8, 16, 9, 2, 3, 10,
|
|
17, 24, 32, 25, 18, 11, 4, 5,
|
|
12, 19, 26, 33, 40, 48, 41, 34,
|
|
27, 20, 13, 6, 7, 14, 21, 28,
|
|
35, 42, 49, 56, 57, 50, 43, 36,
|
|
29, 22, 15, 23, 30, 37, 44, 51,
|
|
58, 59, 52, 45, 38, 31, 39, 46,
|
|
53, 60, 61, 54, 47, 55, 62, 63,
|
|
63, 63, 63, 63, 63, 63, 63, 63, /* extra entries for safety in decoder */
|
|
63, 63, 63, 63, 63, 63, 63, 63
|
|
};
|
|
|
|
|
|
/*
|
|
* Arithmetic utilities
|
|
*/
|
|
|
|
GLOBAL(long)
|
|
jdiv_round_up(long a, long b)
|
|
/* Compute a/b rounded up to next integer, ie, ceil(a/b) */
|
|
/* Assumes a >= 0, b > 0 */
|
|
{
|
|
return (a + b - 1L) / b;
|
|
}
|
|
|
|
|
|
GLOBAL(long)
|
|
jround_up(long a, long b)
|
|
/* Compute a rounded up to next multiple of b, ie, ceil(a/b)*b */
|
|
/* Assumes a >= 0, b > 0 */
|
|
{
|
|
a += b - 1L;
|
|
return a - (a % b);
|
|
}
|
|
|
|
#endif /* BITS_IN_JSAMPLE == 8 */
|
|
|
|
|
|
GLOBAL(void)
|
|
_jcopy_sample_rows(_JSAMPARRAY input_array, int source_row,
|
|
_JSAMPARRAY output_array, int dest_row, int num_rows,
|
|
JDIMENSION num_cols)
|
|
/* Copy some rows of samples from one place to another.
|
|
* num_rows rows are copied from input_array[source_row++]
|
|
* to output_array[dest_row++]; these areas may overlap for duplication.
|
|
* The source and destination arrays must be at least as wide as num_cols.
|
|
*/
|
|
{
|
|
register _JSAMPROW inptr, outptr;
|
|
register size_t count = (size_t)(num_cols * sizeof(_JSAMPLE));
|
|
register int row;
|
|
|
|
input_array += source_row;
|
|
output_array += dest_row;
|
|
|
|
for (row = num_rows; row > 0; row--) {
|
|
inptr = *input_array++;
|
|
outptr = *output_array++;
|
|
memcpy(outptr, inptr, count);
|
|
}
|
|
}
|
|
|
|
|
|
#if BITS_IN_JSAMPLE == 8
|
|
|
|
GLOBAL(void)
|
|
jcopy_block_row(JBLOCKROW input_row, JBLOCKROW output_row,
|
|
JDIMENSION num_blocks)
|
|
/* Copy a row of coefficient blocks from one place to another. */
|
|
{
|
|
memcpy(output_row, input_row, num_blocks * (DCTSIZE2 * sizeof(JCOEF)));
|
|
}
|
|
|
|
|
|
GLOBAL(void)
|
|
jzero_far(void *target, size_t bytestozero)
|
|
/* Zero out a chunk of memory. */
|
|
/* This might be sample-array data, block-array data, or alloc_large data. */
|
|
{
|
|
memset(target, 0, bytestozero);
|
|
}
|
|
|
|
#endif /* BITS_IN_JSAMPLE == 8 */
|