diff options
author | Jingning Han <jingning@google.com> | 2014-10-31 08:55:24 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-10-31 08:55:24 -0700 |
commit | 1cffea9fb788a65013082e8cb478f8ba19a16713 (patch) | |
tree | 958820c2302ac42b95ab29f0a46e6f7d0dcda952 /vp9/encoder/vp9_pickmode.c | |
parent | d478d2df3728da02bd7424184a7c1eb05ee23f5c (diff) | |
parent | 7bea8c59f934aa8bfab43935b2355b88adaa12f0 (diff) | |
download | libvpx-1cffea9fb788a65013082e8cb478f8ba19a16713.tar libvpx-1cffea9fb788a65013082e8cb478f8ba19a16713.tar.gz libvpx-1cffea9fb788a65013082e8cb478f8ba19a16713.tar.bz2 libvpx-1cffea9fb788a65013082e8cb478f8ba19a16713.zip |
Merge "Rework pred pixel buffer system in non-RD coding mode"
Diffstat (limited to 'vp9/encoder/vp9_pickmode.c')
-rw-r--r-- | vp9/encoder/vp9_pickmode.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 28f12916e..584d73e21 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -517,8 +517,9 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, 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 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, // 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 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, 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 @@ 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); mbmi->interp_filter = best_filter; @@ -746,13 +747,12 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, 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 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, // 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 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, 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 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, x->skip_txfm[0] = skip_txfm; } } - if (cpi->sf.reuse_inter_pred_sby) + if (reuse_inter_pred) pd->dst = orig_dst; } |