Removed force_no_skip
force_no_skip is always set to zero. Change-Id: I89b61c5e0bee34627a9c07c05f3517e1db76af77
This commit is contained in:
parent
09c933ea80
commit
7a49accd0b
@ -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;
|
||||
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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)
|
||||
{
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user