generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Re-work RD modeling based on inter frame prediction residual"

Browse Source
This commit is contained in:
Jingning Han 2014-08-27 18:48:49 -07:00 committed by Gerrit Code Review
commit 143be253b6
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vp9/encoder/vp9_rdopt.c
View File

@ -2148,7 +2148,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
DECLARE_ALIGNED_ARRAY(16, uint8_t, tmp_buf, MAX_MB_PLANE * 64 * 64); DECLARE_ALIGNED_ARRAY(16, uint8_t, tmp_buf, MAX_MB_PLANE * 64 * 64);
int pred_exists = 0; int pred_exists = 0;
int intpel_mv; int intpel_mv;
int64_t rd, best_rd = INT64_MAX; int64_t rd, tmp_rd, best_rd = INT64_MAX;
int best_needs_copy = 0; int best_needs_copy = 0;
uint8_t *orig_dst[MAX_MB_PLANE]; uint8_t *orig_dst[MAX_MB_PLANE];
int orig_dst_stride[MAX_MB_PLANE]; int orig_dst_stride[MAX_MB_PLANE];
@ -2337,6 +2337,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
(cm->interp_filter != SWITCHABLE && (cm->interp_filter != SWITCHABLE &&
cm->interp_filter == mbmi->interp_filter)) { cm->interp_filter == mbmi->interp_filter)) {
pred_exists = 1; pred_exists = 1;
tmp_rd = best_rd;
} }
} }
restore_dst_buf(xd, orig_dst, orig_dst_stride); restore_dst_buf(xd, orig_dst, orig_dst_stride);
@ -2355,17 +2356,19 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
xd->plane[i].dst.stride = 64; xd->plane[i].dst.stride = 64;
} }
} }
rd = tmp_rd + RDCOST(x->rdmult, x->rddiv, rs, 0);
} else { } else {
int tmp_rate;
int64_t tmp_dist;
// Handles the special case when a filter that is not in the // Handles the special case when a filter that is not in the
// switchable list (ex. bilinear, 6-tap) is indicated at the frame level // switchable list (ex. bilinear) is indicated at the frame level, or
// skip condition holds.
vp9_build_inter_predictors_sb(xd, mi_row, mi_col, bsize); vp9_build_inter_predictors_sb(xd, mi_row, mi_col, bsize);
model_rd_for_sb(cpi, bsize, x, xd, &tmp_rate, &tmp_dist);
rd = RDCOST(x->rdmult, x->rddiv, rs + tmp_rate, tmp_dist);
} }
if (cpi->sf.use_rd_breakout && ref_best_rd < INT64_MAX) { if (cpi->sf.use_rd_breakout && ref_best_rd < INT64_MAX) {
int tmp_rate;
int64_t tmp_dist;
model_rd_for_sb(cpi, bsize, x, xd, &tmp_rate, &tmp_dist);
rd = RDCOST(x->rdmult, x->rddiv, rs + tmp_rate, tmp_dist);
// if current pred_error modeled rd is substantially more than the best // if current pred_error modeled rd is substantially more than the best
// so far, do not bother doing full rd // so far, do not bother doing full rd
if (rd / 2 > ref_best_rd) { if (rd / 2 > ref_best_rd) {