diff options
Diffstat (limited to 'vp8/common/reconinter.c')
| -rw-r--r-- | vp8/common/reconinter.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/vp8/common/reconinter.c b/vp8/common/reconinter.c index 5b50b0335..1c4cdb386 100644 --- a/vp8/common/reconinter.c +++ b/vp8/common/reconinter.c @@ -11,7 +11,6 @@ #include "vpx_ports/config.h" #include "vpx/vpx_integer.h" -#include "recon.h" #include "subpixel.h" #include "blockd.h" #include "reconinter.h" @@ -310,8 +309,7 @@ static void build_inter_predictors4b(MACROBLOCKD *xd, BLOCKD *d, int pitch) { xd->subpixel_predict8x8(ptr, d->pre_stride, (mv.as_mv.col & 7) << 1, (mv.as_mv.row & 7) << 1, pred_ptr, pitch); } else { - RECON_INVOKE(&xd->rtcd->recon, copy8x8) - (ptr, d->pre_stride, pred_ptr, pitch); + vp8_copy_mem8x8(ptr, d->pre_stride, pred_ptr, pitch); } } @@ -337,8 +335,7 @@ static void build_2nd_inter_predictors4b(MACROBLOCKD *xd, xd->subpixel_predict_avg8x8(ptr, d->pre_stride, (mv.as_mv.col & 7) << 1, (mv.as_mv.row & 7) << 1, pred_ptr, pitch); } else { - RECON_INVOKE(&xd->rtcd->recon, avg8x8) - (ptr, d->pre_stride, pred_ptr, pitch); + vp8_avg_mem8x8(ptr, d->pre_stride, pred_ptr, pitch); } } @@ -357,7 +354,7 @@ static void build_inter_predictors2b(MACROBLOCKD *xd, BLOCKD *d, int pitch) { xd->subpixel_predict8x4(ptr, d->pre_stride, (mv.as_mv.col & 7) << 1, (mv.as_mv.row & 7) << 1, pred_ptr, pitch); } else { - RECON_INVOKE(&xd->rtcd->recon, copy8x4)(ptr, d->pre_stride, pred_ptr, pitch); + vp8_copy_mem8x4(ptr, d->pre_stride, pred_ptr, pitch); } } @@ -741,10 +738,8 @@ void vp8_build_1st_inter16x16_predictors_mbuv(MACROBLOCKD *xd, xd->subpixel_predict8x8(vptr, pre_stride, _o16x16mv.as_mv.col & 15, _o16x16mv.as_mv.row & 15, dst_v, dst_uvstride); } else { - RECON_INVOKE(&xd->rtcd->recon, copy8x8) - (uptr, pre_stride, dst_u, dst_uvstride); - RECON_INVOKE(&xd->rtcd->recon, copy8x8) - (vptr, pre_stride, dst_v, dst_uvstride); + vp8_copy_mem8x8(uptr, pre_stride, dst_u, dst_uvstride); + vp8_copy_mem8x8(vptr, pre_stride, dst_v, dst_uvstride); } } @@ -863,8 +858,7 @@ void vp8_build_2nd_inter16x16_predictors_mby(MACROBLOCKD *xd, } else { // TODO Needs to AVERAGE with the dst_y // For now, do not apply the prediction filter in these cases! - RECON_INVOKE(&xd->rtcd->recon, avg16x16)(ptr, pre_stride, dst_y, - dst_ystride); + vp8_avg_mem16x16(ptr, pre_stride, dst_y, dst_ystride); } } else #endif // CONFIG_PRED_FILTER @@ -873,8 +867,7 @@ void vp8_build_2nd_inter16x16_predictors_mby(MACROBLOCKD *xd, xd->subpixel_predict_avg16x16(ptr, pre_stride, (mv_col & 7) << 1, (mv_row & 7) << 1, dst_y, dst_ystride); } else { - RECON_INVOKE(&xd->rtcd->recon, avg16x16)(ptr, pre_stride, dst_y, - dst_ystride); + vp8_avg_mem16x16(ptr, pre_stride, dst_y, dst_ystride); } } } @@ -937,8 +930,7 @@ void vp8_build_2nd_inter16x16_predictors_mbuv(MACROBLOCKD *xd, } else { // TODO Needs to AVERAGE with the dst_[u|v] // For now, do not apply the prediction filter here! - RECON_INVOKE(&xd->rtcd->recon, avg8x8)(pSrc, pre_stride, pDst, - dst_uvstride); + vp8_avg_mem8x8(pSrc, pre_stride, pDst, dst_uvstride); } // V @@ -953,8 +945,8 @@ void vp8_build_2nd_inter16x16_predictors_mbuv(MACROBLOCKD *xd, xd->subpixel_predict_avg8x8(vptr, pre_stride, omv_col & 15, omv_row & 15, dst_v, dst_uvstride); } else { - RECON_INVOKE(&xd->rtcd->recon, avg8x8)(uptr, pre_stride, dst_u, dst_uvstride); - RECON_INVOKE(&xd->rtcd->recon, avg8x8)(vptr, pre_stride, dst_v, dst_uvstride); + vp8_avg_mem8x8(uptr, pre_stride, dst_u, dst_uvstride); + vp8_avg_mem8x8(vptr, pre_stride, dst_v, dst_uvstride); } } |