Fix enc/dec mismatch in var-tx experiment

This commit fixes an enc/dec mismatch issue in recursive transform
partitioning experiment due to merge conflict.

Change-Id: I66146ef806c008902c91d54f4f8c7ccf47996b78

diff --git a/vp10/encoder/tokenize.c b/vp10/encoder/tokenize.c
index 15fabbc60c1e4eacb7d2186aabf4cd950431b904..e6530252008d81c146ae65fbc29a2db62fd1ae09 100644 (file)
--- a/vp10/encoder/tokenize.c
+++ b/vp10/encoder/tokenize.c
@@ -742,7 +742,6 @@ void vp10_tokenize_sb_inter(VP10_COMP *cpi, ThreadData *td, TOKENEXTRA **t,
     int idx, idy;
     int block = 0;
     int step = 1 << (max_tx_size * 2);
-
     for (idy = 0; idy < mi_height; idy += bh) {
       for (idx = 0; idx < mi_width; idx += bh) {
         tokenize_tx(td, t, dry_run, max_tx_size, plane_bsize, idy, idx,
@@ -750,6 +749,11 @@ void vp10_tokenize_sb_inter(VP10_COMP *cpi, ThreadData *td, TOKENEXTRA **t,
         block += step;
       }
     }
+
+    if (!dry_run) {
+      (*t)->token = EOSB_TOKEN;
+      (*t)++;
+    }
   }
 }
 #endif