Remove unused mode_sad
Removed mode_sad. Change-Id: I230b42ac9b617ae2c375e297057aa0756bd355fe
This commit is contained in:
parent
1521eb8ba9
commit
cf07d3e332
@ -115,7 +115,6 @@ struct macroblock {
|
||||
unsigned int source_variance;
|
||||
unsigned int pred_sse[MAX_REF_FRAMES];
|
||||
int pred_mv_sad[MAX_REF_FRAMES];
|
||||
int mode_sad[MAX_REF_FRAMES][INTER_MODES + 1];
|
||||
|
||||
int nmvjointcost[MV_JOINTS];
|
||||
int nmvcosts[2][MV_VALS];
|
||||
|
@ -26,14 +26,13 @@
|
||||
#include "vp9/encoder/vp9_ratectrl.h"
|
||||
#include "vp9/encoder/vp9_rdopt.h"
|
||||
|
||||
static int full_pixel_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
|
||||
static void full_pixel_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
|
||||
const TileInfo *const tile,
|
||||
BLOCK_SIZE bsize, int mi_row, int mi_col,
|
||||
int_mv *tmp_mv) {
|
||||
MACROBLOCKD *xd = &x->e_mbd;
|
||||
MB_MODE_INFO *mbmi = &xd->mi_8x8[0]->mbmi;
|
||||
struct buf_2d backup_yv12[MAX_MB_PLANE] = {{0}};
|
||||
int bestsme = INT_MAX;
|
||||
int step_param;
|
||||
int sadpb = x->sadperbit16;
|
||||
MV mvp_full;
|
||||
@ -46,9 +45,6 @@ static int full_pixel_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
|
||||
int tmp_row_min = x->mv_row_min;
|
||||
int tmp_row_max = x->mv_row_max;
|
||||
|
||||
int buf_offset;
|
||||
int stride = xd->plane[0].pre[0].stride;
|
||||
|
||||
const YV12_BUFFER_CONFIG *scaled_ref_frame = vp9_get_scaled_ref_frame(cpi,
|
||||
ref);
|
||||
if (scaled_ref_frame) {
|
||||
@ -77,7 +73,7 @@ static int full_pixel_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
|
||||
for (i = 0; i < MAX_MB_PLANE; i++)
|
||||
xd->plane[i].pre[0] = backup_yv12[i];
|
||||
}
|
||||
return INT_MAX;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@ -129,17 +125,6 @@ static int full_pixel_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
|
||||
for (i = 0; i < MAX_MB_PLANE; i++)
|
||||
xd->plane[i].pre[0] = backup_yv12[i];
|
||||
}
|
||||
|
||||
// TODO(jingning) This step can be merged into full pixel search step in the
|
||||
// re-designed log-diamond search
|
||||
buf_offset = tmp_mv->as_mv.row * stride + tmp_mv->as_mv.col;
|
||||
|
||||
// Find sad for current vector.
|
||||
bestsme = cpi->fn_ptr[bsize].sdf(x->plane[0].src.buf, x->plane[0].src.stride,
|
||||
xd->plane[0].pre[0].buf + buf_offset,
|
||||
stride, 0x7fffffff);
|
||||
|
||||
return bestsme;
|
||||
}
|
||||
|
||||
static void sub_pixel_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
|
||||
@ -196,7 +181,6 @@ static void model_rd_for_sb_y(VP9_COMP *cpi, BLOCK_SIZE bsize,
|
||||
int rate;
|
||||
int64_t dist;
|
||||
|
||||
|
||||
struct macroblock_plane *const p = &x->plane[0];
|
||||
struct macroblockd_plane *const pd = &xd->plane[0];
|
||||
const BLOCK_SIZE bs = get_plane_block_size(bsize, pd);
|
||||
@ -297,9 +281,8 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
|
||||
if (this_rd < (int64_t)(1 << num_pels_log2_lookup[bsize]))
|
||||
continue;
|
||||
|
||||
x->mode_sad[ref_frame][INTER_OFFSET(NEWMV)] =
|
||||
full_pixel_motion_search(cpi, x, tile, bsize, mi_row, mi_col,
|
||||
&frame_mv[NEWMV][ref_frame]);
|
||||
full_pixel_motion_search(cpi, x, tile, bsize, mi_row, mi_col,
|
||||
&frame_mv[NEWMV][ref_frame]);
|
||||
|
||||
if (frame_mv[NEWMV][ref_frame].as_int == INVALID_MV)
|
||||
continue;
|
||||
|
@ -2166,10 +2166,9 @@ static void mv_pred(VP9_COMP *cpi, MACROBLOCK *x,
|
||||
max_mv = MAX(max_mv,
|
||||
MAX(abs(this_mv.as_mv.row), abs(this_mv.as_mv.col)) >> 3);
|
||||
// only need to check zero mv once
|
||||
if (!this_mv.as_int && zero_seen) {
|
||||
x->mode_sad[ref_frame][i] = x->mode_sad[ref_frame][INTER_OFFSET(ZEROMV)];
|
||||
if (!this_mv.as_int && zero_seen)
|
||||
continue;
|
||||
}
|
||||
|
||||
zero_seen = zero_seen || !this_mv.as_int;
|
||||
|
||||
row_offset = this_mv.as_mv.row >> 3;
|
||||
@ -2180,9 +2179,6 @@ static void mv_pred(VP9_COMP *cpi, MACROBLOCK *x,
|
||||
this_sad = cpi->fn_ptr[block_size].sdf(src_y_ptr, x->plane[0].src.stride,
|
||||
ref_y_ptr, ref_y_stride,
|
||||
0x7fffffff);
|
||||
x->mode_sad[ref_frame][i] = this_sad;
|
||||
if (this_mv.as_int == 0)
|
||||
x->mode_sad[ref_frame][INTER_OFFSET(ZEROMV)] = this_sad;
|
||||
|
||||
// Note if it is the best so far.
|
||||
if (this_sad < best_sad) {
|
||||
@ -2191,12 +2187,6 @@ static void mv_pred(VP9_COMP *cpi, MACROBLOCK *x,
|
||||
}
|
||||
}
|
||||
|
||||
if (!zero_seen)
|
||||
x->mode_sad[ref_frame][INTER_OFFSET(ZEROMV)] =
|
||||
cpi->fn_ptr[block_size].sdf(src_y_ptr, x->plane[0].src.stride,
|
||||
ref_y_buffer, ref_y_stride,
|
||||
0x7fffffff);
|
||||
|
||||
// Note the index of the mv that worked best in the reference list.
|
||||
x->mv_best_ref_index[ref_frame] = best_index;
|
||||
x->max_mv_context[ref_frame] = max_mv;
|
||||
|
Loading…
Reference in New Issue
Block a user