Suggested by James Zern to clear out cpplint warnings for all unit test code.
Showing the changes to test/vp9_boolcoder_test.cc (1 of 27 files). Show all
Unified · Split
| @@ -19,7 +19,7 @@ extern "C" { · 18 unmodified lines | |||
| 19 | #include "vp9/decoder/vp9_dboolhuff.h" | 19 | #include "vp9/decoder/vp9_dboolhuff.h" |
| 20 | } | 20 | } |
| 21 | 21 | ||
| 22 | #include "acm_random.h" | 22 | #include "test/acm_random.h" |
| 23 | #include "vpx/vpx_integer.h" | 23 | #include "vpx/vpx_integer.h" |
| 24 | 24 | ||
| 25 | using libvpx_test::ACMRandom; | 25 | using libvpx_test::ACMRandom; |
| @@ -32,10 +32,10 @@ TEST(VP9, TestBitIO) { · 6 unmodified lines | |||
| 32 | ACMRandom rnd(ACMRandom::DeterministicSeed()); | 32 | ACMRandom rnd(ACMRandom::DeterministicSeed()); |
| 33 | for (int n = 0; n < num_tests; ++n) { | 33 | for (int n = 0; n < num_tests; ++n) { |
| 34 | for (int method = 0; method <= 7; ++method) { // we generate various proba | 34 | for (int method = 0; method <= 7; ++method) { // we generate various proba |
| 35 | const int bits_to_test = 1000; | 35 | const int kBitsToTest = 1000; |
| 36 | uint8_t probas[bits_to_test]; | 36 | uint8_t probas[kBitsToTest]; |
| 37 | 37 | ||
| 38 | for (int i = 0; i < bits_to_test; ++i) { | 38 | for (int i = 0; i < kBitsToTest; ++i) { |
| 39 | const int parity = i & 1; | 39 | const int parity = i & 1; |
| 40 | probas[i] = | 40 | probas[i] = |
| 41 | (method == 0) ? 0 : (method == 1) ? 255 : | 41 | (method == 0) ? 0 : (method == 1) ? 255 : |
| @@ -50,14 +50,14 @@ TEST(VP9, TestBitIO) { · 8 unmodified lines | |||
| 50 | } | 50 | } |
| 51 | for (int bit_method = 0; bit_method <= 3; ++bit_method) { | 51 | for (int bit_method = 0; bit_method <= 3; ++bit_method) { |
| 52 | const int random_seed = 6432; | 52 | const int random_seed = 6432; |
| 53 | const int buffer_size = 10000; | 53 | const int kBufferSize = 10000; |
| 54 | ACMRandom bit_rnd(random_seed); | 54 | ACMRandom bit_rnd(random_seed); |
| 55 | vp9_writer bw; | 55 | vp9_writer bw; |
| 56 | uint8_t bw_buffer[buffer_size]; | 56 | uint8_t bw_buffer[kBufferSize]; |
| 57 | vp9_start_encode(&bw, bw_buffer); | 57 | vp9_start_encode(&bw, bw_buffer); |
| 58 | 58 | ||
| 59 | int bit = (bit_method == 0) ? 0 : (bit_method == 1) ? 1 : 0; | 59 | int bit = (bit_method == 0) ? 0 : (bit_method == 1) ? 1 : 0; |
| 60 | for (int i = 0; i < bits_to_test; ++i) { | 60 | for (int i = 0; i < kBitsToTest; ++i) { |
| 61 | if (bit_method == 2) { | 61 | if (bit_method == 2) { |
| 62 | bit = (i & 1); | 62 | bit = (i & 1); |
| 63 | } else if (bit_method == 3) { | 63 | } else if (bit_method == 3) { |
| @@ -72,16 +72,16 @@ TEST(VP9, TestBitIO) { · 8 unmodified lines | |||
| 72 | GTEST_ASSERT_EQ(bw_buffer[0] & 0x80, 0); | 72 | GTEST_ASSERT_EQ(bw_buffer[0] & 0x80, 0); |
| 73 | 73 | ||
| 74 | vp9_reader br; | 74 | vp9_reader br; |
| 75 | vp9_reader_init(&br, bw_buffer, buffer_size); | 75 | vp9_reader_init(&br, bw_buffer, kBufferSize); |
| 76 | bit_rnd.Reset(random_seed); | 76 | bit_rnd.Reset(random_seed); |
| 77 | for (int i = 0; i < bits_to_test; ++i) { | 77 | for (int i = 0; i < kBitsToTest; ++i) { |
| 78 | if (bit_method == 2) { | 78 | if (bit_method == 2) { |
| 79 | bit = (i & 1); | 79 | bit = (i & 1); |
| 80 | } else if (bit_method == 3) { | 80 | } else if (bit_method == 3) { |
| 81 | bit = bit_rnd(2); | 81 | bit = bit_rnd(2); |
| 82 | } | 82 | } |
| 83 | GTEST_ASSERT_EQ(vp9_read(&br, probas[i]), bit) | 83 | GTEST_ASSERT_EQ(vp9_read(&br, probas[i]), bit) |
| 84 | << "pos: " << i << " / " << bits_to_test | 84 | << "pos: " << i << " / " << kBitsToTest |
| 85 | << " bit_method: " << bit_method | 85 | << " bit_method: " << bit_method |
| 86 | << " method: " << method; | 86 | << " method: " << method; |
| 87 | } | 87 | } |