Revert some unneeded changes

Change-Id: Ic6754b1e8f19620980aa820d39f66c7a95f12d39

av1/common/common_data.h

diff --git a/av1/common/common_data.h b/av1/common/common_data.h
index eab324d..91fa24f 100644
--- a/av1/common/common_data.h
+++ b/av1/common/common_data.h
@@ -1309,6 +1309,7 @@
     ist_4x4_kernel[IST_SET_SIZE][STX_TYPES -
                                  1][IST_4x4_HEIGHT][IST_4x4_WIDTH] = {
       {
+          //  0
           {
               { 101, -45, -53, -6, -14, -3, -3, 19, 22, -2, 3, 8, 2, -5, -7,
                 -3 },
@@ -2036,7 +2037,7 @@
               { 2, 10, 15, -18, -44, -31, 8, 67, 54, -10, 7, 59, 32, 23, 10,
                 -1 },
           },
-      }
+      },
     };
 
 // IST 8x8 kernel

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index 2bf5831..6f1df99 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -1048,9 +1048,7 @@
   const TX_CLASS tx_class = tx_type_to_class[get_primary_tx_type(tx_type)];
 
 #if DEBUG_EXTQUANT
-  fprintf(cm->fEncCoeffLog, "ptx_type=%d, stx_set=%d, stx_type=%d, eob=%d\n",
-          get_primary_tx_type(tx_type), get_secondary_tx_set(tx_type),
-          get_secondary_tx_type(tx_type), eob);
+  fprintf(cm->fEncCoeffLog, "tx_type=%d, eob=%d\n", tx_type, eob);
 #endif
 
 #if !CONFIG_CONTEXT_DERIVATION
@@ -3872,11 +3870,11 @@
     const tran_low_t abs_dqc = abs(dqcoeff[ci]);
     int rate_low = 0;
     const int rate = get_two_coeff_cost_simple(
-        plane, ci, abs_qc, coeff_ctx, txb_costs, bwl, tx_class,
+        plane, ci, abs_qc, coeff_ctx, txb_costs, bwl,
 #if CONFIG_COEFF_HR_ADAPTIVE
-        levels, &rate_low, limits, *hr_level_avg, &hr_level);
+        tx_class, levels, &rate_low, limits, *hr_level_avg, &hr_level);
 #else
-        levels, &rate_low, limits);
+        tx_class, levels, &rate_low, limits);
 #endif  // CONFIG_COEFF_HR_ADAPTIVE
 
     if (abs_dqc < abs_tqc) {