libvpx: Pull from upstream

source/libvpx/test/consistency_test.cc

 /*
  *  Copyright (c) 2012 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE 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.
  */
 
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "third_party/googletest/src/include/gtest/gtest.h"
 
 #include "./vpx_config.h"
 #if CONFIG_VP9_ENCODER
 #include "./vp9_rtcd.h"
 #endif
 
 #include "test/acm_random.h"
 #include "test/clear_system_state.h"
 #include "test/register_state_check.h"
 #include "test/util.h"
-#include "vp9/encoder/vp9_ssim.h"
+#include "vpx_dsp/ssim.h"
 #include "vpx_mem/vpx_mem.h"
 
 extern "C"
-double vp9_get_ssim_metrics(uint8_t *img1, int img1_pitch,
+double vpx_get_ssim_metrics(uint8_t *img1, int img1_pitch,
                             uint8_t *img2, int img2_pitch,
                             int width, int height,
                             Ssimv *sv2, Metrics *m,
                             int do_inconsistency);
 
 using libvpx_test::ACMRandom;
 
 namespace {
 class ConsistencyTestBase : public ::testing::Test {
  public:
@@ skipping 17 matching lines @@
   static void TearDownTestCase() {
     vpx_free(source_data_[0]);
     source_data_[0] = NULL;
     vpx_free(reference_data_[0]);
     reference_data_[0] = NULL;
     vpx_free(source_data_[1]);
     source_data_[1] = NULL;
     vpx_free(reference_data_[1]);
     reference_data_[1] = NULL;
 
-    delete ssim_array_;
+    delete[] ssim_array_;
   }
 
   virtual void TearDown() {
     libvpx_test::ClearSystemState();
   }
 
  protected:
   // Handle frames up to 640x480
   static const int kDataAlignment = 16;
   static const int kDataBufferSize = 640*480;
@@ skipping 58 matching lines @@
 class ConsistencyVP9Test
     : public ConsistencyTestBase,
       public ::testing::WithParamInterface<ConsistencyParam> {
  public:
   ConsistencyVP9Test() : ConsistencyTestBase(GET_PARAM(0), GET_PARAM(1)) {}
 
  protected:
   double CheckConsistency(int frame) {
     EXPECT_LT(frame, 2)<< "Frame to check has to be less than 2.";
     return
-        vp9_get_ssim_metrics(source_data_[frame], source_stride_,
+        vpx_get_ssim_metrics(source_data_[frame], source_stride_,
                              reference_data_[frame], reference_stride_,
                              width_, height_, ssim_array_, &metrics_, 1);
   }
 };
 #endif  // CONFIG_VP9_ENCODER
 
 uint8_t* ConsistencyTestBase::source_data_[2] = {NULL, NULL};
 uint8_t* ConsistencyTestBase::reference_data_[2] = {NULL, NULL};
 Ssimv* ConsistencyTestBase::ssim_array_ = NULL;
 
@@ skipping 57 matching lines @@
 const ConsistencyParam c_vp9_tests[] = {
   make_tuple(320, 240),
   make_tuple(318, 242),
   make_tuple(318, 238),
 };
 INSTANTIATE_TEST_CASE_P(C, ConsistencyVP9Test,
                         ::testing::ValuesIn(c_vp9_tests));
 #endif
 
 }  // namespace