diff options
author | Chris Blume <cblume@chromium.org> | 2019-03-01 01:09:50 -0800 |
---|---|---|
committer | Chris Blume <cblume@chromium.org> | 2019-03-01 01:09:50 -0800 |
commit | cca8c4dec783a048da6933c86028556622d7c355 (patch) | |
tree | 8a7ff526cd8cbe3bf1bfaa4ec1c29fe3268ed51b /jsimd_none.c | |
parent | 61a2bbaa9aec89cb2c882d87ace6aba9aee49bb9 (diff) |
Update libjpeg-turbo to v2.0.1
In order to apply some performance updates from ARM, we need to update
libjpeg-turbo. These performance updates have yielded a 50% speedup on
some devices.
This CL updates our copy of libjpeg-turbo to v2.0.1 and re-applies our
local patches. This patch also deletes some extra files which were not
being used locally.
Update our local patch that was applied to fix http://crbug.com/398235
(https://codereview.appspot.com/229430043/). The original patch
incorrectly removed "& 0xFF" which limited an array index to within
that array's bounds (effectively reverting
https://github.com/libjpeg-turbo/libjpeg-turbo/commit/fa1d18385d904d530b4aec83ab7757a33397de6e).
Restore the mask, making the array access safe and fixing a graphical
glitch which would otherwise be introduced by this change.
Bug:922430
Change-Id: I3860fdb424deecf7a17818ed09a640e632e71f8d
Diffstat (limited to 'jsimd_none.c')
-rw-r--r-- | jsimd_none.c | 246 |
1 files changed, 130 insertions, 116 deletions
diff --git a/jsimd_none.c b/jsimd_none.c index 90dc965..3cb6c80 100644 --- a/jsimd_none.c +++ b/jsimd_none.c @@ -2,8 +2,8 @@ * jsimd_none.c * * Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB - * Copyright 2009-2011, 2014 D. R. Commander - * Copyright 2015 Matthieu Darbois + * Copyright (C) 2009-2011, 2014, D. R. Commander. + * Copyright (C) 2015-2016, 2018, Matthieu Darbois. * * Based on the x86 SIMD extension for IJG JPEG library, * Copyright (C) 1999-2006, MIYASAKA Masaru. @@ -20,385 +20,399 @@ #include "jsimddct.h" GLOBAL(int) -jsimd_can_rgb_ycc (void) +jsimd_can_rgb_ycc(void) { return 0; } GLOBAL(int) -jsimd_can_rgb_gray (void) +jsimd_can_rgb_gray(void) { return 0; } GLOBAL(int) -jsimd_can_ycc_rgb (void) +jsimd_can_ycc_rgb(void) { return 0; } GLOBAL(int) -jsimd_can_ycc_rgb565 (void) +jsimd_can_ycc_rgb565(void) { return 0; } GLOBAL(int) -jsimd_c_can_null_convert (void) +jsimd_c_can_null_convert(void) { return 0; } GLOBAL(void) -jsimd_rgb_ycc_convert (j_compress_ptr cinfo, - JSAMPARRAY input_buf, JSAMPIMAGE output_buf, - JDIMENSION output_row, int num_rows) +jsimd_rgb_ycc_convert(j_compress_ptr cinfo, JSAMPARRAY input_buf, + JSAMPIMAGE output_buf, JDIMENSION output_row, + int num_rows) { } GLOBAL(void) -jsimd_rgb_gray_convert (j_compress_ptr cinfo, - JSAMPARRAY input_buf, JSAMPIMAGE output_buf, - JDIMENSION output_row, int num_rows) +jsimd_rgb_gray_convert(j_compress_ptr cinfo, JSAMPARRAY input_buf, + JSAMPIMAGE output_buf, JDIMENSION output_row, + int num_rows) { } GLOBAL(void) -jsimd_ycc_rgb_convert (j_decompress_ptr cinfo, - JSAMPIMAGE input_buf, JDIMENSION input_row, - JSAMPARRAY output_buf, int num_rows) +jsimd_ycc_rgb_convert(j_decompress_ptr cinfo, JSAMPIMAGE input_buf, + JDIMENSION input_row, JSAMPARRAY output_buf, + int num_rows) { } GLOBAL(void) -jsimd_ycc_rgb565_convert (j_decompress_ptr cinfo, - JSAMPIMAGE input_buf, JDIMENSION input_row, - JSAMPARRAY output_buf, int num_rows) +jsimd_ycc_rgb565_convert(j_decompress_ptr cinfo, JSAMPIMAGE input_buf, + JDIMENSION input_row, JSAMPARRAY output_buf, + int num_rows) { } GLOBAL(void) -jsimd_c_null_convert (j_compress_ptr cinfo, - JSAMPARRAY input_buf, JSAMPIMAGE output_buf, - JDIMENSION output_row, int num_rows) +jsimd_c_null_convert(j_compress_ptr cinfo, JSAMPARRAY input_buf, + JSAMPIMAGE output_buf, JDIMENSION output_row, + int num_rows) { } GLOBAL(int) -jsimd_can_h2v2_downsample (void) +jsimd_can_h2v2_downsample(void) { return 0; } GLOBAL(int) -jsimd_can_h2v1_downsample (void) +jsimd_can_h2v1_downsample(void) { return 0; } GLOBAL(int) -jsimd_can_h2v2_smooth_downsample (void) +jsimd_can_h2v2_smooth_downsample(void) { return 0; } GLOBAL(void) -jsimd_h2v2_downsample (j_compress_ptr cinfo, jpeg_component_info *compptr, - JSAMPARRAY input_data, JSAMPARRAY output_data) +jsimd_h2v2_downsample(j_compress_ptr cinfo, jpeg_component_info *compptr, + JSAMPARRAY input_data, JSAMPARRAY output_data) { } GLOBAL(void) -jsimd_h2v2_smooth_downsample (j_compress_ptr cinfo, - jpeg_component_info *compptr, - JSAMPARRAY input_data, JSAMPARRAY output_data) +jsimd_h2v2_smooth_downsample(j_compress_ptr cinfo, + jpeg_component_info *compptr, + JSAMPARRAY input_data, JSAMPARRAY output_data) { } GLOBAL(void) -jsimd_h2v1_downsample (j_compress_ptr cinfo, jpeg_component_info *compptr, - JSAMPARRAY input_data, JSAMPARRAY output_data) +jsimd_h2v1_downsample(j_compress_ptr cinfo, jpeg_component_info *compptr, + JSAMPARRAY input_data, JSAMPARRAY output_data) { } GLOBAL(int) -jsimd_can_h2v2_upsample (void) +jsimd_can_h2v2_upsample(void) { return 0; } GLOBAL(int) -jsimd_can_h2v1_upsample (void) +jsimd_can_h2v1_upsample(void) { return 0; } GLOBAL(int) -jsimd_can_int_upsample (void) +jsimd_can_int_upsample(void) { return 0; } GLOBAL(void) -jsimd_int_upsample (j_decompress_ptr cinfo, jpeg_component_info *compptr, - JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr) +jsimd_int_upsample(j_decompress_ptr cinfo, jpeg_component_info *compptr, + JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr) { } GLOBAL(void) -jsimd_h2v2_upsample (j_decompress_ptr cinfo, - jpeg_component_info *compptr, - JSAMPARRAY input_data, - JSAMPARRAY *output_data_ptr) +jsimd_h2v2_upsample(j_decompress_ptr cinfo, jpeg_component_info *compptr, + JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr) { } GLOBAL(void) -jsimd_h2v1_upsample (j_decompress_ptr cinfo, - jpeg_component_info *compptr, - JSAMPARRAY input_data, - JSAMPARRAY *output_data_ptr) +jsimd_h2v1_upsample(j_decompress_ptr cinfo, jpeg_component_info *compptr, + JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr) { } GLOBAL(int) -jsimd_can_h2v2_fancy_upsample (void) +jsimd_can_h2v2_fancy_upsample(void) { return 0; } GLOBAL(int) -jsimd_can_h2v1_fancy_upsample (void) +jsimd_can_h2v1_fancy_upsample(void) { return 0; } GLOBAL(void) -jsimd_h2v2_fancy_upsample (j_decompress_ptr cinfo, - jpeg_component_info *compptr, - JSAMPARRAY input_data, - JSAMPARRAY *output_data_ptr) +jsimd_h2v2_fancy_upsample(j_decompress_ptr cinfo, jpeg_component_info *compptr, + JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr) { } GLOBAL(void) -jsimd_h2v1_fancy_upsample (j_decompress_ptr cinfo, - jpeg_component_info *compptr, - JSAMPARRAY input_data, - JSAMPARRAY *output_data_ptr) +jsimd_h2v1_fancy_upsample(j_decompress_ptr cinfo, jpeg_component_info *compptr, + JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr) { } GLOBAL(int) -jsimd_can_h2v2_merged_upsample (void) +jsimd_can_h2v2_merged_upsample(void) { return 0; } GLOBAL(int) -jsimd_can_h2v1_merged_upsample (void) +jsimd_can_h2v1_merged_upsample(void) { return 0; } GLOBAL(void) -jsimd_h2v2_merged_upsample (j_decompress_ptr cinfo, - JSAMPIMAGE input_buf, - JDIMENSION in_row_group_ctr, - JSAMPARRAY output_buf) +jsimd_h2v2_merged_upsample(j_decompress_ptr cinfo, JSAMPIMAGE input_buf, + JDIMENSION in_row_group_ctr, JSAMPARRAY output_buf) { } GLOBAL(void) -jsimd_h2v1_merged_upsample (j_decompress_ptr cinfo, - JSAMPIMAGE input_buf, - JDIMENSION in_row_group_ctr, - JSAMPARRAY output_buf) +jsimd_h2v1_merged_upsample(j_decompress_ptr cinfo, JSAMPIMAGE input_buf, + JDIMENSION in_row_group_ctr, JSAMPARRAY output_buf) { } GLOBAL(int) -jsimd_can_convsamp (void) +jsimd_can_convsamp(void) { return 0; } GLOBAL(int) -jsimd_can_convsamp_float (void) +jsimd_can_convsamp_float(void) { return 0; } GLOBAL(void) -jsimd_convsamp (JSAMPARRAY sample_data, JDIMENSION start_col, - DCTELEM *workspace) +jsimd_convsamp(JSAMPARRAY sample_data, JDIMENSION start_col, + DCTELEM *workspace) { } GLOBAL(void) -jsimd_convsamp_float (JSAMPARRAY sample_data, JDIMENSION start_col, - FAST_FLOAT *workspace) +jsimd_convsamp_float(JSAMPARRAY sample_data, JDIMENSION start_col, + FAST_FLOAT *workspace) { } GLOBAL(int) -jsimd_can_fdct_islow (void) +jsimd_can_fdct_islow(void) { return 0; } GLOBAL(int) -jsimd_can_fdct_ifast (void) +jsimd_can_fdct_ifast(void) { return 0; } GLOBAL(int) -jsimd_can_fdct_float (void) +jsimd_can_fdct_float(void) { return 0; } GLOBAL(void) -jsimd_fdct_islow (DCTELEM *data) +jsimd_fdct_islow(DCTELEM *data) { } GLOBAL(void) -jsimd_fdct_ifast (DCTELEM *data) +jsimd_fdct_ifast(DCTELEM *data) { } GLOBAL(void) -jsimd_fdct_float (FAST_FLOAT *data) +jsimd_fdct_float(FAST_FLOAT *data) { } GLOBAL(int) -jsimd_can_quantize (void) +jsimd_can_quantize(void) { return 0; } GLOBAL(int) -jsimd_can_quantize_float (void) +jsimd_can_quantize_float(void) { return 0; } GLOBAL(void) -jsimd_quantize (JCOEFPTR coef_block, DCTELEM *divisors, - DCTELEM *workspace) +jsimd_quantize(JCOEFPTR coef_block, DCTELEM *divisors, DCTELEM *workspace) { } GLOBAL(void) -jsimd_quantize_float (JCOEFPTR coef_block, FAST_FLOAT *divisors, - FAST_FLOAT *workspace) +jsimd_quantize_float(JCOEFPTR coef_block, FAST_FLOAT *divisors, + FAST_FLOAT *workspace) { } GLOBAL(int) -jsimd_can_idct_2x2 (void) +jsimd_can_idct_2x2(void) { return 0; } GLOBAL(int) -jsimd_can_idct_4x4 (void) +jsimd_can_idct_4x4(void) { return 0; } GLOBAL(int) -jsimd_can_idct_6x6 (void) +jsimd_can_idct_6x6(void) { return 0; } GLOBAL(int) -jsimd_can_idct_12x12 (void) +jsimd_can_idct_12x12(void) { return 0; } GLOBAL(void) -jsimd_idct_2x2 (j_decompress_ptr cinfo, jpeg_component_info *compptr, - JCOEFPTR coef_block, JSAMPARRAY output_buf, - JDIMENSION output_col) +jsimd_idct_2x2(j_decompress_ptr cinfo, jpeg_component_info *compptr, + JCOEFPTR coef_block, JSAMPARRAY output_buf, + JDIMENSION output_col) { } GLOBAL(void) -jsimd_idct_4x4 (j_decompress_ptr cinfo, jpeg_component_info *compptr, - JCOEFPTR coef_block, JSAMPARRAY output_buf, - JDIMENSION output_col) +jsimd_idct_4x4(j_decompress_ptr cinfo, jpeg_component_info *compptr, + JCOEFPTR coef_block, JSAMPARRAY output_buf, + JDIMENSION output_col) { } GLOBAL(void) -jsimd_idct_6x6 (j_decompress_ptr cinfo, jpeg_component_info *compptr, - JCOEFPTR coef_block, JSAMPARRAY output_buf, - JDIMENSION output_col) +jsimd_idct_6x6(j_decompress_ptr cinfo, jpeg_component_info *compptr, + JCOEFPTR coef_block, JSAMPARRAY output_buf, + JDIMENSION output_col) { } GLOBAL(void) -jsimd_idct_12x12 (j_decompress_ptr cinfo, jpeg_component_info *compptr, - JCOEFPTR coef_block, JSAMPARRAY output_buf, - JDIMENSION output_col) +jsimd_idct_12x12(j_decompress_ptr cinfo, jpeg_component_info *compptr, + JCOEFPTR coef_block, JSAMPARRAY output_buf, + JDIMENSION output_col) { } GLOBAL(int) -jsimd_can_idct_islow (void) +jsimd_can_idct_islow(void) { return 0; } GLOBAL(int) -jsimd_can_idct_ifast (void) +jsimd_can_idct_ifast(void) { return 0; } GLOBAL(int) -jsimd_can_idct_float (void) +jsimd_can_idct_float(void) { return 0; } GLOBAL(void) -jsimd_idct_islow (j_decompress_ptr cinfo, jpeg_component_info *compptr, - JCOEFPTR coef_block, JSAMPARRAY output_buf, - JDIMENSION output_col) +jsimd_idct_islow(j_decompress_ptr cinfo, jpeg_component_info *compptr, + JCOEFPTR coef_block, JSAMPARRAY output_buf, + JDIMENSION output_col) { } GLOBAL(void) -jsimd_idct_ifast (j_decompress_ptr cinfo, jpeg_component_info *compptr, - JCOEFPTR coef_block, JSAMPARRAY output_buf, - JDIMENSION output_col) +jsimd_idct_ifast(j_decompress_ptr cinfo, jpeg_component_info *compptr, + JCOEFPTR coef_block, JSAMPARRAY output_buf, + JDIMENSION output_col) { } GLOBAL(void) -jsimd_idct_float (j_decompress_ptr cinfo, jpeg_component_info *compptr, - JCOEFPTR coef_block, JSAMPARRAY output_buf, - JDIMENSION output_col) +jsimd_idct_float(j_decompress_ptr cinfo, jpeg_component_info *compptr, + JCOEFPTR coef_block, JSAMPARRAY output_buf, + JDIMENSION output_col) { } GLOBAL(int) -jsimd_can_huff_encode_one_block (void) +jsimd_can_huff_encode_one_block(void) { return 0; } -GLOBAL(JOCTET*) -jsimd_huff_encode_one_block (void *state, JOCTET *buffer, JCOEFPTR block, - int last_dc_val, c_derived_tbl *dctbl, - c_derived_tbl *actbl) +GLOBAL(JOCTET *) +jsimd_huff_encode_one_block(void *state, JOCTET *buffer, JCOEFPTR block, + int last_dc_val, c_derived_tbl *dctbl, + c_derived_tbl *actbl) { return NULL; } + +GLOBAL(int) +jsimd_can_encode_mcu_AC_first_prepare(void) +{ + return 0; +} + +GLOBAL(void) +jsimd_encode_mcu_AC_first_prepare(const JCOEF *block, + const int *jpeg_natural_order_start, int Sl, + int Al, JCOEF *values, size_t *zerobits) +{ +} + +GLOBAL(int) +jsimd_can_encode_mcu_AC_refine_prepare(void) +{ + return 0; +} + +GLOBAL(int) +jsimd_encode_mcu_AC_refine_prepare(const JCOEF *block, + const int *jpeg_natural_order_start, int Sl, + int Al, JCOEF *absvalues, size_t *bits) +{ + return 0; +} |