Index: source/libvpx/test/consistency_test.cc |
diff --git a/source/libvpx/test/consistency_test.cc b/source/libvpx/test/consistency_test.cc |
index db247a3f0b9e4cc0e62fa4f41908f115399d98e5..9c2fd55084f8165fec7d87ecac75e7bc361b66fd 100644 |
--- a/source/libvpx/test/consistency_test.cc |
+++ b/source/libvpx/test/consistency_test.cc |
@@ -23,11 +23,11 @@ |
#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, |
@@ -65,7 +65,7 @@ class ConsistencyTestBase : public ::testing::Test { |
vpx_free(reference_data_[1]); |
reference_data_[1] = NULL; |
- delete ssim_array_; |
+ delete[] ssim_array_; |
} |
virtual void TearDown() { |
@@ -144,7 +144,7 @@ class ConsistencyVP9Test |
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); |
} |