From 48c7de0fceddf7d2de924e8eb2ea442238ed29c7 Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Fri, 23 Oct 2015 12:02:56 -0700 Subject: [PATCH] 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 --- vp10/encoder/tokenize.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vp10/encoder/tokenize.c b/vp10/encoder/tokenize.c index 15fabbc60..e65302520 100644 --- 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 -- 2.40.0