From aaf3765606a7164ef2f1d4e29c5b61247ec66c07 Mon Sep 17 00:00:00 2001
From: Alex Converse <aconverse@google.com>
Date: Wed, 28 May 2014 18:44:17 -0700
Subject: [PATCH] Don't update encoder skip count for SEG_LVL_SKIP.
This aligns the encoder behavior with the decoder.
Change-Id: Ifa0840e4b07b19309e0bf1d1182498883249ec45
---
vp9/encoder/vp9_encodeframe.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index a5e0f06667..5d3735e2de 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -3357,7 +3357,8 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled,
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));
}
--
GitLab