commit b8371ff304d1da08c835792d7083510db2130722
author Wan-Teh Chang <wtc@google.com> Fri Jun 02 09:56:14 2023 -0700
committer Wan-Teh Chang <wtc@google.com> Fri Jun 02 13:33:02 2023 -0700
tree 37ac48d146d81433ff63524ebb958ad3d580ed4d
parent 85d24962204868c7a20cda613168e3b7e49e3391

av1_fwd/inv_txfm1d_test.cc: Standardize var names

The original motivation for this CL is to fix a -Wshadow warning in
av1_fwd_txfm1d_test.cc. While choosing a new name for the loop index
variable, I decided to use the same name that is used in similar loops
elsewhere. In libaom and libvpx, the most common index variable name
used with `count_test_block` is `i`, so I standardize on `i`.

In these two files, standardize on the variable name `txfm_size` for an
element of the txfm_size_ls array, and standardize on the index variable
name `ni` with `txfm_size`.

Bug: aomedia:3450
Change-Id: I98ea71a2f2014a7507af6e5ae8cf6015c3fc23a8

test/av1_fwd_txfm1d_test.cc

diff --git a/test/av1_fwd_txfm1d_test.cc b/test/av1_fwd_txfm1d_test.cc
index df504ea..885a6db 100644
--- a/test/av1_fwd_txfm1d_test.cc
+++ b/test/av1_fwd_txfm1d_test.cc
@@ -84,7 +84,7 @@
 
       const int count_test_block = 5000;
       if (fwd_txfm_func != nullptr) {
-        for (int ti = 0; ti < count_test_block; ++ti) {
+        for (int i = 0; i < count_test_block; ++i) {
           for (int ni = 0; ni < txfm_size; ++ni) {
             input[ni] = rnd.Rand16() % input_base - rnd.Rand16() % input_base;
             ref_input[ni] = static_cast<double>(input[ni]);

test/av1_inv_txfm1d_test.cc

diff --git a/test/av1_inv_txfm1d_test.cc b/test/av1_inv_txfm1d_test.cc
index ab8a6f8..e70b22a 100644
--- a/test/av1_inv_txfm1d_test.cc
+++ b/test/av1_inv_txfm1d_test.cc
@@ -73,31 +73,31 @@
   const int max_error[] = { 6, 10, 19, 31, 40 };
   ASSERT_EQ(NELEMENTS(max_error), TX_SIZES);
   ASSERT_EQ(NELEMENTS(inv_txfm_func_ls), TX_SIZES);
-  for (int k = 0; k < count_test_block; ++k) {
+  for (int i = 0; i < count_test_block; ++i) {
     // choose a random transform to test
     const TxSize tx_size = static_cast<TxSize>(rnd.Rand8() % TX_SIZES);
-    const int tx_size_pix = txfm_size_ls[tx_size];
+    const int txfm_size = txfm_size_ls[tx_size];
     const TxfmFunc inv_txfm_func = inv_txfm_func_ls[tx_size][0];
 
     int32_t input[64];
-    random_matrix(input, tx_size_pix, &rnd);
+    random_matrix(input, txfm_size, &rnd);
 
     // 64x64 transform assumes last 32 values are zero.
     memset(input + 32, 0, 32 * sizeof(input[0]));
 
     int32_t ref_output[64];
     memset(ref_output, 0, sizeof(ref_output));
-    reference_idct_1d_int(input, ref_output, tx_size_pix);
+    reference_idct_1d_int(input, ref_output, txfm_size);
 
     int32_t output[64];
     memset(output, 0, sizeof(output));
     inv_txfm_func(input, output, cos_bit, range_bit);
 
-    for (int i = 0; i < tx_size_pix; ++i) {
-      EXPECT_LE(abs(output[i] - ref_output[i]), max_error[tx_size])
-          << "tx_size = " << tx_size << ", i = " << i
-          << ", output[i] = " << output[i]
-          << ", ref_output[i] = " << ref_output[i];
+    for (int ni = 0; ni < txfm_size; ++ni) {
+      EXPECT_LE(abs(output[ni] - ref_output[ni]), max_error[tx_size])
+          << "tx_size = " << tx_size << ", ni = " << ni
+          << ", output[ni] = " << output[ni]
+          << ", ref_output[ni] = " << ref_output[ni];
     }
   }
 }
@@ -129,7 +129,7 @@
       if (!fwd_txfm_func) continue;
 
       const int count_test_block = 5000;
-      for (int ci = 0; ci < count_test_block; ++ci) {
+      for (int i = 0; i < count_test_block; ++i) {
         int32_t input[64];
         int32_t output[64];
         int32_t round_trip_output[64];