generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Actually resetting random generator for all variance test cases.

Browse Source 
Calling Reset(int) method instead of overloaded operator()(int).
Adding underscore at the end of class member name.

Change-Id: I01934e7bc056d4b594e5d05d693328febd34ac3c
This commit is contained in:
Dmitry Kovalev 2014-09-04 12:24:52 -07:00
parent f61e00c79d
commit 202edb3d23
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/variance_test.cc
View File

@ -88,7 +88,7 @@ class VarianceTest
height_ = 1 << log2height_; height_ = 1 << log2height_;
variance_ = get<2>(params); variance_ = get<2>(params);
rnd(ACMRandom::DeterministicSeed()); rnd_.Reset(ACMRandom::DeterministicSeed());
block_size_ = width_ * height_; block_size_ = width_ * height_;
src_ = reinterpret_cast<uint8_t *>(vpx_memalign(16, block_size_)); src_ = reinterpret_cast<uint8_t *>(vpx_memalign(16, block_size_));
ref_ = new uint8_t[block_size_]; ref_ = new uint8_t[block_size_];
@ -107,7 +107,7 @@ class VarianceTest
void RefTest(); void RefTest();
void OneQuarterTest(); void OneQuarterTest();
ACMRandom rnd; ACMRandom rnd_;
uint8_t* src_; uint8_t* src_;
uint8_t* ref_; uint8_t* ref_;
int width_, log2width_; int width_, log2width_;
@ -135,8 +135,8 @@ template<typename VarianceFunctionType>
void VarianceTest<VarianceFunctionType>::RefTest() { void VarianceTest<VarianceFunctionType>::RefTest() {
for (int i = 0; i < 10; ++i) { for (int i = 0; i < 10; ++i) {
for (int j = 0; j < block_size_; j++) { for (int j = 0; j < block_size_; j++) {
src_[j] = rnd.Rand8(); src_[j] = rnd_.Rand8();
ref_[j] = rnd.Rand8(); ref_[j] = rnd_.Rand8();
} }
unsigned int sse1, sse2; unsigned int sse1, sse2;
unsigned int var1; unsigned int var1;
@ -206,7 +206,7 @@ class SubpelVarianceTest
height_ = 1 << log2height_; height_ = 1 << log2height_;
subpel_variance_ = get<2>(params); subpel_variance_ = get<2>(params);
rnd(ACMRandom::DeterministicSeed()); rnd_.Reset(ACMRandom::DeterministicSeed());
block_size_ = width_ * height_; block_size_ = width_ * height_;
src_ = reinterpret_cast<uint8_t *>(vpx_memalign(16, block_size_)); src_ = reinterpret_cast<uint8_t *>(vpx_memalign(16, block_size_));
sec_ = 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: protected:
void RefTest(); void RefTest();
ACMRandom rnd; ACMRandom rnd_;
uint8_t *src_; uint8_t *src_;
uint8_t *ref_; uint8_t *ref_;
uint8_t *sec_; uint8_t *sec_;
@ -241,10 +241,10 @@ void SubpelVarianceTest<SubpelVarianceFunctionType>::RefTest() {
for (int x = 0; x < 16; ++x) { for (int x = 0; x < 16; ++x) {
for (int y = 0; y < 16; ++y) { for (int y = 0; y < 16; ++y) {
for (int j = 0; j < block_size_; j++) { 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++) { 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 sse1, sse2;
unsigned int var1; 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 x = 0; x < 16; ++x) {
for (int y = 0; y < 16; ++y) { for (int y = 0; y < 16; ++y) {
for (int j = 0; j < block_size_; j++) { for (int j = 0; j < block_size_; j++) {
src_[j] = rnd.Rand8(); src_[j] = rnd_.Rand8();
sec_[j] = rnd.Rand8(); sec_[j] = rnd_.Rand8();
} }
for (int j = 0; j < block_size_ + width_ + height_ + 1; j++) { 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 sse1, sse2;
unsigned int var1; unsigned int var1;