commit 31780e6647ddd3b4b9b0c204ee700fe987d88b25
author JackyChen <jackychen@google.com> Fri Oct 10 10:04:22 2014 -0700
committer JackyChen <jackychen@google.com> Mon Oct 13 09:43:10 2014 -0700
tree 60eb8e96b26f56b27634c17b5b260d7b25344bb2
parent a62acf3c0ac35fc3763296f68dc02b23d65165ab

Code style change in unit test for VP8/VP9 denoiser.

Change-Id: If4b0aca18c8474dd2456900ae9681e74222e645f

test/vp9_denoiser_sse2_test.cc

diff --git a/test/vp9_denoiser_sse2_test.cc b/test/vp9_denoiser_sse2_test.cc
index edebc83..0ecba07 100644
--- a/test/vp9_denoiser_sse2_test.cc
+++ b/test/vp9_denoiser_sse2_test.cc
@@ -29,19 +29,18 @@
 namespace {
 
 const int kNumPixels = 64 * 64;
-class VP9DenoiserTest
-    : public ::testing::TestWithParam<int> {
+class VP9DenoiserTest : public ::testing::TestWithParam<BLOCK_SIZE> {
  public:
   virtual ~VP9DenoiserTest() {}
 
   virtual void SetUp() {
-    bs = (BLOCK_SIZE)GetParam();
+    bs_ = GetParam();
   }
 
   virtual void TearDown() { libvpx_test::ClearSystemState(); }
 
  protected:
-  BLOCK_SIZE bs;
+  BLOCK_SIZE bs_;
 };
 
 TEST_P(VP9DenoiserTest, BitexactCheck) {
@@ -60,8 +59,8 @@
 
   for (int i = 0; i < count_test_block; ++i) {
     // Generate random motion magnitude, 20% of which exceed the threshold.
-    uint8_t motion_magnitude_random
-              = rnd.Rand8() % (uint8_t)(MOTION_MAGNITUDE_THRESHOLD * 1.2);
+    const int motion_magnitude_random =
+        rnd.Rand8() % static_cast<int>(MOTION_MAGNITUDE_THRESHOLD * 1.2);
 
     // Initialize a test block with random number in range [0, 255].
     for (int j = 0; j < kNumPixels; ++j) {
@@ -69,23 +68,23 @@
       sig_block[j] = rnd.Rand8();
       // The pixels in mc_avg_block are generated by adding a random
       // number in range [-19, 19] to corresponding pixels in sig_block.
-      temp = sig_block[j] + (rnd.Rand8() % 2 == 0? -1 : 1) *
-             (rnd.Rand8()%20);
+      temp = sig_block[j] + ((rnd.Rand8() % 2 == 0) ? -1 : 1) *
+             (rnd.Rand8() % 20);
       // Clip.
-      mc_avg_block[j] = (temp < 0? 0 : (temp > 255? 255 : temp));
+      mc_avg_block[j] = (temp < 0) ? 0 : ((temp > 255) ? 255 : temp);
     }
 
-    ASM_REGISTER_STATE_CHECK(vp9_denoiser_filter_c(sig_block, 64,
-                             mc_avg_block, 64, avg_block_c, 64,
-                             0, bs, motion_magnitude_random));
+    ASM_REGISTER_STATE_CHECK(vp9_denoiser_filter_c(
+        sig_block, 64, mc_avg_block, 64, avg_block_c,
+        64, 0, bs_, motion_magnitude_random));
 
-    ASM_REGISTER_STATE_CHECK(vp9_denoiser_filter_sse2(sig_block, 64,
-                             mc_avg_block, 64, avg_block_sse2, 64,
-                             0, bs, motion_magnitude_random));
+    ASM_REGISTER_STATE_CHECK(vp9_denoiser_filter_sse2(
+        sig_block, 64, mc_avg_block, 64, avg_block_sse2,
+        64, 0, bs_, motion_magnitude_random));
 
     // Test bitexactness.
-    for (int h = 0; h < (4 << b_height_log2_lookup[bs]); ++h) {
-      for (int w = 0; w < (4 << b_width_log2_lookup[bs]); ++w) {
+    for (int h = 0; h < (4 << b_height_log2_lookup[bs_]); ++h) {
+      for (int w = 0; w < (4 << b_width_log2_lookup[bs_]); ++w) {
         EXPECT_EQ(avg_block_c[h * 64 + w], avg_block_sse2[h * 64 + w]);
       }
     }