commit 475581702dd678e29c64d1ceb7314c270ced1d15
author Jingning Han <jingning@google.com> Wed Jul 05 16:33:19 2017 -0700
committer Jingning Han <jingning@google.com> Thu Jul 06 17:00:02 2017 +0000
tree 48b97a372731802e82d7229831a878e3ba8fe597
parent 2f42d77824e145688bfcb8210eb3b8ec75a111da

Speed up txk search function

Remove unnecessary quantization and optimization steps.

Change-Id: I5be64b3a0860b553801c3136750e2050d367ec54

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index fc7e8b9..904b668 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -1869,6 +1869,7 @@
   TX_TYPE txk_end = TX_TYPES - 1;
   TX_TYPE best_tx_type = txk_start;
   int64_t best_rd = INT64_MAX;
+  uint8_t best_eob = 0;
   const int coeff_ctx = combine_entropy_contexts(*a, *l);
   RD_STATS best_rd_stats;
   TX_TYPE tx_type;
@@ -1910,20 +1911,22 @@
       best_rd = rd;
       best_rd_stats = this_rd_stats;
       best_tx_type = tx_type;
+      best_eob = x->plane[plane].txb_entropy_ctx[block];
     }
   }
 
   av1_merge_rd_stats(rd_stats, &best_rd_stats);
 
   if (plane == 0) mbmi->txk_type[block] = best_tx_type;
-  // TODO(angiebird): Instead of re-call av1_xform_quant and av1_optimize_b,
-  // copy the best result in the above tx_type search for loop
-  av1_xform_quant(cm, x, plane, block, blk_row, blk_col, plane_bsize, tx_size,
-                  coeff_ctx, AV1_XFORM_QUANT_FP);
-  av1_optimize_b(cm, x, plane, block, plane_bsize, tx_size, a, l);
+  x->plane[plane].txb_entropy_ctx[block] = best_eob;
+
   if (!is_inter_block(mbmi)) {
     // intra mode needs decoded result such that the next transform block
     // can use it for prediction.
+    av1_xform_quant(cm, x, plane, block, blk_row, blk_col, plane_bsize, tx_size,
+                    coeff_ctx, AV1_XFORM_QUANT_FP);
+    av1_optimize_b(cm, x, plane, block, plane_bsize, tx_size, a, l);
+
     av1_inverse_transform_block_facade(xd, plane, block, blk_row, blk_col,
                                        x->plane[plane].eobs[block]);
   }