19c791cdac
With rare exceptions ...
- Always separate line continuation characters by one space from
preceding code.
- Always use two-space indentation. Never use tabs.
- Always use K&R-style conditional blocks.
- Always surround operators with spaces, except in raw assembly code.
- Always put a space after, but not before, a comma.
- Never put a space between type casts and variables/function calls.
- Never put a space between the function name and the argument list in
function declarations and prototypes.
- Always surround braces ('{' and '}') with spaces.
- Always surround statements (if, for, else, catch, while, do, switch)
with spaces.
- Always attach pointer symbols ('*' and '**') to the variable or
function name.
- Always precede pointer symbols ('*' and '**') by a space in type
casts.
- Use the MIN() macro from jpegint.h within the libjpeg and TurboJPEG
API libraries (using min() from tjutil.h is still necessary for
TJBench.)
- Where it makes sense (particularly in the TurboJPEG code), put a blank
line after variable declaration blocks.
- Always separate statements in one-liners by two spaces.
The purpose of this was to ease maintenance on my part and also to make
it easier for contributors to figure out how to format patch
submissions. This was admittedly confusing (even to me sometimes) when
we had 3 or 4 different style conventions in the same source tree. The
new convention is more consistent with the formatting of other OSS code
bases.
This commit corrects deviations from the chosen formatting style in the
libjpeg API code and reformats the TurboJPEG API code such that it
conforms to the same standard.
NOTES:
- Although it is no longer necessary for the function name in function
declarations to begin in Column 1 (this was historically necessary
because of the ansi2knr utility, which allowed libjpeg to be built
with non-ANSI compilers), we retain that formatting for the libjpeg
code because it improves readability when using libjpeg's function
attribute macros (GLOBAL(), etc.)
- This reformatting project was accomplished with the help of AStyle and
Uncrustify, although neither was completely up to the task, and thus
a great deal of manual tweaking was required. Note to developers of
code formatting utilities: the libjpeg-turbo code base is an
excellent test bed, because AFAICT, it breaks every single one of the
utilities that are currently available.
- The legacy (MMX, SSE, 3DNow!) assembly code for i386 has been
formatted to match the SSE2 code (refer to
ff5685d5344273df321eb63a005eaae19d2496e3.) I hadn't intended to
bother with this, but the Loongson MMI implementation demonstrated
that there is still academic value to the MMX implementation, as an
algorithmic model for other 64-bit vector implementations. Thus, it
is desirable to improve its readability in the same manner as that of
the SSE2 implementation.
185 lines
5.8 KiB
C
185 lines
5.8 KiB
C
/*
|
|
* jdmrgext.c
|
|
*
|
|
* This file was part of the Independent JPEG Group's software:
|
|
* Copyright (C) 1994-1996, Thomas G. Lane.
|
|
* libjpeg-turbo Modifications:
|
|
* Copyright (C) 2011, 2015, D. R. Commander.
|
|
* For conditions of distribution and use, see the accompanying README.ijg
|
|
* file.
|
|
*
|
|
* This file contains code for merged upsampling/color conversion.
|
|
*/
|
|
|
|
|
|
/* This file is included by jdmerge.c */
|
|
|
|
|
|
/*
|
|
* Upsample and color convert for the case of 2:1 horizontal and 1:1 vertical.
|
|
*/
|
|
|
|
INLINE
|
|
LOCAL(void)
|
|
h2v1_merged_upsample_internal(j_decompress_ptr cinfo, JSAMPIMAGE input_buf,
|
|
JDIMENSION in_row_group_ctr,
|
|
JSAMPARRAY output_buf)
|
|
{
|
|
my_upsample_ptr upsample = (my_upsample_ptr)cinfo->upsample;
|
|
register int y, cred, cgreen, cblue;
|
|
int cb, cr;
|
|
register JSAMPROW outptr;
|
|
JSAMPROW inptr0, inptr1, inptr2;
|
|
JDIMENSION col;
|
|
/* copy these pointers into registers if possible */
|
|
register JSAMPLE *range_limit = cinfo->sample_range_limit;
|
|
int *Crrtab = upsample->Cr_r_tab;
|
|
int *Cbbtab = upsample->Cb_b_tab;
|
|
JLONG *Crgtab = upsample->Cr_g_tab;
|
|
JLONG *Cbgtab = upsample->Cb_g_tab;
|
|
SHIFT_TEMPS
|
|
|
|
inptr0 = input_buf[0][in_row_group_ctr];
|
|
inptr1 = input_buf[1][in_row_group_ctr];
|
|
inptr2 = input_buf[2][in_row_group_ctr];
|
|
outptr = output_buf[0];
|
|
/* Loop for each pair of output pixels */
|
|
for (col = cinfo->output_width >> 1; col > 0; col--) {
|
|
/* Do the chroma part of the calculation */
|
|
cb = GETJSAMPLE(*inptr1++);
|
|
cr = GETJSAMPLE(*inptr2++);
|
|
cred = Crrtab[cr];
|
|
cgreen = (int)RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
|
|
cblue = Cbbtab[cb];
|
|
/* Fetch 2 Y values and emit 2 pixels */
|
|
y = GETJSAMPLE(*inptr0++);
|
|
outptr[RGB_RED] = range_limit[y + cred];
|
|
outptr[RGB_GREEN] = range_limit[y + cgreen];
|
|
outptr[RGB_BLUE] = range_limit[y + cblue];
|
|
#ifdef RGB_ALPHA
|
|
outptr[RGB_ALPHA] = 0xFF;
|
|
#endif
|
|
outptr += RGB_PIXELSIZE;
|
|
y = GETJSAMPLE(*inptr0++);
|
|
outptr[RGB_RED] = range_limit[y + cred];
|
|
outptr[RGB_GREEN] = range_limit[y + cgreen];
|
|
outptr[RGB_BLUE] = range_limit[y + cblue];
|
|
#ifdef RGB_ALPHA
|
|
outptr[RGB_ALPHA] = 0xFF;
|
|
#endif
|
|
outptr += RGB_PIXELSIZE;
|
|
}
|
|
/* If image width is odd, do the last output column separately */
|
|
if (cinfo->output_width & 1) {
|
|
cb = GETJSAMPLE(*inptr1);
|
|
cr = GETJSAMPLE(*inptr2);
|
|
cred = Crrtab[cr];
|
|
cgreen = (int)RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
|
|
cblue = Cbbtab[cb];
|
|
y = GETJSAMPLE(*inptr0);
|
|
outptr[RGB_RED] = range_limit[y + cred];
|
|
outptr[RGB_GREEN] = range_limit[y + cgreen];
|
|
outptr[RGB_BLUE] = range_limit[y + cblue];
|
|
#ifdef RGB_ALPHA
|
|
outptr[RGB_ALPHA] = 0xFF;
|
|
#endif
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
* Upsample and color convert for the case of 2:1 horizontal and 2:1 vertical.
|
|
*/
|
|
|
|
INLINE
|
|
LOCAL(void)
|
|
h2v2_merged_upsample_internal(j_decompress_ptr cinfo, JSAMPIMAGE input_buf,
|
|
JDIMENSION in_row_group_ctr,
|
|
JSAMPARRAY output_buf)
|
|
{
|
|
my_upsample_ptr upsample = (my_upsample_ptr)cinfo->upsample;
|
|
register int y, cred, cgreen, cblue;
|
|
int cb, cr;
|
|
register JSAMPROW outptr0, outptr1;
|
|
JSAMPROW inptr00, inptr01, inptr1, inptr2;
|
|
JDIMENSION col;
|
|
/* copy these pointers into registers if possible */
|
|
register JSAMPLE *range_limit = cinfo->sample_range_limit;
|
|
int *Crrtab = upsample->Cr_r_tab;
|
|
int *Cbbtab = upsample->Cb_b_tab;
|
|
JLONG *Crgtab = upsample->Cr_g_tab;
|
|
JLONG *Cbgtab = upsample->Cb_g_tab;
|
|
SHIFT_TEMPS
|
|
|
|
inptr00 = input_buf[0][in_row_group_ctr * 2];
|
|
inptr01 = input_buf[0][in_row_group_ctr * 2 + 1];
|
|
inptr1 = input_buf[1][in_row_group_ctr];
|
|
inptr2 = input_buf[2][in_row_group_ctr];
|
|
outptr0 = output_buf[0];
|
|
outptr1 = output_buf[1];
|
|
/* Loop for each group of output pixels */
|
|
for (col = cinfo->output_width >> 1; col > 0; col--) {
|
|
/* Do the chroma part of the calculation */
|
|
cb = GETJSAMPLE(*inptr1++);
|
|
cr = GETJSAMPLE(*inptr2++);
|
|
cred = Crrtab[cr];
|
|
cgreen = (int)RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
|
|
cblue = Cbbtab[cb];
|
|
/* Fetch 4 Y values and emit 4 pixels */
|
|
y = GETJSAMPLE(*inptr00++);
|
|
outptr0[RGB_RED] = range_limit[y + cred];
|
|
outptr0[RGB_GREEN] = range_limit[y + cgreen];
|
|
outptr0[RGB_BLUE] = range_limit[y + cblue];
|
|
#ifdef RGB_ALPHA
|
|
outptr0[RGB_ALPHA] = 0xFF;
|
|
#endif
|
|
outptr0 += RGB_PIXELSIZE;
|
|
y = GETJSAMPLE(*inptr00++);
|
|
outptr0[RGB_RED] = range_limit[y + cred];
|
|
outptr0[RGB_GREEN] = range_limit[y + cgreen];
|
|
outptr0[RGB_BLUE] = range_limit[y + cblue];
|
|
#ifdef RGB_ALPHA
|
|
outptr0[RGB_ALPHA] = 0xFF;
|
|
#endif
|
|
outptr0 += RGB_PIXELSIZE;
|
|
y = GETJSAMPLE(*inptr01++);
|
|
outptr1[RGB_RED] = range_limit[y + cred];
|
|
outptr1[RGB_GREEN] = range_limit[y + cgreen];
|
|
outptr1[RGB_BLUE] = range_limit[y + cblue];
|
|
#ifdef RGB_ALPHA
|
|
outptr1[RGB_ALPHA] = 0xFF;
|
|
#endif
|
|
outptr1 += RGB_PIXELSIZE;
|
|
y = GETJSAMPLE(*inptr01++);
|
|
outptr1[RGB_RED] = range_limit[y + cred];
|
|
outptr1[RGB_GREEN] = range_limit[y + cgreen];
|
|
outptr1[RGB_BLUE] = range_limit[y + cblue];
|
|
#ifdef RGB_ALPHA
|
|
outptr1[RGB_ALPHA] = 0xFF;
|
|
#endif
|
|
outptr1 += RGB_PIXELSIZE;
|
|
}
|
|
/* If image width is odd, do the last output column separately */
|
|
if (cinfo->output_width & 1) {
|
|
cb = GETJSAMPLE(*inptr1);
|
|
cr = GETJSAMPLE(*inptr2);
|
|
cred = Crrtab[cr];
|
|
cgreen = (int)RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
|
|
cblue = Cbbtab[cb];
|
|
y = GETJSAMPLE(*inptr00);
|
|
outptr0[RGB_RED] = range_limit[y + cred];
|
|
outptr0[RGB_GREEN] = range_limit[y + cgreen];
|
|
outptr0[RGB_BLUE] = range_limit[y + cblue];
|
|
#ifdef RGB_ALPHA
|
|
outptr0[RGB_ALPHA] = 0xFF;
|
|
#endif
|
|
y = GETJSAMPLE(*inptr01);
|
|
outptr1[RGB_RED] = range_limit[y + cred];
|
|
outptr1[RGB_GREEN] = range_limit[y + cgreen];
|
|
outptr1[RGB_BLUE] = range_limit[y + cblue];
|
|
#ifdef RGB_ALPHA
|
|
outptr1[RGB_ALPHA] = 0xFF;
|
|
#endif
|
|
}
|
|
}
|