ref: 1cffea9fb788a65013082e8cb478f8ba19a16713
parent: d478d2df3728da02bd7424184a7c1eb05ee23f5c
parent: 7bea8c59f934aa8bfab43935b2355b88adaa12f0
author: Jingning Han <[email protected]>
date: Fri Oct 31 04:55:24 EDT 2014
Merge "Rework pred pixel buffer system in non-RD coding mode"
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -2673,6 +2673,22 @@
}
}
+// 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,
TileDataEnc *tile_data,
TOKENEXTRA **tp, int mi_row,
@@ -2731,6 +2747,10 @@
partition_vert_allowed &= force_vert_split;
}
+ ctx->pred_pixel_ready = !(partition_vert_allowed ||
+ partition_horz_allowed ||
+ do_split);
+
// PARTITION_NONE
if (partition_none_allowed) {nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col,
@@ -2738,7 +2758,6 @@
ctx->mic.mbmi = xd->mi[0].src_mi->mbmi;
ctx->skip_txfm[0] = x->skip_txfm[0];
ctx->skip = x->skip;
- ctx->pred_pixel_ready = 0;
if (this_rdc.rate != INT_MAX) {int pl = partition_plane_context(xd, mi_row, mi_col, bsize);
@@ -2814,7 +2833,7 @@
subsize = get_subsize(bsize, PARTITION_HORZ);
if (sf->adaptive_motion_search)
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,
&pc_tree->horizontal[0]);
@@ -2821,10 +2840,10 @@
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 = x->skip;
- pc_tree->horizontal[0].pred_pixel_ready = 0;
if (sum_rdc.rdcost < best_rdc.rdcost && mi_row + ms < cm->mi_rows) {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,
&this_rdc, subsize,
&pc_tree->horizontal[1]);
@@ -2832,7 +2851,6 @@
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 = x->skip;
- pc_tree->horizontal[1].pred_pixel_ready = 0;
if (this_rdc.rate == INT_MAX) {vp9_rd_cost_reset(&sum_rdc);
@@ -2849,6 +2867,8 @@
if (sum_rdc.rdcost < best_rdc.rdcost) {best_rdc = sum_rdc;
pc_tree->partitioning = PARTITION_HORZ;
+ } else {+ pred_pixel_ready_reset(pc_tree, bsize);
}
}
@@ -2855,19 +2875,18 @@
// PARTITION_VERT
if (partition_vert_allowed && do_rect) {subsize = get_subsize(bsize, PARTITION_VERT);
-
if (sf->adaptive_motion_search)
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,
&pc_tree->vertical[0]);
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 = x->skip;
- pc_tree->vertical[0].pred_pixel_ready = 0;
if (sum_rdc.rdcost < best_rdc.rdcost && mi_col + ms < cm->mi_cols) {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,
&this_rdc, subsize,
&pc_tree->vertical[1]);
@@ -2874,7 +2893,6 @@
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 = x->skip;
- pc_tree->vertical[1].pred_pixel_ready = 0;
if (this_rdc.rate == INT_MAX) {vp9_rd_cost_reset(&sum_rdc);
@@ -2891,6 +2909,8 @@
if (sum_rdc.rdcost < best_rdc.rdcost) {best_rdc = sum_rdc;
pc_tree->partitioning = PARTITION_VERT;
+ } else {+ pred_pixel_ready_reset(pc_tree, bsize);
}
}
@@ -2972,27 +2992,27 @@
} else { switch (partition) {case PARTITION_NONE:
+ pc_tree->none.pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, rd_cost,
subsize, &pc_tree->none);
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 = x->skip;
- pc_tree->none.pred_pixel_ready = 1;
break;
case PARTITION_VERT:
+ pc_tree->vertical[0].pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, rd_cost,
subsize, &pc_tree->vertical[0]);
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 = x->skip;
- pc_tree->vertical[0].pred_pixel_ready = 1;
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,
&this_rdc, subsize, &pc_tree->vertical[1]);
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 = x->skip;
- pc_tree->vertical[1].pred_pixel_ready = 1;
if (this_rdc.rate != INT_MAX && this_rdc.dist != INT64_MAX &&
rd_cost->rate != INT_MAX && rd_cost->dist != INT64_MAX) {rd_cost->rate += this_rdc.rate;
@@ -3001,19 +3021,19 @@
}
break;
case PARTITION_HORZ:
+ pc_tree->horizontal[0].pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, rd_cost,
subsize, &pc_tree->horizontal[0]);
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 = x->skip;
- pc_tree->horizontal[0].pred_pixel_ready = 1;
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,
&this_rdc, subsize, &pc_tree->horizontal[0]);
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 = x->skip;
- pc_tree->horizontal[1].pred_pixel_ready = 1;
if (this_rdc.rate != INT_MAX && this_rdc.dist != INT64_MAX &&
rd_cost->rate != INT_MAX && rd_cost->dist != INT64_MAX) {rd_cost->rate += this_rdc.rate;
@@ -3091,6 +3111,7 @@
switch (partition) {case PARTITION_NONE:
+ pc_tree->none.pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, rd_cost,
subsize, &pc_tree->none);
pc_tree->none.mic.mbmi = xd->mi[0].src_mi->mbmi;
@@ -3098,6 +3119,7 @@
pc_tree->none.skip = x->skip;
break;
case PARTITION_VERT:
+ pc_tree->vertical[0].pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, rd_cost,
subsize, &pc_tree->vertical[0]);
pc_tree->vertical[0].mic.mbmi = xd->mi[0].src_mi->mbmi;
@@ -3104,6 +3126,7 @@
pc_tree->vertical[0].skip_txfm[0] = x->skip_txfm[0];
pc_tree->vertical[0].skip = x->skip;
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,
&this_rdc, subsize, &pc_tree->vertical[1]);
pc_tree->vertical[1].mic.mbmi = xd->mi[0].src_mi->mbmi;
@@ -3117,6 +3140,7 @@
}
break;
case PARTITION_HORZ:
+ pc_tree->horizontal[0].pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, mi_row, mi_col, rd_cost,
subsize, &pc_tree->horizontal[0]);
pc_tree->horizontal[0].mic.mbmi = xd->mi[0].src_mi->mbmi;
@@ -3123,6 +3147,7 @@
pc_tree->horizontal[0].skip_txfm[0] = x->skip_txfm[0];
pc_tree->horizontal[0].skip = x->skip;
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,
&this_rdc, subsize, &pc_tree->horizontal[0]);
pc_tree->horizontal[1].mic.mbmi = xd->mi[0].src_mi->mbmi;
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -517,8 +517,9 @@
PRED_BUFFER *best_pred = NULL;
PRED_BUFFER *this_mode_pred = NULL;
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;
for (i = 0; i < 3; i++) {#if CONFIG_VP9_HIGHBITDEPTH
@@ -641,7 +642,7 @@
// Search for the best prediction filter type, when the resulting
// motion vector is at sub-pixel accuracy level for luma component, i.e.,
// the last three bits are all zeros.
- if (cpi->sf.reuse_inter_pred_sby) {+ if (reuse_inter_pred) { if (!this_mode_pred) {this_mode_pred = &tmp[3];
} else {@@ -679,7 +680,7 @@
best_cost = cost;
skip_txfm = x->skip_txfm[0];
- if (cpi->sf.reuse_inter_pred_sby) {+ if (reuse_inter_pred) { if (this_mode_pred != current_pred) {free_pred_buffer(this_mode_pred);
this_mode_pred = current_pred;
@@ -694,7 +695,7 @@
}
}
- 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);
mbmi->interp_filter = best_filter;
@@ -746,13 +747,12 @@
best_ref_frame = ref_frame;
skip_txfm = x->skip_txfm[0];
- if (cpi->sf.reuse_inter_pred_sby) {+ if (reuse_inter_pred) {free_pred_buffer(best_pred);
-
best_pred = this_mode_pred;
}
} else {- if (cpi->sf.reuse_inter_pred_sby)
+ if (reuse_inter_pred)
free_pred_buffer(this_mode_pred);
}
@@ -766,7 +766,7 @@
// If best prediction is not in dst buf, then copy the prediction block from
// 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) {pd->dst = orig_dst;
#if CONFIG_VP9_HIGHBITDEPTH
@@ -801,7 +801,7 @@
MIN(max_txsize_lookup[bsize],
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.stride = bw;
}
@@ -833,7 +833,7 @@
x->skip_txfm[0] = skip_txfm;
}
}
- if (cpi->sf.reuse_inter_pred_sby)
+ if (reuse_inter_pred)
pd->dst = orig_dst;
}