diff options
| author | Johann Koenig <johannkoenig@google.com> | 2017-08-14 20:52:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-08-14 20:52:52 +0000 |
| commit | ff184e482a616af575f060238de48e588e4bda7e (patch) | |
| tree | 9531e24bdcb4838d9261c4b2932a389eeb64f080 /test | |
| parent | 45b39750d6a5c68cba5c03f0780e37c6d57b8c63 (diff) | |
| parent | 357adb68b21c825475e8f8142d66797bd8a8c5b4 (diff) | |
| download | libvpx-ff184e482a616af575f060238de48e588e4bda7e.tar libvpx-ff184e482a616af575f060238de48e588e4bda7e.tar.gz libvpx-ff184e482a616af575f060238de48e588e4bda7e.tar.bz2 libvpx-ff184e482a616af575f060238de48e588e4bda7e.zip | |
Merge changes I4b4beab1,I02f74dec
* changes:
quantize test: check skip_block
quantize test: use negative input
Diffstat (limited to 'test')
| -rw-r--r-- | test/vp9_quantize_test.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/test/vp9_quantize_test.cc b/test/vp9_quantize_test.cc index 7a73f207e..903958959 100644 --- a/test/vp9_quantize_test.cc +++ b/test/vp9_quantize_test.cc @@ -141,7 +141,9 @@ TEST_P(VP9QuantizeTest, OperationCheck) { uint16_t eob, ref_eob; for (int i = 0; i < number_of_iterations; ++i) { - const int skip_block = i == 0; + // Test skip block for the first three iterations to catch all the different + // sizes. + const int skip_block = i < 3; TX_SIZE sz; if (max_size_ == 16) { sz = (TX_SIZE)(i % 3); // TX_4X4, TX_8X8 TX_16X16 @@ -151,7 +153,7 @@ TEST_P(VP9QuantizeTest, OperationCheck) { const TX_TYPE tx_type = (TX_TYPE)((i >> 2) % 3); const scan_order *scan_order = &vp9_scan_orders[sz][tx_type]; const int count = (4 << sz) * (4 << sz); // 16, 64, 256 - coeff.Set(&rnd, 0, max_value_); + coeff.Set(&rnd, -max_value_, max_value_); GenerateHelperArrays(&rnd, zbin_ptr_, round_ptr_, quant_ptr_, quant_shift_ptr_, dequant_ptr_); @@ -195,7 +197,7 @@ TEST_P(VP9QuantizeTest, EOBCheck) { uint16_t eob, ref_eob; for (int i = 0; i < number_of_iterations; ++i) { - int skip_block = i == 0; + int skip_block = i < 3; TX_SIZE sz; if (max_size_ == 16) { sz = (TX_SIZE)(i % 3); // TX_4X4, TX_8X8 TX_16X16 @@ -207,8 +209,10 @@ TEST_P(VP9QuantizeTest, EOBCheck) { int count = (4 << sz) * (4 << sz); // 16, 64, 256 // Two random entries coeff.Set(0); - coeff.TopLeftPixel()[rnd(count)] = rnd.RandRange(max_value_); - coeff.TopLeftPixel()[rnd(count)] = rnd.RandRange(max_value_); + coeff.TopLeftPixel()[rnd(count)] = + rnd.RandRange(max_value_ * 2) - max_value_; + coeff.TopLeftPixel()[rnd(count)] = + rnd.RandRange(max_value_ * 2) - max_value_; GenerateHelperArrays(&rnd, zbin_ptr_, round_ptr_, quant_ptr_, quant_shift_ptr_, dequant_ptr_); |