ref: d30b297c4496c208de29aa5b30dd369f9b1a9e8e
parent: 60866b030a576e7a5608303ead5fe0c941dea22d
parent: aaf3765606a7164ef2f1d4e29c5b61247ec66c07
author: Alex Converse <[email protected]>
date: Thu May 29 08:46:20 EDT 2014
Merge "Don't update encoder skip count for SEG_LVL_SKIP."
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -3357,7 +3357,8 @@
vp9_tokenize_sb(cpi, t, !output_enabled, MAX(bsize, BLOCK_8X8));
} else {
mbmi->skip = 1;
- if (output_enabled)
+ if (output_enabled &&
+ !vp9_segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP))
cm->counts.skip[vp9_get_skip_context(xd)][1]++;
reset_skip_context(xd, MAX(bsize, BLOCK_8X8));
}