From 89ca85dacda157862751bfd670cc44afe0dba06f Mon Sep 17 00:00:00 2001 From: Scott LaVarnway Date: Tue, 26 May 2015 04:22:11 -0700 Subject: [PATCH] Move inter_predictor to vp9_reconinter.h This function was originally static. Change-Id: I1922fa86711ace884d9f394210b6bb9ea2a0bfe3 --- vp9/common/vp9_reconinter.c | 13 ------------- vp9/common/vp9_reconinter.h | 20 ++++++++++++-------- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/vp9/common/vp9_reconinter.c b/vp9/common/vp9_reconinter.c index 11eaf2e2d..be5a1507d 100644 --- a/vp9/common/vp9_reconinter.c +++ b/vp9/common/vp9_reconinter.c @@ -20,19 +20,6 @@ #include "vp9/common/vp9_reconinter.h" #include "vp9/common/vp9_reconintra.h" -void inter_predictor(const uint8_t *src, int src_stride, - uint8_t *dst, int dst_stride, - const int subpel_x, - const int subpel_y, - const struct scale_factors *sf, - int w, int h, int ref, - const InterpKernel *kernel, - int xs, int ys) { - sf->predict[subpel_x != 0][subpel_y != 0][ref]( - src, src_stride, dst, dst_stride, - kernel[subpel_x], xs, kernel[subpel_y], ys, w, h); -} - #if CONFIG_VP9_HIGHBITDEPTH void high_inter_predictor(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, diff --git a/vp9/common/vp9_reconinter.h b/vp9/common/vp9_reconinter.h index e7057445a..7f63f5a30 100644 --- a/vp9/common/vp9_reconinter.h +++ b/vp9/common/vp9_reconinter.h @@ -18,14 +18,18 @@ extern "C" { #endif -void inter_predictor(const uint8_t *src, int src_stride, - uint8_t *dst, int dst_stride, - const int subpel_x, - const int subpel_y, - const struct scale_factors *sf, - int w, int h, int ref, - const InterpKernel *kernel, - int xs, int ys); +static INLINE void inter_predictor(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, + const int subpel_x, + const int subpel_y, + const struct scale_factors *sf, + int w, int h, int ref, + const InterpKernel *kernel, + int xs, int ys) { + sf->predict[subpel_x != 0][subpel_y != 0][ref]( + src, src_stride, dst, dst_stride, + kernel[subpel_x], xs, kernel[subpel_y], ys, w, h); +} #if CONFIG_VP9_HIGHBITDEPTH void high_inter_predictor(const uint8_t *src, int src_stride,