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

Merge "Rework pred pixel buffer system in non-RD coding mode"

Browse Source
This commit is contained in:
Jingning Han
2014-10-31 08:55:24 -07:00
committed by Gerrit Code Review
parent d478d2df37 7bea8c59f9
commit 1cffea9fb7
2 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
vp9/encoder/vp9_encodeframe.c
View File

@@ -2673,6 +2673,22 @@ static void fill_mode_info_sb(VP9_COMMON *cm, MACROBLOCK *x,
} }
} }
// Reset the prediction pixel ready flag recursively.
static void pred_pixel_ready_reset(PC_TREE *pc_tree, BLOCK_SIZE bsize) {
pc_tree->none.pred_pixel_ready = 0;
pc_tree->horizontal[0].pred_pixel_ready = 0;
pc_tree->horizontal[1].pred_pixel_ready = 0;
pc_tree->vertical[0].pred_pixel_ready = 0;
pc_tree->vertical[1].pred_pixel_ready = 0;
if (bsize > BLOCK_8X8) {
BLOCK_SIZE subsize = get_subsize(bsize, PARTITION_SPLIT);
int i;
for (i = 0; i < 4; ++i)
pred_pixel_ready_reset(pc_tree->split[i], subsize);
}
}
static void nonrd_pick_partition(VP9_COMP *cpi, static void nonrd_pick_partition(VP9_COMP *cpi,
TileDataEnc *tile_data, TileDataEnc *tile_data,
TOKENEXTRA **tp, int mi_row, TOKENEXTRA **tp, int mi_row,
@@ -2731,6 +2747,10 @@ static void nonrd_pick_partition(VP9_COMP *cpi,
partition_vert_allowed &= force_vert_split; partition_vert_allowed &= force_vert_split;
} }
ctx->pred_pixel_ready = !(partition_vert_allowed ||
partition_horz_allowed ||
do_split);
// PARTITION_NONE // PARTITION_NONE
if (partition_none_allowed) { if (partition_none_allowed) {
nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col,
@@ -2738,7 +2758,6 @@ static void nonrd_pick_partition(VP9_COMP *cpi,
ctx->mic.mbmi = xd->mi[0].src_mi->mbmi; ctx->mic.mbmi = xd->mi[0].src_mi->mbmi;
ctx->skip_txfm[0] = x->skip_txfm[0]; ctx->skip_txfm[0] = x->skip_txfm[0];
ctx->skip = x->skip; ctx->skip = x->skip;
ctx->pred_pixel_ready = 0;
if (this_rdc.rate != INT_MAX) { if (this_rdc.rate != INT_MAX) {
int pl = partition_plane_context(xd, mi_row, mi_col, bsize); int pl = partition_plane_context(xd, mi_row, mi_col, bsize);
@@ -2814,17 +2833,17 @@ static void nonrd_pick_partition(VP9_COMP *cpi,
subsize = get_subsize(bsize, PARTITION_HORZ); subsize = get_subsize(bsize, PARTITION_HORZ);
if (sf->adaptive_motion_search) if (sf->adaptive_motion_search)
load_pred_mv(x, ctx); load_pred_mv(x, ctx);
pc_tree->horizontal[0].pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, &sum_rdc, subsize, nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, &sum_rdc, subsize,
&pc_tree->horizontal[0]); &pc_tree->horizontal[0]);
pc_tree->horizontal[0].mic.mbmi = xd->mi[0].src_mi->mbmi; pc_tree->horizontal[0].mic.mbmi = xd->mi[0].src_mi->mbmi;
pc_tree->horizontal[0].skip_txfm[0] = x->skip_txfm[0]; pc_tree->horizontal[0].skip_txfm[0] = x->skip_txfm[0];
pc_tree->horizontal[0].skip = x->skip; pc_tree->horizontal[0].skip = x->skip;
pc_tree->horizontal[0].pred_pixel_ready = 0;
if (sum_rdc.rdcost < best_rdc.rdcost && mi_row + ms < cm->mi_rows) { if (sum_rdc.rdcost < best_rdc.rdcost && mi_row + ms < cm->mi_rows) {
load_pred_mv(x, ctx); load_pred_mv(x, ctx);
pc_tree->horizontal[1].pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, mi_row + ms, mi_col, nonrd_pick_sb_modes(cpi, tile_data, mi_row + ms, mi_col,
&this_rdc, subsize, &this_rdc, subsize,
&pc_tree->horizontal[1]); &pc_tree->horizontal[1]);
@@ -2832,7 +2851,6 @@ static void nonrd_pick_partition(VP9_COMP *cpi,
pc_tree->horizontal[1].mic.mbmi = xd->mi[0].src_mi->mbmi; pc_tree->horizontal[1].mic.mbmi = xd->mi[0].src_mi->mbmi;
pc_tree->horizontal[1].skip_txfm[0] = x->skip_txfm[0]; pc_tree->horizontal[1].skip_txfm[0] = x->skip_txfm[0];
pc_tree->horizontal[1].skip = x->skip; pc_tree->horizontal[1].skip = x->skip;
pc_tree->horizontal[1].pred_pixel_ready = 0;
if (this_rdc.rate == INT_MAX) { if (this_rdc.rate == INT_MAX) {
vp9_rd_cost_reset(&sum_rdc); vp9_rd_cost_reset(&sum_rdc);
@@ -2849,32 +2867,32 @@ static void nonrd_pick_partition(VP9_COMP *cpi,
if (sum_rdc.rdcost < best_rdc.rdcost) { if (sum_rdc.rdcost < best_rdc.rdcost) {
best_rdc = sum_rdc; best_rdc = sum_rdc;
pc_tree->partitioning = PARTITION_HORZ; pc_tree->partitioning = PARTITION_HORZ;
} else {
pred_pixel_ready_reset(pc_tree, bsize);
} }
} }
// PARTITION_VERT // PARTITION_VERT
if (partition_vert_allowed && do_rect) { if (partition_vert_allowed && do_rect) {
subsize = get_subsize(bsize, PARTITION_VERT); subsize = get_subsize(bsize, PARTITION_VERT);
if (sf->adaptive_motion_search) if (sf->adaptive_motion_search)
load_pred_mv(x, ctx); load_pred_mv(x, ctx);
pc_tree->vertical[0].pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, &sum_rdc, subsize, nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, &sum_rdc, subsize,
&pc_tree->vertical[0]); &pc_tree->vertical[0]);
pc_tree->vertical[0].mic.mbmi = xd->mi[0].src_mi->mbmi; pc_tree->vertical[0].mic.mbmi = xd->mi[0].src_mi->mbmi;
pc_tree->vertical[0].skip_txfm[0] = x->skip_txfm[0]; pc_tree->vertical[0].skip_txfm[0] = x->skip_txfm[0];
pc_tree->vertical[0].skip = x->skip; pc_tree->vertical[0].skip = x->skip;
pc_tree->vertical[0].pred_pixel_ready = 0;
if (sum_rdc.rdcost < best_rdc.rdcost && mi_col + ms < cm->mi_cols) { if (sum_rdc.rdcost < best_rdc.rdcost && mi_col + ms < cm->mi_cols) {
load_pred_mv(x, ctx); load_pred_mv(x, ctx);
pc_tree->vertical[1].pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col + ms, nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col + ms,
&this_rdc, subsize, &this_rdc, subsize,
&pc_tree->vertical[1]); &pc_tree->vertical[1]);
pc_tree->vertical[1].mic.mbmi = xd->mi[0].src_mi->mbmi; pc_tree->vertical[1].mic.mbmi = xd->mi[0].src_mi->mbmi;
pc_tree->vertical[1].skip_txfm[0] = x->skip_txfm[0]; pc_tree->vertical[1].skip_txfm[0] = x->skip_txfm[0];
pc_tree->vertical[1].skip = x->skip; pc_tree->vertical[1].skip = x->skip;
pc_tree->vertical[1].pred_pixel_ready = 0;
if (this_rdc.rate == INT_MAX) { if (this_rdc.rate == INT_MAX) {
vp9_rd_cost_reset(&sum_rdc); vp9_rd_cost_reset(&sum_rdc);
@@ -2891,6 +2909,8 @@ static void nonrd_pick_partition(VP9_COMP *cpi,
if (sum_rdc.rdcost < best_rdc.rdcost) { if (sum_rdc.rdcost < best_rdc.rdcost) {
best_rdc = sum_rdc; best_rdc = sum_rdc;
pc_tree->partitioning = PARTITION_VERT; pc_tree->partitioning = PARTITION_VERT;
} else {
pred_pixel_ready_reset(pc_tree, bsize);
} }
} }
@@ -2972,27 +2992,27 @@ static void nonrd_select_partition(VP9_COMP *cpi,
} else { } else {
switch (partition) { switch (partition) {
case PARTITION_NONE: case PARTITION_NONE:
pc_tree->none.pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, rd_cost, nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, rd_cost,
subsize, &pc_tree->none); subsize, &pc_tree->none);
pc_tree->none.mic.mbmi = xd->mi[0].src_mi->mbmi; pc_tree->none.mic.mbmi = xd->mi[0].src_mi->mbmi;
pc_tree->none.skip_txfm[0] = x->skip_txfm[0]; pc_tree->none.skip_txfm[0] = x->skip_txfm[0];
pc_tree->none.skip = x->skip; pc_tree->none.skip = x->skip;
pc_tree->none.pred_pixel_ready = 1;
break; break;
case PARTITION_VERT: case PARTITION_VERT:
pc_tree->vertical[0].pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, rd_cost, nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, rd_cost,
subsize, &pc_tree->vertical[0]); subsize, &pc_tree->vertical[0]);
pc_tree->vertical[0].mic.mbmi = xd->mi[0].src_mi->mbmi; pc_tree->vertical[0].mic.mbmi = xd->mi[0].src_mi->mbmi;
pc_tree->vertical[0].skip_txfm[0] = x->skip_txfm[0]; pc_tree->vertical[0].skip_txfm[0] = x->skip_txfm[0];
pc_tree->vertical[0].skip = x->skip; pc_tree->vertical[0].skip = x->skip;
pc_tree->vertical[0].pred_pixel_ready = 1;
if (mi_col + hbs < cm->mi_cols) { if (mi_col + hbs < cm->mi_cols) {
pc_tree->vertical[1].pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col + hbs, nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col + hbs,
&this_rdc, subsize, &pc_tree->vertical[1]); &this_rdc, subsize, &pc_tree->vertical[1]);
pc_tree->vertical[1].mic.mbmi = xd->mi[0].src_mi->mbmi; pc_tree->vertical[1].mic.mbmi = xd->mi[0].src_mi->mbmi;
pc_tree->vertical[1].skip_txfm[0] = x->skip_txfm[0]; pc_tree->vertical[1].skip_txfm[0] = x->skip_txfm[0];
pc_tree->vertical[1].skip = x->skip; pc_tree->vertical[1].skip = x->skip;
pc_tree->vertical[1].pred_pixel_ready = 1;
if (this_rdc.rate != INT_MAX && this_rdc.dist != INT64_MAX && if (this_rdc.rate != INT_MAX && this_rdc.dist != INT64_MAX &&
rd_cost->rate != INT_MAX && rd_cost->dist != INT64_MAX) { rd_cost->rate != INT_MAX && rd_cost->dist != INT64_MAX) {
rd_cost->rate += this_rdc.rate; rd_cost->rate += this_rdc.rate;
@@ -3001,19 +3021,19 @@ static void nonrd_select_partition(VP9_COMP *cpi,
} }
break; break;
case PARTITION_HORZ: case PARTITION_HORZ:
pc_tree->horizontal[0].pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, rd_cost, nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, rd_cost,
subsize, &pc_tree->horizontal[0]); subsize, &pc_tree->horizontal[0]);
pc_tree->horizontal[0].mic.mbmi = xd->mi[0].src_mi->mbmi; pc_tree->horizontal[0].mic.mbmi = xd->mi[0].src_mi->mbmi;
pc_tree->horizontal[0].skip_txfm[0] = x->skip_txfm[0]; pc_tree->horizontal[0].skip_txfm[0] = x->skip_txfm[0];
pc_tree->horizontal[0].skip = x->skip; pc_tree->horizontal[0].skip = x->skip;
pc_tree->horizontal[0].pred_pixel_ready = 1;
if (mi_row + hbs < cm->mi_rows) { if (mi_row + hbs < cm->mi_rows) {
pc_tree->horizontal[1].pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, mi_row + hbs, mi_col, nonrd_pick_sb_modes(cpi, tile_data, mi_row + hbs, mi_col,
&this_rdc, subsize, &pc_tree->horizontal[0]); &this_rdc, subsize, &pc_tree->horizontal[0]);
pc_tree->horizontal[1].mic.mbmi = xd->mi[0].src_mi->mbmi; pc_tree->horizontal[1].mic.mbmi = xd->mi[0].src_mi->mbmi;
pc_tree->horizontal[1].skip_txfm[0] = x->skip_txfm[0]; pc_tree->horizontal[1].skip_txfm[0] = x->skip_txfm[0];
pc_tree->horizontal[1].skip = x->skip; pc_tree->horizontal[1].skip = x->skip;
pc_tree->horizontal[1].pred_pixel_ready = 1;
if (this_rdc.rate != INT_MAX && this_rdc.dist != INT64_MAX && if (this_rdc.rate != INT_MAX && this_rdc.dist != INT64_MAX &&
rd_cost->rate != INT_MAX && rd_cost->dist != INT64_MAX) { rd_cost->rate != INT_MAX && rd_cost->dist != INT64_MAX) {
rd_cost->rate += this_rdc.rate; rd_cost->rate += this_rdc.rate;
@@ -3091,6 +3111,7 @@ static void nonrd_use_partition(VP9_COMP *cpi,
switch (partition) { switch (partition) {
case PARTITION_NONE: case PARTITION_NONE:
pc_tree->none.pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, rd_cost, nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, rd_cost,
subsize, &pc_tree->none); subsize, &pc_tree->none);
pc_tree->none.mic.mbmi = xd->mi[0].src_mi->mbmi; pc_tree->none.mic.mbmi = xd->mi[0].src_mi->mbmi;
@@ -3098,12 +3119,14 @@ static void nonrd_use_partition(VP9_COMP *cpi,
pc_tree->none.skip = x->skip; pc_tree->none.skip = x->skip;
break; break;
case PARTITION_VERT: case PARTITION_VERT:
pc_tree->vertical[0].pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, rd_cost, nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, rd_cost,
subsize, &pc_tree->vertical[0]); subsize, &pc_tree->vertical[0]);
pc_tree->vertical[0].mic.mbmi = xd->mi[0].src_mi->mbmi; pc_tree->vertical[0].mic.mbmi = xd->mi[0].src_mi->mbmi;
pc_tree->vertical[0].skip_txfm[0] = x->skip_txfm[0]; pc_tree->vertical[0].skip_txfm[0] = x->skip_txfm[0];
pc_tree->vertical[0].skip = x->skip; pc_tree->vertical[0].skip = x->skip;
if (mi_col + hbs < cm->mi_cols) { if (mi_col + hbs < cm->mi_cols) {
pc_tree->vertical[1].pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col + hbs, nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col + hbs,
&this_rdc, subsize, &pc_tree->vertical[1]); &this_rdc, subsize, &pc_tree->vertical[1]);
pc_tree->vertical[1].mic.mbmi = xd->mi[0].src_mi->mbmi; pc_tree->vertical[1].mic.mbmi = xd->mi[0].src_mi->mbmi;
@@ -3117,12 +3140,14 @@ static void nonrd_use_partition(VP9_COMP *cpi,
} }
break; break;
case PARTITION_HORZ: case PARTITION_HORZ:
pc_tree->horizontal[0].pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, rd_cost, nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, rd_cost,
subsize, &pc_tree->horizontal[0]); subsize, &pc_tree->horizontal[0]);
pc_tree->horizontal[0].mic.mbmi = xd->mi[0].src_mi->mbmi; pc_tree->horizontal[0].mic.mbmi = xd->mi[0].src_mi->mbmi;
pc_tree->horizontal[0].skip_txfm[0] = x->skip_txfm[0]; pc_tree->horizontal[0].skip_txfm[0] = x->skip_txfm[0];
pc_tree->horizontal[0].skip = x->skip; pc_tree->horizontal[0].skip = x->skip;
if (mi_row + hbs < cm->mi_rows) { if (mi_row + hbs < cm->mi_rows) {
pc_tree->horizontal[1].pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, mi_row + hbs, mi_col, nonrd_pick_sb_modes(cpi, tile_data, mi_row + hbs, mi_col,
&this_rdc, subsize, &pc_tree->horizontal[0]); &this_rdc, subsize, &pc_tree->horizontal[0]);
pc_tree->horizontal[1].mic.mbmi = xd->mi[0].src_mi->mbmi; pc_tree->horizontal[1].mic.mbmi = xd->mi[0].src_mi->mbmi;

20
vp9/encoder/vp9_pickmode.c
View File

@@ -517,8 +517,9 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
PRED_BUFFER *best_pred = NULL; PRED_BUFFER *best_pred = NULL;
PRED_BUFFER *this_mode_pred = NULL; PRED_BUFFER *this_mode_pred = NULL;
const int pixels_in_block = bh * bw; const int pixels_in_block = bh * bw;
int reuse_inter_pred = cpi->sf.reuse_inter_pred_sby && ctx->pred_pixel_ready;
if (cpi->sf.reuse_inter_pred_sby) { if (reuse_inter_pred) {
int i; int i;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
@@ -641,7 +642,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
// Search for the best prediction filter type, when the resulting // Search for the best prediction filter type, when the resulting
// motion vector is at sub-pixel accuracy level for luma component, i.e., // motion vector is at sub-pixel accuracy level for luma component, i.e.,
// the last three bits are all zeros. // the last three bits are all zeros.
if (cpi->sf.reuse_inter_pred_sby) { if (reuse_inter_pred) {
if (!this_mode_pred) { if (!this_mode_pred) {
this_mode_pred = &tmp[3]; this_mode_pred = &tmp[3];
} else { } else {
@@ -679,7 +680,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
best_cost = cost; best_cost = cost;
skip_txfm = x->skip_txfm[0]; skip_txfm = x->skip_txfm[0];
if (cpi->sf.reuse_inter_pred_sby) { if (reuse_inter_pred) {
if (this_mode_pred != current_pred) { if (this_mode_pred != current_pred) {
free_pred_buffer(this_mode_pred); free_pred_buffer(this_mode_pred);
this_mode_pred = current_pred; this_mode_pred = current_pred;
@@ -694,7 +695,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
} }
} }
if (cpi->sf.reuse_inter_pred_sby && this_mode_pred != current_pred) if (reuse_inter_pred && this_mode_pred != current_pred)
free_pred_buffer(current_pred); free_pred_buffer(current_pred);
mbmi->interp_filter = best_filter; mbmi->interp_filter = best_filter;
@@ -746,13 +747,12 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
best_ref_frame = ref_frame; best_ref_frame = ref_frame;
skip_txfm = x->skip_txfm[0]; skip_txfm = x->skip_txfm[0];
if (cpi->sf.reuse_inter_pred_sby) { if (reuse_inter_pred) {
free_pred_buffer(best_pred); free_pred_buffer(best_pred);
best_pred = this_mode_pred; best_pred = this_mode_pred;
} }
} else { } else {
if (cpi->sf.reuse_inter_pred_sby) if (reuse_inter_pred)
free_pred_buffer(this_mode_pred); free_pred_buffer(this_mode_pred);
} }
@@ -766,7 +766,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
// If best prediction is not in dst buf, then copy the prediction block from // If best prediction is not in dst buf, then copy the prediction block from
// temp buf to dst buf. // temp buf to dst buf.
if (best_pred != NULL && cpi->sf.reuse_inter_pred_sby && if (best_pred != NULL && reuse_inter_pred &&
best_pred->data != orig_dst.buf) { best_pred->data != orig_dst.buf) {
pd->dst = orig_dst; pd->dst = orig_dst;
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
@@ -801,7 +801,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
MIN(max_txsize_lookup[bsize], MIN(max_txsize_lookup[bsize],
tx_mode_to_biggest_tx_size[cpi->common.tx_mode]); tx_mode_to_biggest_tx_size[cpi->common.tx_mode]);
if (cpi->sf.reuse_inter_pred_sby) { if (reuse_inter_pred) {
pd->dst.buf = tmp[0].data; pd->dst.buf = tmp[0].data;
pd->dst.stride = bw; pd->dst.stride = bw;
} }
@@ -833,7 +833,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
x->skip_txfm[0] = skip_txfm; x->skip_txfm[0] = skip_txfm;
} }
} }
if (cpi->sf.reuse_inter_pred_sby) if (reuse_inter_pred)
pd->dst = orig_dst; pd->dst = orig_dst;
} }