generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix enc/dec mismatch in var-tx experiment

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

Change-Id: I66146ef806c008902c91d54f4f8c7ccf47996b78
This commit is contained in:
Jingning Han
2015-10-23 12:02:56 -07:00
parent ed8bddaac8
commit 48c7de0fce
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vp10/encoder/tokenize.c
View File

@@ -742,7 +742,6 @@ void vp10_tokenize_sb_inter(VP10_COMP *cpi, ThreadData *td, TOKENEXTRA **t,
int idx, idy; int idx, idy;
int block = 0; int block = 0;
int step = 1 << (max_tx_size * 2); int step = 1 << (max_tx_size * 2);
for (idy = 0; idy < mi_height; idy += bh) { for (idy = 0; idy < mi_height; idy += bh) {
for (idx = 0; idx < mi_width; idx += bh) { for (idx = 0; idx < mi_width; idx += bh) {
tokenize_tx(td, t, dry_run, max_tx_size, plane_bsize, idy, idx, 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; block += step;
} }
} }
if (!dry_run) {
(*t)->token = EOSB_TOKEN;
(*t)++;
}
} }
} }
#endif #endif