ref: 205efbc1534065cbf5de58122da138f706290a6d
parent: d3d6ddcee5c2a18aa532e04aa41f97117dccf3e7
author: Yaowu Xu <[email protected]>
date: Tue Jul 9 13:40:39 EDT 2013
Revert "Remove memcpy() in handle_inter_mode() filter selection." This reverts commit fcf7998a47f7e1ec27fe93f99e488d345560a9be. Change-Id: Ic6532223faec9f1483b78adb2e37b79c7b1a0efb
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -2574,14 +2574,11 @@
(mbmi->ref_frame[1] < 0 ? 0 : mbmi->ref_frame[1]) };
int_mv cur_mv[2];
int64_t this_rd = 0;
- DECLARE_ALIGNED_ARRAY(16, uint8_t, tmp_buf, MAX_MB_PLANE * 64 * 64);
+ unsigned char tmp_buf[MAX_MB_PLANE][64 * 64];
int pred_exists = 0;
int interpolating_intpel_seen = 0;
int intpel_mv;
int64_t rd, best_rd = INT64_MAX;
- int best_needs_copy = 0;
- uint8_t *orig_dst[MAX_MB_PLANE];
- int orig_dst_stride[MAX_MB_PLANE];
switch (this_mode) {int rate_mv;
@@ -2638,16 +2635,6 @@
mbmi->mv[i].as_int = cur_mv[i].as_int;
}
- // do first prediction into the destination buffer. Do the next
- // prediction into a temporary buffer. Then keep track of which one
- // of these currently holds the best predictor, and use the other
- // one for future predictions. In the end, copy from tmp_buf to
- // dst if necessary.
- for (i = 0; i < MAX_MB_PLANE; i++) {- orig_dst[i] = xd->plane[i].dst.buf;
- orig_dst_stride[i] = xd->plane[i].dst.stride;
- }
-
/* We don't include the cost of the second reference here, because there
* are only three options: Last/Golden, ARF/Last or Golden/ARF, or in other
* words if you present them in that order, the second one is always known
@@ -2675,7 +2662,7 @@
cpi->rd_filter_cache[VP9_SWITCHABLE_FILTERS] = INT64_MAX;
for (i = 0; i < VP9_SWITCHABLE_FILTERS; ++i) {- int rs, j;
+ int rs;
int64_t rs_rd;
const INTERPOLATIONFILTERTYPE filter = vp9_switchable_interp[i];
const int is_intpel_interp = intpel_mv &&
@@ -2697,20 +2684,6 @@
} else {int rate_sum = 0;
int64_t dist_sum = 0;
- if ((cm->mcomp_filter_type == SWITCHABLE &&
- i && !best_needs_copy) ||
- (cm->mcomp_filter_type != SWITCHABLE &&
- cm->mcomp_filter_type != mbmi->interp_filter)) {- for (j = 0; j < MAX_MB_PLANE; j++) {- xd->plane[j].dst.buf = tmp_buf + j * 64 * 64;
- xd->plane[j].dst.stride = 64;
- }
- } else {- for (j = 0; j < MAX_MB_PLANE; j++) {- xd->plane[j].dst.buf = orig_dst[j];
- xd->plane[j].dst.stride = orig_dst_stride[j];
- }
- }
vp9_build_inter_predictors_sb(xd, mi_row, mi_col, bsize);
model_rd_for_sb(cpi, bsize, x, xd, &rate_sum, &dist_sum);
cpi->rd_filter_cache[i] = RDCOST(x->rdmult, x->rddiv,
@@ -2731,23 +2704,27 @@
if (newbest) {best_rd = rd;
*best_filter = mbmi->interp_filter;
- if (cm->mcomp_filter_type == SWITCHABLE && i &&
- !(interpolating_intpel_seen && is_intpel_interp))
- best_needs_copy = !best_needs_copy;
}
if ((cm->mcomp_filter_type == SWITCHABLE && newbest) ||
(cm->mcomp_filter_type != SWITCHABLE &&
cm->mcomp_filter_type == mbmi->interp_filter)) {+ int p;
+
+ for (p = 0; p < MAX_MB_PLANE; p++) {+ struct macroblockd_plane *pd = &xd->plane[p];
+ const int bw = plane_block_width(bsize, pd);
+ const int bh = plane_block_height(bsize, pd);
+ int i;
+
+ for (i = 0; i < bh; i++)
+ vpx_memcpy(&tmp_buf[p][64 * i], pd->dst.buf + i * pd->dst.stride,
+ bw);
+ }
pred_exists = 1;
}
interpolating_intpel_seen |= is_intpel_interp;
}
-
- for (i = 0; i < MAX_MB_PLANE; i++) {- xd->plane[i].dst.buf = orig_dst[i];
- xd->plane[i].dst.stride = orig_dst_stride[i];
- }
}
// Set the appripriate filter
@@ -2755,13 +2732,18 @@
cm->mcomp_filter_type : *best_filter;
vp9_setup_interp_filters(xd, mbmi->interp_filter, cm);
+
if (pred_exists) {- if (best_needs_copy) {- // again temporarily set the buffers to local memory to prevent a memcpy
- for (i = 0; i < MAX_MB_PLANE; i++) {- xd->plane[i].dst.buf = tmp_buf + i * 64 * 64;
- xd->plane[i].dst.stride = 64;
- }
+ int p;
+
+ for (p = 0; p < MAX_MB_PLANE; p++) {+ struct macroblockd_plane *pd = &xd->plane[p];
+ const int bw = plane_block_width(bsize, pd);
+ const int bh = plane_block_height(bsize, pd);
+ int i;
+
+ for (i = 0; i < bh; i++)
+ vpx_memcpy(pd->dst.buf + i * pd->dst.stride, &tmp_buf[p][64 * i], bw);
}
} else {// Handles the special case when a filter that is not in the
@@ -2835,10 +2817,6 @@
if (*rate_y == INT_MAX) {*rate2 = INT_MAX;
*distortion = INT64_MAX;
- for (i = 0; i < MAX_MB_PLANE; i++) {- xd->plane[i].dst.buf = orig_dst[i];
- xd->plane[i].dst.stride = orig_dst_stride[i];
- }
return INT64_MAX;
}
@@ -2860,11 +2838,6 @@
} else {*mode_excluded = (cpi->common.comp_pred_mode == COMP_PREDICTION_ONLY);
}
- }
-
- for (i = 0; i < MAX_MB_PLANE; i++) {- xd->plane[i].dst.buf = orig_dst[i];
- xd->plane[i].dst.stride = orig_dst_stride[i];
}
return this_rd; // if 0, this will be re-calculated by caller