From ebd58089701345426a474e3288ff9484c85a85c4 Mon Sep 17 00:00:00 2001
From: Yaowu Xu <yaowu@google.com>
Date: Fri, 1 Feb 2013 11:02:42 -0800
Subject: [PATCH] enable 16x16 iDCT unit test
test for forward transform will be enabled later after re-do forward
transform
Change-Id: Ie7c7cf88baf7ecbebbe52fe027e1c3b33d3b9d49
---
test/dct16x16_test.cc | 22 ++++++++--------------
test/test.mk | 2 +-
2 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/test/dct16x16_test.cc b/test/dct16x16_test.cc
index 64bf0bbf6a..a4f1f8d731 100644
--- a/test/dct16x16_test.cc
+++ b/test/dct16x16_test.cc
@@ -15,7 +15,7 @@
#include "third_party/googletest/src/include/gtest/gtest.h"
extern "C" {
-#include "vp9/common/entropy.h"
+#include "vp9/common/vp9_entropy.h"
#include "vp9_rtcd.h"
}
@@ -278,18 +278,10 @@ TEST(VP9Idct16x16Test, AccuracyCheck) {
<< "Error: 16x16 IDCT has error " << error
<< " at index " << j;
}
-
- vp9_short_fdct16x16_c(in, out_c, 32);
- for (int j = 0; j < 256; ++j) {
- const double diff = coeff[j] - out_c[j];
- const double error = diff * diff;
- EXPECT_GE(1.0, error)
- << "Error: 16x16 FDCT has error " << error
- << " at index " << j;
- }
}
}
-
+#if 0
+// we need enable fdct test once we re-do the 16 point fdct.
TEST(VP9Fdct16x16Test, AccuracyCheck) {
ACMRandom rnd(ACMRandom::DeterministicSeed());
int max_error = 0;
@@ -318,10 +310,10 @@ TEST(VP9Fdct16x16Test, AccuracyCheck) {
}
EXPECT_GE(1, max_error)
- << "Error: 16x16 FDCT/IDCT has an individual roundtrip error > 1";
+ << "Error: 16x16 FDCT/IDCT has an individual round trip error > 1";
- EXPECT_GE(count_test_block/10, total_error)
- << "Error: 16x16 FDCT/IDCT has average roundtrip error > 1/10 per block";
+ EXPECT_GE(count_test_block , total_error)
+ << "Error: 16x16 FDCT/IDCT has average round trip error > 1 per block";
}
TEST(VP9Fdct16x16Test, CoeffSizeCheck) {
@@ -353,4 +345,6 @@ TEST(VP9Fdct16x16Test, CoeffSizeCheck) {
}
}
}
+#endif
+
} // namespace
diff --git a/test/test.mk b/test/test.mk
index f275a47f2b..2ad9f1bad9 100644
--- a/test/test.mk
+++ b/test/test.mk
@@ -70,7 +70,7 @@ endif
LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += fdct4x4_test.cc
LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += fdct8x8_test.cc
-#LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += dct16x16_test.cc
+LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += dct16x16_test.cc
LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += variance_test.cc
LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += dct32x32_test.cc
--
GitLab