Commit 95fef214 authored by James Zern's avatar James Zern Committed by Gerrit Code Review
Browse files

Merge "fix vp10_convolve() signatures" into nextgenv2

parents 096d8ace 87c2db82
...@@ -102,8 +102,8 @@ void vp10_convolve(const uint8_t *src, int src_stride, uint8_t *dst, ...@@ -102,8 +102,8 @@ void vp10_convolve(const uint8_t *src, int src_stride, uint8_t *dst,
#else #else
const INTERP_FILTER interp_filter, const INTERP_FILTER interp_filter,
#endif #endif
const int subpel_x_q4, int x_step_q4, const int subpel_y_q4, const int subpel_x_q4, int x_step_q4,
int y_step_q4, int ref_idx) { const int subpel_y_q4, int y_step_q4, int ref_idx) {
int ignore_horiz = x_step_q4 == 16 && subpel_x_q4 == 0; int ignore_horiz = x_step_q4 == 16 && subpel_x_q4 == 0;
int ignore_vert = y_step_q4 == 16 && subpel_y_q4 == 0; int ignore_vert = y_step_q4 == 16 && subpel_y_q4 == 0;
......
...@@ -14,9 +14,8 @@ void vp10_convolve(const uint8_t *src, int src_stride, ...@@ -14,9 +14,8 @@ void vp10_convolve(const uint8_t *src, int src_stride,
#else #else
const INTERP_FILTER interp_filter, const INTERP_FILTER interp_filter,
#endif #endif
const int subpel_x, const int subpel_x, int xstep,
const int subpel_y, const int subpel_y, int ystep, int avg);
int xstep, int ystep, int avg);
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
void vp10_highbd_convolve(const uint8_t *src, int src_stride, void vp10_highbd_convolve(const uint8_t *src, int src_stride,
...@@ -27,9 +26,9 @@ void vp10_highbd_convolve(const uint8_t *src, int src_stride, ...@@ -27,9 +26,9 @@ void vp10_highbd_convolve(const uint8_t *src, int src_stride,
#else #else
const INTERP_FILTER interp_filter, const INTERP_FILTER interp_filter,
#endif #endif
const int subpel_x, const int subpel_x, int xstep,
const int subpel_y, const int subpel_y, int ystep,
int xstep, int ystep, int avg, int bd); int avg, int bd);
#endif // CONFIG_VP9_HIGHBITDEPTH #endif // CONFIG_VP9_HIGHBITDEPTH
#ifdef __cplusplus #ifdef __cplusplus
......
Supports Markdown
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