libwebp: update to 0.5.0

third_party/libwebp/libwebp.gyp

Index: third_party/libwebp/libwebp.gyp
diff --git a/third_party/libwebp/libwebp.gyp b/third_party/libwebp/libwebp.gyp
index 99ce5a81b43aa9442e0c507ff5611bdb12e76384..f6047be196be43cf1449ca3ada9896c4bf5d2277 100644
--- a/third_party/libwebp/libwebp.gyp
+++ b/third_party/libwebp/libwebp.gyp
@@ -43,32 +43,111 @@
       'include_dirs': ['.'],
       'sources': [
         'dsp/alpha_processing.c',
-        'dsp/alpha_processing_sse2.c',
+        'dsp/alpha_processing_mips_dsp_r2.c',
+        'dsp/argb.c',
+        'dsp/argb_mips_dsp_r2.c',
+        'dsp/cost.c',
+        'dsp/cost_mips32.c',
+        'dsp/cost_mips_dsp_r2.c',
         'dsp/cpu.c',
         'dsp/dec.c',
         'dsp/dec_clip_tables.c',
         'dsp/dec_mips32.c',
-        'dsp/dec_sse2.c',
+        'dsp/dec_mips_dsp_r2.c',
         'dsp/enc.c',
         'dsp/enc_avx2.c',
         'dsp/enc_mips32.c',
-        'dsp/enc_sse2.c',
+        'dsp/enc_mips_dsp_r2.c',
+        'dsp/filters.c',
+        'dsp/filters_mips_dsp_r2.c',
         'dsp/lossless.c',
-        'dsp/lossless_mips32.c',
-        'dsp/lossless_sse2.c',
+        'dsp/lossless_enc.c',
+        'dsp/lossless_enc_mips32.c',
+        'dsp/lossless_enc_mips_dsp_r2.c',
+        'dsp/lossless_mips_dsp_r2.c',
+        'dsp/rescaler.c',
+        'dsp/rescaler_mips32.c',
+        'dsp/rescaler_mips_dsp_r2.c',
         'dsp/upsampling.c',
-        'dsp/upsampling_sse2.c',
+        'dsp/upsampling_mips_dsp_r2.c',
         'dsp/yuv.c',
         'dsp/yuv_mips32.c',
-        'dsp/yuv_sse2.c',
+        'dsp/yuv_mips_dsp_r2.c',
       ],
       'dependencies' : [
+        'libwebp_dsp_sse2',
+        'libwebp_dsp_sse41',
         'libwebp_utils',
       ],
       'conditions': [
         ['OS == "android"', {
           'dependencies': [ '../../build/android/ndk.gyp:cpu_features' ],
         }],
+        ['target_arch=="ia32" or target_arch=="x64"', {
+          'defines': [ 'WEBP_HAVE_SSE2', 'WEBP_HAVE_SSE41' ],
+        }],
+        ['order_profiling != 0', {
+          'target_conditions' : [
+            ['_toolset=="target"', {
+              'cflags!': [ '-finstrument-functions' ],
+            }],
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'libwebp_dsp_sse2',
+      'type': 'static_library',
+      'include_dirs': ['.'],
+      'sources': [
+        'dsp/alpha_processing_sse2.c',
+        'dsp/argb_sse2.c',
+        'dsp/cost_sse2.c',
+        'dsp/dec_sse2.c',
+        'dsp/enc_sse2.c',
+        'dsp/filters_sse2.c',
+        'dsp/lossless_enc_sse2.c',
+        'dsp/lossless_sse2.c',
+        'dsp/rescaler_sse2.c',
+        'dsp/upsampling_sse2.c',
+        'dsp/yuv_sse2.c',
+      ],
+      'conditions': [
+        ['(target_arch=="ia32" or target_arch=="x64") and msan==0', {
+          'cflags': [ '-msse2', ],

[urvang, 2015/12/28 19:50:36]

Shouldn't this be using "defines"?

[jzern, 2015/12/29 00:16:17]

Do you mean add one for WEBP_HAVE_SSE2? It isn't strictly necessary, the final
check is done on WEBP_USE_SSE2 which is set if HAVE_SSE2 is present or __SSE2__.
If I add it then in the sse4 path there will be 2 instances for each condition.

[urvang, 2015/12/29 00:29:22]

I was actually looking at this diff:
https://codereview.chromium.org/1546003002/diff2/40001:50001/third_party/libw...

I see that at line#87, 'cflags' and 'xcode_settings' combo was replaced by
'defines' (based on Nico's suggestion earlier).

So my question was: shouldn't the same replacement happen in this line as well?

[jzern, 2015/12/29 17:33:39]

we still want the machine flags, though they aren't strictly necessary for sse2;
I left them to be consistent with the sse4 section. for these modules we want
the instruction set enabled, the code will be built due to the presence of
__SSE2__ thanks to the -m.

+          'xcode_settings': { 'OTHER_CFLAGS': [ '-msse2' ] },
+        }],
+        ['order_profiling != 0', {
+          'target_conditions' : [
+            ['_toolset=="target"', {
+              'cflags!': [ '-finstrument-functions' ],
+            }],
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'libwebp_dsp_sse41',
+      'type': 'static_library',
+      'include_dirs': ['.'],
+      'sources': [
+        'dsp/alpha_processing_sse41.c',
+        'dsp/dec_sse41.c',
+        'dsp/enc_sse41.c',
+        'dsp/lossless_enc_sse41.c',
+      ],
+      'conditions': [
+        ['OS=="win" and clang==1', {
+          # cl.exe's /arch flag doesn't have a setting for SSSE3/4, and cl.exe
+          # doesn't need it for intrinsics. clang-cl does need it, though.
+          'msvs_settings': {
+            'VCCLCompilerTool': { 'AdditionalOptions': [ '-msse4.1' ] },
+          },
+        }],
+        ['(target_arch=="ia32" or target_arch=="x64") and msan==0', {
+          'cflags': [ '-msse4.1', ],

[urvang, 2015/12/28 19:50:36]

And this too?

[jzern, 2015/12/29 17:33:39]

this one was the source of the revert. we detected clang-cl as an msvc build and
tried to include the instrinsics, but clang (and gcc) need this to enable the
instructions (msvc itself only requires /arch for AVX/AVX2.

+          'xcode_settings': { 'OTHER_CFLAGS': [ '-msse4.1' ] },
+        }],
         ['order_profiling != 0', {
           'target_conditions' : [
             ['_toolset=="target"', {
@@ -95,7 +174,9 @@
           'sources': [
             'dsp/dec_neon.c',
             'dsp/enc_neon.c',
+            'dsp/lossless_enc_neon.c',
             'dsp/lossless_neon.c',
+            'dsp/rescaler_neon.c',
             'dsp/upsampling_neon.c',
           ],
           'conditions': [
@@ -131,10 +212,12 @@
         'enc/backward_references.c',
         'enc/config.c',
         'enc/cost.c',
+        'enc/delta_palettization.c',
         'enc/filter.c',
         'enc/frame.c',
         'enc/histogram.c',
         'enc/iterator.c',
+        'enc/near_lossless.c',
         'enc/picture.c',
         'enc/picture_csp.c',
         'enc/picture_psnr.c',
@@ -175,14 +258,6 @@
           '-Wno-incompatible-pointer-types',
         ]
       },
-      'direct_dependent_settings': {
-        'variables': {
-          'clang_warning_flags': [
-            # See https://code.google.com/p/webp/issues/detail?id=253.
-            '-Wno-incompatible-pointer-types',
-          ]
-        },
-      },
     },
     {
       'target_name': 'libwebp',