commit 6f90fb295563c3ff3918d1e5ba6676f9bcf6978c
author Angie Chiang <angiebird@google.com> Wed Dec 20 16:30:20 2017 -0800
committer Jingning Han <jingning@google.com> Mon Dec 25 02:38:35 2017 +0000
tree 8098f29d46a9f2f4de9b31aecad05cd120eefa83
parent 19d05210fd74fb1ff2de6b084e42011dfdc3bedf

Avoid changing motion_mode after rd search

Check if the global motion undergoes non-translation mode. If that
is the case, do not force a newmv mode into globalmv mode.

This will resolve a mismatch bug of txk_sel.

Change-Id: I589f1619427f02045f8cf49bdea05f348f076236

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index 0825675..0e3da84 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -2496,6 +2496,7 @@
   if (plane == 0)
     mbmi->txk_type[(blk_row << MAX_MIB_SIZE_LOG2) + blk_col] = best_tx_type;
   x->plane[plane].txb_entropy_ctx[block] = best_txb_ctx;
+  x->plane[plane].eobs[block] = best_eob;
 
   if (!is_inter_block(mbmi)) {
     // intra mode needs decoded result such that the next transform block