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

Use restore_dst_buf in handle_inter_mode

Browse Source 
There are many places in handle_inter_mode that need to restore the
dst buffer pointers, due to buffer pointer swap and early rd search
breakout. This commit wraps these operations into an inline function
for clean-up.

Change-Id: I0462e8c41c8bc3cd8db07395489cac03d8e5be54
This commit is contained in:
Jingning Han 2013-11-19 15:29:22 -08:00
parent 5b3a8563de
commit 82c32fe1b5
1 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
vp9/encoder/vp9_rdopt.c
View File

@ -2636,6 +2636,16 @@ static void joint_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
vpx_free(second_pred); vpx_free(second_pred);
} }
static INLINE void restore_dst_buf(MACROBLOCKD *xd,
uint8_t *orig_dst[MAX_MB_PLANE],
int orig_dst_stride[MAX_MB_PLANE]) {
int i;
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];
}
}
static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
const TileInfo *const tile, const TileInfo *const tile,
BLOCK_SIZE bsize, BLOCK_SIZE bsize,
@ -2787,6 +2797,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
if (is_comp_pred) if (is_comp_pred)
intpel_mv &= (mbmi->mv[1].as_mv.row & 15) == 0 && intpel_mv &= (mbmi->mv[1].as_mv.row & 15) == 0 &&
(mbmi->mv[1].as_mv.col & 15) == 0; (mbmi->mv[1].as_mv.col & 15) == 0;
// Search for best switchable filter by checking the variance of // Search for best switchable filter by checking the variance of
// pred error irrespective of whether the filter will be used // pred error irrespective of whether the filter will be used
if (cm->mcomp_filter_type != BILINEAR) { if (cm->mcomp_filter_type != BILINEAR) {
@ -2826,10 +2837,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
(cm->mcomp_filter_type != SWITCHABLE && (cm->mcomp_filter_type != SWITCHABLE &&
(cm->mcomp_filter_type == mbmi->interp_filter || (cm->mcomp_filter_type == mbmi->interp_filter ||
(i == 0 && intpel_mv)))) { (i == 0 && intpel_mv)))) {
for (j = 0; j < MAX_MB_PLANE; j++) { restore_dst_buf(xd, orig_dst, orig_dst_stride);
xd->plane[j].dst.buf = orig_dst[j];
xd->plane[j].dst.stride = orig_dst_stride[j];
}
} else { } else {
for (j = 0; j < MAX_MB_PLANE; j++) { for (j = 0; j < MAX_MB_PLANE; j++) {
xd->plane[j].dst.buf = tmp_buf + j * 64 * 64; xd->plane[j].dst.buf = tmp_buf + j * 64 * 64;
@ -2853,10 +2861,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
} }
if (i == 0 && cpi->sf.use_rd_breakout && ref_best_rd < INT64_MAX) { if (i == 0 && cpi->sf.use_rd_breakout && ref_best_rd < INT64_MAX) {
if (rd / 2 > ref_best_rd) { if (rd / 2 > ref_best_rd) {
for (i = 0; i < MAX_MB_PLANE; i++) { restore_dst_buf(xd, orig_dst, orig_dst_stride);
xd->plane[i].dst.buf = orig_dst[i];
xd->plane[i].dst.stride = orig_dst_stride[i];
}
return INT64_MAX; return INT64_MAX;
} }
} }
@ -2875,11 +2880,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
pred_exists = 1; pred_exists = 1;
} }
} }
restore_dst_buf(xd, orig_dst, orig_dst_stride);
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 appropriate filter // Set the appropriate filter
@ -2911,10 +2912,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
// if current pred_error modeled rd is substantially more than the best // if current pred_error modeled rd is substantially more than the best
// so far, do not bother doing full rd // so far, do not bother doing full rd
if (rd / 2 > ref_best_rd) { if (rd / 2 > ref_best_rd) {
for (i = 0; i < MAX_MB_PLANE; i++) { restore_dst_buf(xd, orig_dst, orig_dst_stride);
xd->plane[i].dst.buf = orig_dst[i];
xd->plane[i].dst.stride = orig_dst_stride[i];
}
return INT64_MAX; return INT64_MAX;
} }
} }
@ -3017,10 +3015,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
if (*rate_y == INT_MAX) { if (*rate_y == INT_MAX) {
*rate2 = INT_MAX; *rate2 = INT_MAX;
*distortion = INT64_MAX; *distortion = INT64_MAX;
for (i = 0; i < MAX_MB_PLANE; i++) { restore_dst_buf(xd, orig_dst, orig_dst_stride);
xd->plane[i].dst.buf = orig_dst[i];
xd->plane[i].dst.stride = orig_dst_stride[i];
}
return INT64_MAX; return INT64_MAX;
} }
@ -3035,10 +3030,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
if (*rate_uv == INT_MAX) { if (*rate_uv == INT_MAX) {
*rate2 = INT_MAX; *rate2 = INT_MAX;
*distortion = INT64_MAX; *distortion = INT64_MAX;
for (i = 0; i < MAX_MB_PLANE; i++) { restore_dst_buf(xd, orig_dst, orig_dst_stride);
xd->plane[i].dst.buf = orig_dst[i];
xd->plane[i].dst.stride = orig_dst_stride[i];
}
return INT64_MAX; return INT64_MAX;
} }
@ -3048,11 +3040,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
*skippable = skippable_y && skippable_uv; *skippable = skippable_y && skippable_uv;
} }
for (i = 0; i < MAX_MB_PLANE; i++) { restore_dst_buf(xd, orig_dst, orig_dst_stride);
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 return this_rd; // if 0, this will be re-calculated by caller
} }