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

Add mode cost to sub8x8 block mode decision in rtc coding

Browse Source 
This commit allows the encoder to properly account for the mode
cost in sub8x8 non-RD mode decision.

Change-Id: I2951960d20e37ed08e372ee0c7044935b2b9b899
This commit is contained in:
Jingning Han
2015-02-10 15:32:38 -08:00
committed by Gerrit Code Review
parent c9725813db
commit e665c8f2c9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vp9/encoder/vp9_pickmode.c
View File

@@ -1130,8 +1130,6 @@ void vp9_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x,
int64_t b_best_rd = INT64_MAX; int64_t b_best_rd = INT64_MAX;
const int i = idy * 2 + idx; const int i = idy * 2 + idx;
PREDICTION_MODE this_mode; PREDICTION_MODE this_mode;
int b_rate = 0;
int64_t b_dist = 0;
RD_COST this_rdc; RD_COST this_rdc;
unsigned int var_y, sse_y; unsigned int var_y, sse_y;
@@ -1159,6 +1157,7 @@ void vp9_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x,
&b_mv[NEARMV]); &b_mv[NEARMV]);
for (this_mode = NEARESTMV; this_mode <= NEWMV; ++this_mode) { for (this_mode = NEARESTMV; this_mode <= NEWMV; ++this_mode) {
int b_rate = 0;
xd->mi[0].bmi[i].as_mv[0].as_int = b_mv[this_mode].as_int; xd->mi[0].bmi[i].as_mv[0].as_int = b_mv[this_mode].as_int;
if (this_mode == NEWMV) { if (this_mode == NEWMV) {
@@ -1220,6 +1219,9 @@ void vp9_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x,
&x->pred_sse[ref_frame], NULL, 0, 0); &x->pred_sse[ref_frame], NULL, 0, 0);
xd->mi[0].bmi[i].as_mv[0].as_mv = tmp_mv; xd->mi[0].bmi[i].as_mv[0].as_mv = tmp_mv;
} else {
b_rate += cpi->inter_mode_cost[mbmi->mode_context[ref_frame]]
[INTER_OFFSET(this_mode)];
} }
vp9_build_inter_predictor(pd->pre[0].buf, pd->pre[0].stride, vp9_build_inter_predictor(pd->pre[0].buf, pd->pre[0].stride,
@@ -1236,7 +1238,6 @@ void vp9_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x,
&var_y, &sse_y); &var_y, &sse_y);
this_rdc.rate += b_rate; this_rdc.rate += b_rate;
this_rdc.dist += b_dist;
this_rdc.rdcost = RDCOST(x->rdmult, x->rddiv, this_rdc.rdcost = RDCOST(x->rdmult, x->rddiv,
this_rdc.rate, this_rdc.dist); this_rdc.rate, this_rdc.dist);
if (this_rdc.rdcost < b_best_rd) { if (this_rdc.rdcost < b_best_rd) {