Format clean-ups in transform experiments

Change-Id: Ib2843cb03ae452ce9fec3a94c709431ea0202d8b

diff --git a/vp10/encoder/encodeframe.c b/vp10/encoder/encodeframe.c
index ed5600671a1e1ad52b56da723f2b16f05f06226a..41a697f1e8c7f40a967309f0c6df7816db3fec87 100644 (file)
--- a/vp10/encoder/encodeframe.c
+++ b/vp10/encoder/encodeframe.c
@@ -3280,7 +3280,7 @@ static void rd_pick_partition(VP10_COMP *cpi, ThreadData *td,
 #if CONFIG_VAR_TX
           xd->above_txfm_context = cm->above_txfm_context + mi_col;
           xd->left_txfm_context =
-              xd->left_txfm_context_buffer + (mi_row & 0x07);
+              xd->left_txfm_context_buffer + (mi_row & MI_MASK);
           restore_context(x, mi_row, mi_col, a, l, sa, sl, ta, tl, bsize);
 #else
           restore_context(x, mi_row, mi_col, a, l, sa, sl, bsize);

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index 9e29ce6db024cbd96f8b5441629a21fde0b7e288..7ff886854337e03943d2e5ce8a9120fbe3017d67 100644 (file)
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -2752,9 +2752,9 @@ static void select_tx_type_yrd(const VP10_COMP *cpi, MACROBLOCK *x,
       }
     }
 #else  // CONFIG_EXT_TX
-      if (max_tx_size >= TX_32X32 && tx_type != DCT_DCT) {
+      if (max_tx_size >= TX_32X32 && tx_type != DCT_DCT)
         continue;
-      }
+
       mbmi->tx_type = tx_type;
 
       inter_block_yrd(cpi, x, &this_rate, &this_dist, &this_skip, &this_sse,
@@ -2783,9 +2783,7 @@ static void select_tx_type_yrd(const VP10_COMP *cpi, MACROBLOCK *x,
     if (is_inter && !xd->lossless[xd->mi[0]->mbmi.segment_id] && !this_skip)
       rd = VPXMIN(rd, RDCOST(x->rdmult, x->rddiv, s1, this_sse));
 
-    if (rd <
-        (is_inter && best_tx_type == DCT_DCT ? ext_tx_th : 1) *
-        best_rd) {
+    if (rd < (is_inter && best_tx_type == DCT_DCT ? ext_tx_th : 1) * best_rd) {
       best_rd = rd;
       *distortion = this_dist;
       *rate       = this_rate;