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.
124 lines
3.6 KiB
NASM
124 lines
3.6 KiB
NASM
;
|
|
; jccolor.asm - colorspace conversion (AVX2)
|
|
;
|
|
; Copyright (C) 2009, 2016, D. R. Commander.
|
|
; Copyright (C) 2015, Intel Corporation.
|
|
;
|
|
; Based on the x86 SIMD extension for IJG JPEG library
|
|
; Copyright (C) 1999-2006, MIYASAKA Masaru.
|
|
; For conditions of distribution and use, see copyright notice in jsimdext.inc
|
|
;
|
|
; This file should be assembled with NASM (Netwide Assembler),
|
|
; can *not* be assembled with Microsoft's MASM or any compatible
|
|
; assembler (including Borland's Turbo Assembler).
|
|
; NASM is available from http://nasm.sourceforge.net/ or
|
|
; http://sourceforge.net/project/showfiles.php?group_id=6208
|
|
;
|
|
; [TAB8]
|
|
|
|
%include "jsimdext.inc"
|
|
|
|
; --------------------------------------------------------------------------
|
|
|
|
%define SCALEBITS 16
|
|
|
|
F_0_081 equ 5329 ; FIX(0.08131)
|
|
F_0_114 equ 7471 ; FIX(0.11400)
|
|
F_0_168 equ 11059 ; FIX(0.16874)
|
|
F_0_250 equ 16384 ; FIX(0.25000)
|
|
F_0_299 equ 19595 ; FIX(0.29900)
|
|
F_0_331 equ 21709 ; FIX(0.33126)
|
|
F_0_418 equ 27439 ; FIX(0.41869)
|
|
F_0_587 equ 38470 ; FIX(0.58700)
|
|
F_0_337 equ (F_0_587 - F_0_250) ; FIX(0.58700) - FIX(0.25000)
|
|
|
|
; --------------------------------------------------------------------------
|
|
SECTION SEG_CONST
|
|
|
|
alignz 32
|
|
GLOBAL_DATA(jconst_rgb_ycc_convert_avx2)
|
|
|
|
EXTN(jconst_rgb_ycc_convert_avx2):
|
|
|
|
PW_F0299_F0337 times 8 dw F_0_299, F_0_337
|
|
PW_F0114_F0250 times 8 dw F_0_114, F_0_250
|
|
PW_MF016_MF033 times 8 dw -F_0_168, -F_0_331
|
|
PW_MF008_MF041 times 8 dw -F_0_081, -F_0_418
|
|
PD_ONEHALFM1_CJ times 8 dd (1 << (SCALEBITS - 1)) - 1 + \
|
|
(CENTERJSAMPLE << SCALEBITS)
|
|
PD_ONEHALF times 8 dd (1 << (SCALEBITS - 1))
|
|
|
|
alignz 32
|
|
|
|
; --------------------------------------------------------------------------
|
|
SECTION SEG_TEXT
|
|
BITS 32
|
|
|
|
%include "jccolext-avx2.asm"
|
|
|
|
%undef RGB_RED
|
|
%undef RGB_GREEN
|
|
%undef RGB_BLUE
|
|
%undef RGB_PIXELSIZE
|
|
%define RGB_RED EXT_RGB_RED
|
|
%define RGB_GREEN EXT_RGB_GREEN
|
|
%define RGB_BLUE EXT_RGB_BLUE
|
|
%define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
|
|
%define jsimd_rgb_ycc_convert_avx2 jsimd_extrgb_ycc_convert_avx2
|
|
%include "jccolext-avx2.asm"
|
|
|
|
%undef RGB_RED
|
|
%undef RGB_GREEN
|
|
%undef RGB_BLUE
|
|
%undef RGB_PIXELSIZE
|
|
%define RGB_RED EXT_RGBX_RED
|
|
%define RGB_GREEN EXT_RGBX_GREEN
|
|
%define RGB_BLUE EXT_RGBX_BLUE
|
|
%define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
|
|
%define jsimd_rgb_ycc_convert_avx2 jsimd_extrgbx_ycc_convert_avx2
|
|
%include "jccolext-avx2.asm"
|
|
|
|
%undef RGB_RED
|
|
%undef RGB_GREEN
|
|
%undef RGB_BLUE
|
|
%undef RGB_PIXELSIZE
|
|
%define RGB_RED EXT_BGR_RED
|
|
%define RGB_GREEN EXT_BGR_GREEN
|
|
%define RGB_BLUE EXT_BGR_BLUE
|
|
%define RGB_PIXELSIZE EXT_BGR_PIXELSIZE
|
|
%define jsimd_rgb_ycc_convert_avx2 jsimd_extbgr_ycc_convert_avx2
|
|
%include "jccolext-avx2.asm"
|
|
|
|
%undef RGB_RED
|
|
%undef RGB_GREEN
|
|
%undef RGB_BLUE
|
|
%undef RGB_PIXELSIZE
|
|
%define RGB_RED EXT_BGRX_RED
|
|
%define RGB_GREEN EXT_BGRX_GREEN
|
|
%define RGB_BLUE EXT_BGRX_BLUE
|
|
%define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
|
|
%define jsimd_rgb_ycc_convert_avx2 jsimd_extbgrx_ycc_convert_avx2
|
|
%include "jccolext-avx2.asm"
|
|
|
|
%undef RGB_RED
|
|
%undef RGB_GREEN
|
|
%undef RGB_BLUE
|
|
%undef RGB_PIXELSIZE
|
|
%define RGB_RED EXT_XBGR_RED
|
|
%define RGB_GREEN EXT_XBGR_GREEN
|
|
%define RGB_BLUE EXT_XBGR_BLUE
|
|
%define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
|
|
%define jsimd_rgb_ycc_convert_avx2 jsimd_extxbgr_ycc_convert_avx2
|
|
%include "jccolext-avx2.asm"
|
|
|
|
%undef RGB_RED
|
|
%undef RGB_GREEN
|
|
%undef RGB_BLUE
|
|
%undef RGB_PIXELSIZE
|
|
%define RGB_RED EXT_XRGB_RED
|
|
%define RGB_GREEN EXT_XRGB_GREEN
|
|
%define RGB_BLUE EXT_XRGB_BLUE
|
|
%define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
|
|
%define jsimd_rgb_ycc_convert_avx2 jsimd_extxrgb_ycc_convert_avx2
|
|
%include "jccolext-avx2.asm"
|