libwebp: update to v0.5.1

third_party/libwebp/enc/picture_psnr.c

 // Copyright 2014 Google Inc. All Rights Reserved.
 //
 // Use of this source code is governed by a BSD-style license
 // that can be found in the COPYING file in the root of the source
 // tree. An additional intellectual property rights grant can be found
 // in the file PATENTS. All contributing project authors may
 // be found in the AUTHORS file in the root of the source tree.
 // -----------------------------------------------------------------------------
 //
 // WebPPicture tools for measuring distortion
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
 #include <math.h>
 #include <stdlib.h>
 
 #include "./vp8enci.h"
 #include "../utils/utils.h"
 
 //------------------------------------------------------------------------------
 // local-min distortion
 //
 // For every pixel in the *reference* picture, we search for the local best
 // match in the compressed image. This is not a symmetrical measure.
 
 #define RADIUS 2  // search radius. Shouldn't be too large.
 
 static void AccumulateLSIM(const uint8_t* src, int src_stride,
                            const uint8_t* ref, int ref_stride,
-                           int w, int h, DistoStats* stats) {
+                           int w, int h, VP8DistoStats* stats) {
   int x, y;
   double total_sse = 0.;
   for (y = 0; y < h; ++y) {
     const int y_0 = (y - RADIUS < 0) ? 0 : y - RADIUS;
     const int y_1 = (y + RADIUS + 1 >= h) ? h : y + RADIUS + 1;
     for (x = 0; x < w; ++x) {
       const int x_0 = (x - RADIUS < 0) ? 0 : x - RADIUS;
       const int x_1 = (x + RADIUS + 1 >= w) ? w : x + RADIUS + 1;
       double best_sse = 255. * 255.;
       const double value = (double)ref[y * ref_stride + x];
@@ skipping 23 matching lines @@
 
 // Max value returned in case of exact similarity.
 static const double kMinDistortion_dB = 99.;
 static float GetPSNR(const double v) {
   return (float)((v > 0.) ? -4.3429448 * log(v / (255 * 255.))
                           : kMinDistortion_dB);
 }
 
 int WebPPictureDistortion(const WebPPicture* src, const WebPPicture* ref,
                           int type, float result[5]) {
-  DistoStats stats[5];
+  VP8DistoStats stats[5];
   int w, h;
 
   memset(stats, 0, sizeof(stats));
 
+  VP8SSIMDspInit();
+
   if (src == NULL || ref == NULL ||
       src->width != ref->width || src->height != ref->height ||
       src->use_argb != ref->use_argb || result == NULL) {
     return 0;
   }
   w = src->width;
   h = src->height;
 
   if (src->use_argb == 1) {
     if (src->argb == NULL || ref->argb == NULL) {
@@ skipping 77 matching lines @@
         result[c] = GetPSNR(v);
       }
       // Accumulate forward
       if (c < 4) VP8SSIMAddStats(&stats[c], &stats[4]);
     }
   }
   return 1;
 }
 
 //------------------------------------------------------------------------------