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

Merge "buffer.h: incorrect RandRange results"

Browse Source
This commit is contained in:
James Zern 2017-07-02 03:48:53 +00:00 committed by Gerrit Code Review
commit 7d526c1654
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/buffer.h
View File

@ -73,8 +73,10 @@ class Buffer {
void Set(ACMRandom *rand_class, T (ACMRandom::*rand_func)()); void Set(ACMRandom *rand_class, T (ACMRandom::*rand_func)());
// Set the buffer (excluding padding) to the output of ACMRandom function // Set the buffer (excluding padding) to the output of ACMRandom function
// 'RandRange' with range 'low' to 'high' which must be within // 'RandRange' with range 'low' to 'high' which typically must be within
// testing::internal::Random::kMaxRange (1u << 31). // testing::internal::Random::kMaxRange (1u << 31). However, because we want
// to allow negative low (and high) values, it is restricted to INT32_MAX
// here.
void Set(ACMRandom *rand_class, const int32_t low, const int32_t high); void Set(ACMRandom *rand_class, const int32_t low, const int32_t high);
// Copy the contents of Buffer 'a' (excluding padding). // Copy the contents of Buffer 'a' (excluding padding).
@ -176,6 +178,7 @@ void Buffer<T>::Set(ACMRandom *rand_class, T (ACMRandom::*rand_func)()) {
} }
} }
// TODO(johannkoenig): Use T for low/high.
template <typename T> template <typename T>
void Buffer<T>::Set(ACMRandom *rand_class, const int32_t low, void Buffer<T>::Set(ACMRandom *rand_class, const int32_t low,
const int32_t high) { const int32_t high) {
@ -184,11 +187,18 @@ void Buffer<T>::Set(ACMRandom *rand_class, const int32_t low,
EXPECT_LE(low, high); EXPECT_LE(low, high);
EXPECT_GE(low, std::numeric_limits<T>::min()); EXPECT_GE(low, std::numeric_limits<T>::min());
EXPECT_LE(high, std::numeric_limits<T>::max()); EXPECT_LE(high, std::numeric_limits<T>::max());
EXPECT_LE(static_cast<int64_t>(high) - low,
std::numeric_limits<int32_t>::max());
T *src = TopLeftPixel(); T *src = TopLeftPixel();
for (int height = 0; height < height_; ++height) { for (int height = 0; height < height_; ++height) {
for (int width = 0; width < width_; ++width) { for (int width = 0; width < width_; ++width) {
src[width] = static_cast<T>((*rand_class).RandRange(high - low) + low); // 'low' will be promoted to unsigned given the return type of RandRange.
// Store the value as an int to avoid unsigned overflow warnings when
// 'low' is negative.
const int32_t value =
static_cast<int32_t>((*rand_class).RandRange(high - low));
src[width] = static_cast<T>(value + low);
} }
src += stride_; src += stride_;
} }