ref: 7a49accd0b65453057762929efc7eed93deba043
parent: 09c933ea804c37c4aa95c15a67769dcf1a27b5a1
author: Scott LaVarnway <slavarnway@google.com>
date: Wed Apr 20 11:45:12 EDT 2011
Removed force_no_skip force_no_skip is always set to zero. Change-Id: I89b61c5e0bee34627a9c07c05f3517e1db76af77
--- a/vp8/common/blockd.h
+++ b/vp8/common/blockd.h
@@ -173,8 +173,6 @@
unsigned char need_to_clamp_mvs;
unsigned char segment_id; /* Which set of segmentation parameters should be used for this MB */
-
- unsigned char force_no_skip; /* encoder only */
} MB_MODE_INFO;
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -1381,7 +1381,7 @@
cpi->MVcount[1][mv_max+((xd->block[0].bmi.mv.as_mv.col - best_ref_mv.col) >> 1)]++;
}
- if (!x->skip && !x->e_mbd.mode_info_context->mbmi.force_no_skip)
+ if (!x->skip)
{vp8_encode_inter16x16(IF_RTCD(&cpi->rtcd), x);
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -1753,9 +1753,6 @@
//int intermodecost[MAX_MODES];
MB_PREDICTION_MODE uv_intra_mode;
-
- int force_no_skip = 0;
-
MV mvp;
int near_sadidx[8] = {0, 1, 2, 3, 4, 5, 6, 7};int saddone=0;
@@ -1858,8 +1855,6 @@
int disable_skip = 0;
int other_cost = 0;
- force_no_skip = 0;
-
// Experimental debug code.
// Record of rd values recorded for this MB. -1 indicates not measured
//all_rds[mode_index] = -1;
@@ -2370,7 +2365,6 @@
{// Note index of best mode so far
best_mode_index = mode_index;
- x->e_mbd.mode_info_context->mbmi.force_no_skip = force_no_skip;
if (this_mode <= B_PRED)
{--- a/vp8/encoder/tokenize.c
+++ b/vp8/encoder/tokenize.c
@@ -229,16 +229,6 @@
x->mode_info_context->mbmi.dc_diff = 1;
-#if 0
-
- if (x->mbmi.force_no_skip)
- {- x->mbmi.mb_skip_coeff = 1;
- //reset for next_mb.
- x->mbmi.force_no_skip = 0;
- }
-
-#endif
#if 1
--
⑨