diff options
Diffstat (limited to 'vp8')
-rw-r--r-- | vp8/common/blockd.h | 2 | ||||
-rw-r--r-- | vp8/encoder/encodeframe.c | 2 | ||||
-rw-r--r-- | vp8/encoder/rdopt.c | 6 | ||||
-rw-r--r-- | vp8/encoder/tokenize.c | 10 |
4 files changed, 1 insertions, 19 deletions
diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h index fc8e0722c..cfe9e1572 100644 --- a/vp8/common/blockd.h +++ b/vp8/common/blockd.h @@ -173,8 +173,6 @@ typedef struct 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; diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 895bdf055..1ae332515 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -1381,7 +1381,7 @@ int vp8cx_encode_inter_macroblock 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); diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index e49eebfba..6c4879be2 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -1753,9 +1753,6 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int //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 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int 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 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int { // 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) { diff --git a/vp8/encoder/tokenize.c b/vp8/encoder/tokenize.c index e3f423f8a..ccf0c7f34 100644 --- a/vp8/encoder/tokenize.c +++ b/vp8/encoder/tokenize.c @@ -229,16 +229,6 @@ void vp8_tokenize_mb(VP8_COMP *cpi, MACROBLOCKD *x, TOKENEXTRA **t) 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 |