diff options
author | scroggo <scroggo@chromium.org> | 2015-08-07 12:49:16 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-07 12:49:16 -0700 |
commit | 0575d3e6c272744a66ab3281f9871366717df339 (patch) | |
tree | 1a121e37ecbd7cf5b63fd3647b05c115ef2128ac /gyp | |
parent | 2771b5617c0440de2e8b3a024e367553e8a99d70 (diff) |
Update libwebp and resume testing scaled webp
libwebp has a fix for [1]. Update to the commit that contains the fix.
Update libwebp.gypi, corresponding to libwebp's latest makefile.
Turn back on DM testing for scaled webp, now that it should no longer
use uninitialized memory.
Fix a warning in config.h
[1] https://code.google.com/p/webp/issues/detail?id=254
BUG=skia:4038
Review URL: https://codereview.chromium.org/1280073002
Diffstat (limited to 'gyp')
-rw-r--r-- | gyp/libwebp.gyp | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/gyp/libwebp.gyp b/gyp/libwebp.gyp index fc6f46c309..0122be6a8c 100644 --- a/gyp/libwebp.gyp +++ b/gyp/libwebp.gyp @@ -66,18 +66,33 @@ ], 'sources': [ '../third_party/externals/libwebp/src/dsp/alpha_processing.c', + '../third_party/externals/libwebp/src/dsp/alpha_processing_mips_dsp_r2.c', '../third_party/externals/libwebp/src/dsp/alpha_processing_sse2.c', + '../third_party/externals/libwebp/src/dsp/alpha_processing_sse41.c', '../third_party/externals/libwebp/src/dsp/cpu.c', '../third_party/externals/libwebp/src/dsp/dec.c', '../third_party/externals/libwebp/src/dsp/dec_clip_tables.c', + '../third_party/externals/libwebp/src/dsp/dec_mips32.c', + '../third_party/externals/libwebp/src/dsp/dec_mips_dsp_r2.c', '../third_party/externals/libwebp/src/dsp/dec_sse2.c', + '../third_party/externals/libwebp/src/dsp/dec_sse41.c', '../third_party/externals/libwebp/src/dsp/enc.c', '../third_party/externals/libwebp/src/dsp/enc_sse2.c', + '../third_party/externals/libwebp/src/dsp/filters.c', + '../third_party/externals/libwebp/src/dsp/filters_mips_dsp_r2.c', + '../third_party/externals/libwebp/src/dsp/filters_sse2.c', '../third_party/externals/libwebp/src/dsp/lossless.c', + '../third_party/externals/libwebp/src/dsp/lossless_mips_dsp_r2.c', '../third_party/externals/libwebp/src/dsp/lossless_sse2.c', + '../third_party/externals/libwebp/src/dsp/rescaler.c', + '../third_party/externals/libwebp/src/dsp/rescaler_mips32.c', + '../third_party/externals/libwebp/src/dsp/rescaler_mips_dsp_r2.c', '../third_party/externals/libwebp/src/dsp/upsampling.c', + '../third_party/externals/libwebp/src/dsp/upsampling_mips_dsp_r2.c', '../third_party/externals/libwebp/src/dsp/upsampling_sse2.c', '../third_party/externals/libwebp/src/dsp/yuv.c', + '../third_party/externals/libwebp/src/dsp/yuv_mips32.c', + '../third_party/externals/libwebp/src/dsp/yuv_mips_dsp_r2.c', '../third_party/externals/libwebp/src/dsp/yuv_sse2.c', ], 'cflags': [ '-w' ], @@ -121,6 +136,35 @@ ], }, { + 'target_name': 'libwebp_dsp_enc', + 'type': 'static_library', + 'includes': [ + 'libwebp_skia.gypi', + ], + 'include_dirs': [ + '../third_party/externals/libwebp', + ], + 'sources': [ + '../third_party/externals/libwebp/src/dsp/argb.c', + '../third_party/externals/libwebp/src/dsp/argb_mips_dsp_r2.c', + '../third_party/externals/libwebp/src/dsp/argb_sse2.c', + '../third_party/externals/libwebp/src/dsp/cost.c', + '../third_party/externals/libwebp/src/dsp/cost_mips32.c', + '../third_party/externals/libwebp/src/dsp/cost_mips_dsp_r2.c', + '../third_party/externals/libwebp/src/dsp/cost_sse2.c', + '../third_party/externals/libwebp/src/dsp/enc_avx2.c', + '../third_party/externals/libwebp/src/dsp/enc_mips32.c', + '../third_party/externals/libwebp/src/dsp/enc_mips_dsp_r2.c', + '../third_party/externals/libwebp/src/dsp/enc_sse41.c', + '../third_party/externals/libwebp/src/dsp/lossless_enc.c', + '../third_party/externals/libwebp/src/dsp/lossless_enc_mips32.c', + '../third_party/externals/libwebp/src/dsp/lossless_enc_mips_dsp_r2.c', + '../third_party/externals/libwebp/src/dsp/lossless_enc_neon.c', + '../third_party/externals/libwebp/src/dsp/lossless_enc_sse2.c', + '../third_party/externals/libwebp/src/dsp/lossless_enc_sse41.c', + ], + }, + { 'target_name': 'libwebp_enc', 'type': 'static_library', 'includes': [ @@ -129,6 +173,9 @@ 'include_dirs': [ '../third_party/externals/libwebp', ], + 'dependencies' : [ + 'libwebp_dsp_enc', + ], 'sources': [ '../third_party/externals/libwebp/src/enc/alpha.c', '../third_party/externals/libwebp/src/enc/analysis.c', @@ -139,8 +186,12 @@ '../third_party/externals/libwebp/src/enc/frame.c', '../third_party/externals/libwebp/src/enc/histogram.c', '../third_party/externals/libwebp/src/enc/iterator.c', + '../third_party/externals/libwebp/src/enc/near_lossless.c', '../third_party/externals/libwebp/src/enc/picture.c', '../third_party/externals/libwebp/src/enc/picture_csp.c', + '../third_party/externals/libwebp/src/enc/picture_psnr.c', + '../third_party/externals/libwebp/src/enc/picture_rescale.c', + '../third_party/externals/libwebp/src/enc/picture_tools.c', '../third_party/externals/libwebp/src/enc/quant.c', '../third_party/externals/libwebp/src/enc/syntax.c', '../third_party/externals/libwebp/src/enc/token.c', |