Commit a417a6e3 authored by John Koleszar's avatar John Koleszar Committed by Gerrit Code Review
Browse files

Merge "Removing redundant function arguments." into experimental

parents 01e4e0b1 17cddb4e
......@@ -1340,22 +1340,19 @@ void vp9_build_inter32x32_predictors_sbuv(MACROBLOCKD *x,
}
#endif
void vp9_build_inter32x32_predictors_sb(MACROBLOCKD *x,
uint8_t *dst_y,
uint8_t *dst_u,
uint8_t *dst_v,
int dst_ystride,
int dst_uvstride,
int mb_row,
int mb_col) {
vp9_build_inter32x32_predictors_sby(x, dst_y, dst_ystride,
mb_row, mb_col);
vp9_build_inter32x32_predictors_sbuv(x, dst_u, dst_v, dst_uvstride,
mb_row, mb_col);
void vp9_build_inter32x32_predictors_sb(MACROBLOCKD *mb,
int mb_row, int mb_col) {
uint8_t *const y = mb->dst.y_buffer;
uint8_t *const u = mb->dst.u_buffer;
uint8_t *const v = mb->dst.v_buffer;
const int y_stride = mb->dst.y_stride;
const int uv_stride = mb->dst.uv_stride;
vp9_build_inter32x32_predictors_sby(mb, y, y_stride, mb_row, mb_col);
vp9_build_inter32x32_predictors_sbuv(mb, u, v, uv_stride, mb_row, mb_col);
#if CONFIG_COMP_INTERINTRA_PRED
if (x->mode_info_context->mbmi.second_ref_frame == INTRA_FRAME) {
vp9_build_interintra_32x32_predictors_sb(
x, dst_y, dst_u, dst_v, dst_ystride, dst_uvstride);
if (mb->mode_info_context->mbmi.second_ref_frame == INTRA_FRAME) {
vp9_build_interintra_32x32_predictors_sb(mb, y, u, v, y_stride, uv_stride);
}
#endif
}
......@@ -1539,22 +1536,19 @@ void vp9_build_inter64x64_predictors_sbuv(MACROBLOCKD *x,
}
}
void vp9_build_inter64x64_predictors_sb(MACROBLOCKD *x,
uint8_t *dst_y,
uint8_t *dst_u,
uint8_t *dst_v,
int dst_ystride,
int dst_uvstride,
int mb_row,
int mb_col) {
vp9_build_inter64x64_predictors_sby(x, dst_y, dst_ystride,
mb_row, mb_col);
vp9_build_inter64x64_predictors_sbuv(x, dst_u, dst_v, dst_uvstride,
mb_row, mb_col);
void vp9_build_inter64x64_predictors_sb(MACROBLOCKD *mb,
int mb_row, int mb_col) {
uint8_t *const y = mb->dst.y_buffer;
uint8_t *const u = mb->dst.u_buffer;
uint8_t *const v = mb->dst.v_buffer;
const int y_stride = mb->dst.y_stride;
const int uv_stride = mb->dst.uv_stride;
vp9_build_inter64x64_predictors_sby(mb, y, y_stride, mb_row, mb_col);
vp9_build_inter64x64_predictors_sbuv(mb, u, v, uv_stride, mb_row, mb_col);
#if CONFIG_COMP_INTERINTRA_PRED
if (x->mode_info_context->mbmi.second_ref_frame == INTRA_FRAME) {
vp9_build_interintra_64x64_predictors_sb(x, dst_y, dst_u, dst_v,
dst_ystride, dst_uvstride);
if (mb->mode_info_context->mbmi.second_ref_frame == INTRA_FRAME) {
vp9_build_interintra_64x64_predictors_sb(mb, y, u, v, y_stride, uv_stride);
}
#endif
}
......
......@@ -38,23 +38,11 @@ void vp9_build_inter16x16_predictors_mb(MACROBLOCKD *xd,
int mb_row,
int mb_col);
void vp9_build_inter32x32_predictors_sb(MACROBLOCKD *x,
uint8_t *dst_y,
uint8_t *dst_u,
uint8_t *dst_v,
int dst_ystride,
int dst_uvstride,
int mb_row,
int mb_col);
void vp9_build_inter32x32_predictors_sb(MACROBLOCKD *mb,
int mb_row, int mb_col);
void vp9_build_inter64x64_predictors_sb(MACROBLOCKD *x,
uint8_t *dst_y,
uint8_t *dst_u,
uint8_t *dst_v,
int dst_ystride,
int dst_uvstride,
int mb_row,
int mb_col);
void vp9_build_inter64x64_predictors_sb(MACROBLOCKD *mb,
int mb_row, int mb_col);
void vp9_build_inter_predictors_mb(MACROBLOCKD *xd,
int mb_row,
......
......@@ -198,21 +198,9 @@ static void skip_recon_mb(VP9D_COMP *pbi, MACROBLOCKD *xd,
}
} else {
if (sb_type == BLOCK_SIZE_SB64X64) {
vp9_build_inter64x64_predictors_sb(xd,
xd->dst.y_buffer,
xd->dst.u_buffer,
xd->dst.v_buffer,
xd->dst.y_stride,
xd->dst.uv_stride,
mb_row, mb_col);
vp9_build_inter64x64_predictors_sb(xd, mb_row, mb_col);
} else if (sb_type == BLOCK_SIZE_SB32X32) {
vp9_build_inter32x32_predictors_sb(xd,
xd->dst.y_buffer,
xd->dst.u_buffer,
xd->dst.v_buffer,
xd->dst.y_stride,
xd->dst.uv_stride,
mb_row, mb_col);
vp9_build_inter32x32_predictors_sb(xd, mb_row, mb_col);
} else {
vp9_build_inter16x16_predictors_mb(xd,
xd->dst.y_buffer,
......@@ -523,10 +511,7 @@ static void decode_superblock64(VP9D_COMP *pbi, MACROBLOCKD *xd,
vp9_build_intra_predictors_sb64y_s(xd);
vp9_build_intra_predictors_sb64uv_s(xd);
} else {
vp9_build_inter64x64_predictors_sb(xd, xd->dst.y_buffer,
xd->dst.u_buffer, xd->dst.v_buffer,
xd->dst.y_stride, xd->dst.uv_stride,
mb_row, mb_col);
vp9_build_inter64x64_predictors_sb(xd, mb_row, mb_col);
}
/* dequantization and idct */
......@@ -700,10 +685,7 @@ static void decode_superblock32(VP9D_COMP *pbi, MACROBLOCKD *xd,
vp9_build_intra_predictors_sby_s(xd);
vp9_build_intra_predictors_sbuv_s(xd);
} else {
vp9_build_inter32x32_predictors_sb(xd, xd->dst.y_buffer,
xd->dst.u_buffer, xd->dst.v_buffer,
xd->dst.y_stride, xd->dst.uv_stride,
mb_row, mb_col);
vp9_build_inter32x32_predictors_sb(xd, mb_row, mb_col);
}
/* dequantization and idct */
......
......@@ -2412,10 +2412,7 @@ static void encode_superblock32(VP9_COMP *cpi, TOKENEXTRA **t,
&xd->scale_factor[1], &xd->scale_factor_uv[1]);
}
vp9_build_inter32x32_predictors_sb(xd, xd->dst.y_buffer,
xd->dst.u_buffer, xd->dst.v_buffer,
xd->dst.y_stride, xd->dst.uv_stride,
mb_row, mb_col);
vp9_build_inter32x32_predictors_sb(xd, mb_row, mb_col);
}
if (!x->skip) {
......@@ -2632,10 +2629,7 @@ static void encode_superblock64(VP9_COMP *cpi, TOKENEXTRA **t,
&xd->scale_factor[1], &xd->scale_factor_uv[1]);
}
vp9_build_inter64x64_predictors_sb(xd, xd->dst.y_buffer,
xd->dst.u_buffer, xd->dst.v_buffer,
xd->dst.y_stride, xd->dst.uv_stride,
mb_row, mb_col);
vp9_build_inter64x64_predictors_sb(xd, mb_row, mb_col);
}
if (!x->skip) {
......
......@@ -3723,13 +3723,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
unsigned int sse, var;
int tmp_rate_y, tmp_rate_u, tmp_rate_v;
int tmp_dist_y, tmp_dist_u, tmp_dist_v;
vp9_build_inter64x64_predictors_sb(xd,
xd->dst.y_buffer,
xd->dst.u_buffer,
xd->dst.v_buffer,
xd->dst.y_stride,
xd->dst.uv_stride,
mb_row, mb_col);
vp9_build_inter64x64_predictors_sb(xd, mb_row, mb_col);
var = vp9_variance64x64(*(b->base_src), b->src_stride,
xd->dst.y_buffer, xd->dst.y_stride, &sse);
// Note our transform coeffs are 8 times an orthogonal transform.
......@@ -3808,13 +3802,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
unsigned int sse, var;
int tmp_rate_y, tmp_rate_u, tmp_rate_v;
int tmp_dist_y, tmp_dist_u, tmp_dist_v;
vp9_build_inter32x32_predictors_sb(xd,
xd->dst.y_buffer,
xd->dst.u_buffer,
xd->dst.v_buffer,
xd->dst.y_stride,
xd->dst.uv_stride,
mb_row, mb_col);
vp9_build_inter32x32_predictors_sb(xd, mb_row, mb_col);
var = vp9_variance32x32(*(b->base_src), b->src_stride,
xd->dst.y_buffer, xd->dst.y_stride, &sse);
// Note our transform coeffs are 8 times an orthogonal transform.
......@@ -3981,21 +3969,9 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
// Handles the special case when a filter that is not in the
// switchable list (ex. bilinear, 6-tap) is indicated at the frame level
if (block_size == BLOCK_64X64) {
vp9_build_inter64x64_predictors_sb(xd,
xd->dst.y_buffer,
xd->dst.u_buffer,
xd->dst.v_buffer,
xd->dst.y_stride,
xd->dst.uv_stride,
mb_row, mb_col);
vp9_build_inter64x64_predictors_sb(xd, mb_row, mb_col);
} else if (block_size == BLOCK_32X32) {
vp9_build_inter32x32_predictors_sb(xd,
xd->dst.y_buffer,
xd->dst.u_buffer,
xd->dst.v_buffer,
xd->dst.y_stride,
xd->dst.uv_stride,
mb_row, mb_col);
vp9_build_inter32x32_predictors_sb(xd, mb_row, mb_col);
} else {
vp9_build_inter16x16_predictors_mb(xd, xd->predictor,
xd->predictor + 256,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment