diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-09-04 14:27:04 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-09-04 14:27:04 -0700 |
| commit | 0f0382af461874344bcacdacedc105326cc5714a (patch) | |
| tree | 172880151c49004e1671fce365382899d8d3bfc4 /test | |
| parent | 7ba600dc894543c04996f7692042026ae0db165b (diff) | |
| parent | 202edb3d23f50609d0d4ee9d41a61b6c6a9a7df5 (diff) | |
| download | libvpx-0f0382af461874344bcacdacedc105326cc5714a.tar libvpx-0f0382af461874344bcacdacedc105326cc5714a.tar.gz libvpx-0f0382af461874344bcacdacedc105326cc5714a.tar.bz2 libvpx-0f0382af461874344bcacdacedc105326cc5714a.zip | |
Merge "Actually resetting random generator for all variance test cases."
Diffstat (limited to 'test')
| -rw-r--r-- | test/variance_test.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/test/variance_test.cc b/test/variance_test.cc index 925ff03af..b1354703d 100644 --- a/test/variance_test.cc +++ b/test/variance_test.cc @@ -88,7 +88,7 @@ class VarianceTest height_ = 1 << log2height_; variance_ = get<2>(params); - rnd(ACMRandom::DeterministicSeed()); + rnd_.Reset(ACMRandom::DeterministicSeed()); block_size_ = width_ * height_; src_ = reinterpret_cast<uint8_t *>(vpx_memalign(16, block_size_)); ref_ = new uint8_t[block_size_]; @@ -107,7 +107,7 @@ class VarianceTest void RefTest(); void OneQuarterTest(); - ACMRandom rnd; + ACMRandom rnd_; uint8_t* src_; uint8_t* ref_; int width_, log2width_; @@ -135,8 +135,8 @@ template<typename VarianceFunctionType> void VarianceTest<VarianceFunctionType>::RefTest() { for (int i = 0; i < 10; ++i) { for (int j = 0; j < block_size_; j++) { - src_[j] = rnd.Rand8(); - ref_[j] = rnd.Rand8(); + src_[j] = rnd_.Rand8(); + ref_[j] = rnd_.Rand8(); } unsigned int sse1, sse2; unsigned int var1; @@ -206,7 +206,7 @@ class SubpelVarianceTest height_ = 1 << log2height_; subpel_variance_ = get<2>(params); - rnd(ACMRandom::DeterministicSeed()); + rnd_.Reset(ACMRandom::DeterministicSeed()); block_size_ = width_ * height_; src_ = reinterpret_cast<uint8_t *>(vpx_memalign(16, block_size_)); sec_ = reinterpret_cast<uint8_t *>(vpx_memalign(16, block_size_)); @@ -226,7 +226,7 @@ class SubpelVarianceTest protected: void RefTest(); - ACMRandom rnd; + ACMRandom rnd_; uint8_t *src_; uint8_t *ref_; uint8_t *sec_; @@ -241,10 +241,10 @@ void SubpelVarianceTest<SubpelVarianceFunctionType>::RefTest() { for (int x = 0; x < 16; ++x) { for (int y = 0; y < 16; ++y) { for (int j = 0; j < block_size_; j++) { - src_[j] = rnd.Rand8(); + src_[j] = rnd_.Rand8(); } for (int j = 0; j < block_size_ + width_ + height_ + 1; j++) { - ref_[j] = rnd.Rand8(); + ref_[j] = rnd_.Rand8(); } unsigned int sse1, sse2; unsigned int var1; @@ -263,11 +263,11 @@ void SubpelVarianceTest<vp9_subp_avg_variance_fn_t>::RefTest() { for (int x = 0; x < 16; ++x) { for (int y = 0; y < 16; ++y) { for (int j = 0; j < block_size_; j++) { - src_[j] = rnd.Rand8(); - sec_[j] = rnd.Rand8(); + src_[j] = rnd_.Rand8(); + sec_[j] = rnd_.Rand8(); } for (int j = 0; j < block_size_ + width_ + height_ + 1; j++) { - ref_[j] = rnd.Rand8(); + ref_[j] = rnd_.Rand8(); } unsigned int sse1, sse2; unsigned int var1; |