| OLD | NEW |
| 1 ; | 1 ; |
| 2 ; jcgrass2-64.asm - grayscale colorspace conversion (64-bit SSE2) | 2 ; jcgray.asm - grayscale colorspace conversion (64-bit SSE2) |
| 3 ; | 3 ; |
| 4 ; x86 SIMD extension for IJG JPEG library | 4 ; x86 SIMD extension for IJG JPEG library |
| 5 ; Copyright (C) 1999-2006, MIYASAKA Masaru. | 5 ; Copyright (C) 1999-2006, MIYASAKA Masaru. |
| 6 ; Copyright (C) 2011, D. R. Commander. | 6 ; Copyright (C) 2011, D. R. Commander. |
| 7 ; For conditions of distribution and use, see copyright notice in jsimdext.inc | 7 ; For conditions of distribution and use, see copyright notice in jsimdext.inc |
| 8 ; | 8 ; |
| 9 ; This file should be assembled with NASM (Netwide Assembler), | 9 ; This file should be assembled with NASM (Netwide Assembler), |
| 10 ; can *not* be assembled with Microsoft's MASM or any compatible | 10 ; can *not* be assembled with Microsoft's MASM or any compatible |
| 11 ; assembler (including Borland's Turbo Assembler). | 11 ; assembler (including Borland's Turbo Assembler). |
| 12 ; NASM is available from http://nasm.sourceforge.net/ or | 12 ; NASM is available from http://nasm.sourceforge.net/ or |
| 13 ; http://sourceforge.net/project/showfiles.php?group_id=6208 | 13 ; http://sourceforge.net/project/showfiles.php?group_id=6208 |
| 14 ; | 14 ; |
| 15 ; [TAB8] | 15 ; [TAB8] |
| 16 | 16 |
| 17 %include "jsimdext.inc" | 17 %include "jsimdext.inc" |
| 18 | 18 |
| 19 ; -------------------------------------------------------------------------- | 19 ; -------------------------------------------------------------------------- |
| 20 | 20 |
| 21 %define SCALEBITS» 16 | 21 %define SCALEBITS 16 |
| 22 | 22 |
| 23 F_0_114»equ» 7471» » » ; FIX(0.11400) | 23 F_0_114 equ 7471 ; FIX(0.11400) |
| 24 F_0_250»equ» 16384» » » ; FIX(0.25000) | 24 F_0_250 equ 16384 ; FIX(0.25000) |
| 25 F_0_299»equ» 19595» » » ; FIX(0.29900) | 25 F_0_299 equ 19595 ; FIX(0.29900) |
| 26 F_0_587»equ» 38470» » » ; FIX(0.58700) | 26 F_0_587 equ 38470 ; FIX(0.58700) |
| 27 F_0_337»equ» (F_0_587 - F_0_250)» ; FIX(0.58700) - FIX(0.25000) | 27 F_0_337 equ (F_0_587 - F_0_250) ; FIX(0.58700) - FIX(0.25000) |
| 28 | 28 |
| 29 ; -------------------------------------------------------------------------- | 29 ; -------------------------------------------------------------------------- |
| 30 » SECTION»SEG_CONST | 30 SECTION SEG_CONST |
| 31 | 31 |
| 32 » alignz» 16 | 32 alignz 16 |
| 33 » global» EXTN(jconst_rgb_gray_convert_sse2) PRIVATE | 33 global EXTN(jconst_rgb_gray_convert_sse2) |
| 34 | 34 |
| 35 EXTN(jconst_rgb_gray_convert_sse2): | 35 EXTN(jconst_rgb_gray_convert_sse2): |
| 36 | 36 |
| 37 PW_F0299_F0337» times 4 dw F_0_299, F_0_337 | 37 PW_F0299_F0337 times 4 dw F_0_299, F_0_337 |
| 38 PW_F0114_F0250» times 4 dw F_0_114, F_0_250 | 38 PW_F0114_F0250 times 4 dw F_0_114, F_0_250 |
| 39 PD_ONEHALF» times 4 dd (1 << (SCALEBITS-1)) | 39 PD_ONEHALF times 4 dd (1 << (SCALEBITS-1)) |
| 40 | 40 |
| 41 » alignz» 16 | 41 alignz 16 |
| 42 | 42 |
| 43 ; -------------------------------------------------------------------------- | 43 ; -------------------------------------------------------------------------- |
| 44 » SECTION»SEG_TEXT | 44 SECTION SEG_TEXT |
| 45 » BITS» 64 | 45 BITS 64 |
| 46 | 46 |
| 47 %include "jcgryss2-64.asm" | 47 %include "jcgryext-sse2-64.asm" |
| 48 | 48 |
| 49 %undef RGB_RED | 49 %undef RGB_RED |
| 50 %undef RGB_GREEN | 50 %undef RGB_GREEN |
| 51 %undef RGB_BLUE | 51 %undef RGB_BLUE |
| 52 %undef RGB_PIXELSIZE | 52 %undef RGB_PIXELSIZE |
| 53 %define RGB_RED EXT_RGB_RED | 53 %define RGB_RED EXT_RGB_RED |
| 54 %define RGB_GREEN EXT_RGB_GREEN | 54 %define RGB_GREEN EXT_RGB_GREEN |
| 55 %define RGB_BLUE EXT_RGB_BLUE | 55 %define RGB_BLUE EXT_RGB_BLUE |
| 56 %define RGB_PIXELSIZE EXT_RGB_PIXELSIZE | 56 %define RGB_PIXELSIZE EXT_RGB_PIXELSIZE |
| 57 %define jsimd_rgb_gray_convert_sse2 jsimd_extrgb_gray_convert_sse2 | 57 %define jsimd_rgb_gray_convert_sse2 jsimd_extrgb_gray_convert_sse2 |
| 58 %include "jcgryss2-64.asm" | 58 %include "jcgryext-sse2-64.asm" |
| 59 | 59 |
| 60 %undef RGB_RED | 60 %undef RGB_RED |
| 61 %undef RGB_GREEN | 61 %undef RGB_GREEN |
| 62 %undef RGB_BLUE | 62 %undef RGB_BLUE |
| 63 %undef RGB_PIXELSIZE | 63 %undef RGB_PIXELSIZE |
| 64 %define RGB_RED EXT_RGBX_RED | 64 %define RGB_RED EXT_RGBX_RED |
| 65 %define RGB_GREEN EXT_RGBX_GREEN | 65 %define RGB_GREEN EXT_RGBX_GREEN |
| 66 %define RGB_BLUE EXT_RGBX_BLUE | 66 %define RGB_BLUE EXT_RGBX_BLUE |
| 67 %define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE | 67 %define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE |
| 68 %define jsimd_rgb_gray_convert_sse2 jsimd_extrgbx_gray_convert_sse2 | 68 %define jsimd_rgb_gray_convert_sse2 jsimd_extrgbx_gray_convert_sse2 |
| 69 %include "jcgryss2-64.asm" | 69 %include "jcgryext-sse2-64.asm" |
| 70 | 70 |
| 71 %undef RGB_RED | 71 %undef RGB_RED |
| 72 %undef RGB_GREEN | 72 %undef RGB_GREEN |
| 73 %undef RGB_BLUE | 73 %undef RGB_BLUE |
| 74 %undef RGB_PIXELSIZE | 74 %undef RGB_PIXELSIZE |
| 75 %define RGB_RED EXT_BGR_RED | 75 %define RGB_RED EXT_BGR_RED |
| 76 %define RGB_GREEN EXT_BGR_GREEN | 76 %define RGB_GREEN EXT_BGR_GREEN |
| 77 %define RGB_BLUE EXT_BGR_BLUE | 77 %define RGB_BLUE EXT_BGR_BLUE |
| 78 %define RGB_PIXELSIZE EXT_BGR_PIXELSIZE | 78 %define RGB_PIXELSIZE EXT_BGR_PIXELSIZE |
| 79 %define jsimd_rgb_gray_convert_sse2 jsimd_extbgr_gray_convert_sse2 | 79 %define jsimd_rgb_gray_convert_sse2 jsimd_extbgr_gray_convert_sse2 |
| 80 %include "jcgryss2-64.asm" | 80 %include "jcgryext-sse2-64.asm" |
| 81 | 81 |
| 82 %undef RGB_RED | 82 %undef RGB_RED |
| 83 %undef RGB_GREEN | 83 %undef RGB_GREEN |
| 84 %undef RGB_BLUE | 84 %undef RGB_BLUE |
| 85 %undef RGB_PIXELSIZE | 85 %undef RGB_PIXELSIZE |
| 86 %define RGB_RED EXT_BGRX_RED | 86 %define RGB_RED EXT_BGRX_RED |
| 87 %define RGB_GREEN EXT_BGRX_GREEN | 87 %define RGB_GREEN EXT_BGRX_GREEN |
| 88 %define RGB_BLUE EXT_BGRX_BLUE | 88 %define RGB_BLUE EXT_BGRX_BLUE |
| 89 %define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE | 89 %define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE |
| 90 %define jsimd_rgb_gray_convert_sse2 jsimd_extbgrx_gray_convert_sse2 | 90 %define jsimd_rgb_gray_convert_sse2 jsimd_extbgrx_gray_convert_sse2 |
| 91 %include "jcgryss2-64.asm" | 91 %include "jcgryext-sse2-64.asm" |
| 92 | 92 |
| 93 %undef RGB_RED | 93 %undef RGB_RED |
| 94 %undef RGB_GREEN | 94 %undef RGB_GREEN |
| 95 %undef RGB_BLUE | 95 %undef RGB_BLUE |
| 96 %undef RGB_PIXELSIZE | 96 %undef RGB_PIXELSIZE |
| 97 %define RGB_RED EXT_XBGR_RED | 97 %define RGB_RED EXT_XBGR_RED |
| 98 %define RGB_GREEN EXT_XBGR_GREEN | 98 %define RGB_GREEN EXT_XBGR_GREEN |
| 99 %define RGB_BLUE EXT_XBGR_BLUE | 99 %define RGB_BLUE EXT_XBGR_BLUE |
| 100 %define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE | 100 %define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE |
| 101 %define jsimd_rgb_gray_convert_sse2 jsimd_extxbgr_gray_convert_sse2 | 101 %define jsimd_rgb_gray_convert_sse2 jsimd_extxbgr_gray_convert_sse2 |
| 102 %include "jcgryss2-64.asm" | 102 %include "jcgryext-sse2-64.asm" |
| 103 | 103 |
| 104 %undef RGB_RED | 104 %undef RGB_RED |
| 105 %undef RGB_GREEN | 105 %undef RGB_GREEN |
| 106 %undef RGB_BLUE | 106 %undef RGB_BLUE |
| 107 %undef RGB_PIXELSIZE | 107 %undef RGB_PIXELSIZE |
| 108 %define RGB_RED EXT_XRGB_RED | 108 %define RGB_RED EXT_XRGB_RED |
| 109 %define RGB_GREEN EXT_XRGB_GREEN | 109 %define RGB_GREEN EXT_XRGB_GREEN |
| 110 %define RGB_BLUE EXT_XRGB_BLUE | 110 %define RGB_BLUE EXT_XRGB_BLUE |
| 111 %define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE | 111 %define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE |
| 112 %define jsimd_rgb_gray_convert_sse2 jsimd_extxrgb_gray_convert_sse2 | 112 %define jsimd_rgb_gray_convert_sse2 jsimd_extxrgb_gray_convert_sse2 |
| 113 %include "jcgryss2-64.asm" | 113 %include "jcgryext-sse2-64.asm" |
| OLD | NEW |