diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-01-27 10:42:42 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-27 10:42:42 -0800 |
| commit | b2f0ae65c786b93b538d51d49a87e1ccc5725e67 (patch) | |
| tree | 5c5b25ceaf5192e4a7a7c6eae88a3ab43af55123 /vp9/encoder | |
| parent | f01855b0c7cd06ae6ea0b16ca7e4e59cc05d3ed1 (diff) | |
| parent | 8691565441beb0e8693ad28655ec5c4841432813 (diff) | |
| download | libvpx-b2f0ae65c786b93b538d51d49a87e1ccc5725e67.tar libvpx-b2f0ae65c786b93b538d51d49a87e1ccc5725e67.tar.gz libvpx-b2f0ae65c786b93b538d51d49a87e1ccc5725e67.tar.bz2 libvpx-b2f0ae65c786b93b538d51d49a87e1ccc5725e67.zip | |
Merge "Removing subpix_fn_table struct."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodemb.c | 7 | ||||
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 6 | ||||
| -rw-r--r-- | vp9/encoder/vp9_temporal_filter.c | 6 |
3 files changed, 9 insertions, 10 deletions
diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index d1485307d..5ea75c314 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -37,10 +37,9 @@ void vp9_setup_interp_filters(MACROBLOCKD *xd, INTERP_FILTER filter, set_ref_ptrs(cm, xd, -1, -1); } - xd->subpix.filter_x = xd->subpix.filter_y = - vp9_get_interp_kernel(filter == SWITCHABLE ? EIGHTTAP : filter); - - assert(((intptr_t)xd->subpix.filter_x & 0xff) == 0); + xd->interp_kernel = vp9_get_interp_kernel(filter == SWITCHABLE ? EIGHTTAP + : filter); + assert(((intptr_t)xd->interp_kernel & 0xff) == 0); } void vp9_subtract_block_c(int rows, int cols, diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 3be79f46b..ebe5f80f2 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1517,8 +1517,8 @@ static int64_t encode_inter_mb_segment(VP9_COMP *cpi, vp9_build_inter_predictor(pre, pd->pre[ref].stride, dst, pd->dst.stride, &mi->bmi[i].as_mv[ref].as_mv, - &xd->block_refs[ref]->sf, - width, height, ref, &xd->subpix, MV_PRECISION_Q3, + &xd->block_refs[ref]->sf, width, height, ref, + xd->interp_kernel, MV_PRECISION_Q3, mi_col * MI_SIZE + 4 * (i % 2), mi_row * MI_SIZE + 4 * (i / 2)); } @@ -2536,7 +2536,7 @@ static void joint_motion_search(VP9_COMP *cpi, MACROBLOCK *x, &frame_mv[refs[!id]].as_mv, &xd->block_refs[!id]->sf, pw, ph, 0, - &xd->subpix, MV_PRECISION_Q3, + xd->interp_kernel, MV_PRECISION_Q3, mi_col * MI_SIZE, mi_row * MI_SIZE); // Compound motion search on first ref frame. diff --git a/vp9/encoder/vp9_temporal_filter.c b/vp9/encoder/vp9_temporal_filter.c index c2eea0aaa..c9a424648 100644 --- a/vp9/encoder/vp9_temporal_filter.c +++ b/vp9/encoder/vp9_temporal_filter.c @@ -60,7 +60,7 @@ static void temporal_filter_predictors_mb_c(MACROBLOCKD *xd, scale, 16, 16, which_mv, - &xd->subpix, MV_PRECISION_Q3, x, y); + xd->interp_kernel, MV_PRECISION_Q3, x, y); vp9_build_inter_predictor(u_mb_ptr, uv_stride, &pred[256], uv_block_size, @@ -68,7 +68,7 @@ static void temporal_filter_predictors_mb_c(MACROBLOCKD *xd, scale, uv_block_size, uv_block_size, which_mv, - &xd->subpix, mv_precision_uv, x, y); + xd->interp_kernel, mv_precision_uv, x, y); vp9_build_inter_predictor(v_mb_ptr, uv_stride, &pred[512], uv_block_size, @@ -76,7 +76,7 @@ static void temporal_filter_predictors_mb_c(MACROBLOCKD *xd, scale, uv_block_size, uv_block_size, which_mv, - &xd->subpix, mv_precision_uv, x, y); + xd->interp_kernel, mv_precision_uv, x, y); } void vp9_temporal_filter_apply_c(uint8_t *frame1, |