Commit 19dc1386 authored by Sebastien Alaiwan's avatar Sebastien Alaiwan

convolve.c: make functions static

Change-Id: I764a0e7f4a3b86d3a4c4a2b464e759f2b49bcbed
parent a28c1734
...@@ -177,11 +177,11 @@ void av1_convolve_vert_c(const uint8_t *src, int src_stride, uint8_t *dst, ...@@ -177,11 +177,11 @@ void av1_convolve_vert_c(const uint8_t *src, int src_stride, uint8_t *dst,
} }
} }
void av1_convolve_vert_scale(const uint8_t *src, int src_stride, uint8_t *dst, static void av1_convolve_vert_scale(const uint8_t *src, int src_stride,
int dst_stride, int w, int h, uint8_t *dst, int dst_stride, int w, int h,
const InterpFilterParams filter_params, const InterpFilterParams filter_params,
const int subpel_y_qn, int y_step_qn, const int subpel_y_qn, int y_step_qn,
ConvolveParams *conv_params) { ConvolveParams *conv_params) {
int x, y; int x, y;
int filter_size = filter_params.taps; int filter_size = filter_params.taps;
assert(conv_params->round == CONVOLVE_OPT_ROUND); assert(conv_params->round == CONVOLVE_OPT_ROUND);
...@@ -235,11 +235,12 @@ static void convolve_copy(const uint8_t *src, int src_stride, uint8_t *dst, ...@@ -235,11 +235,12 @@ static void convolve_copy(const uint8_t *src, int src_stride, uint8_t *dst,
} }
} }
void av1_convolve_horiz_facade(const uint8_t *src, int src_stride, uint8_t *dst, static void av1_convolve_horiz_facade(const uint8_t *src, int src_stride,
int dst_stride, int w, int h, uint8_t *dst, int dst_stride, int w,
const InterpFilterParams filter_params, int h,
const int subpel_x_q4, int x_step_q4, const InterpFilterParams filter_params,
ConvolveParams *conv_params) { const int subpel_x_q4, int x_step_q4,
ConvolveParams *conv_params) {
assert(conv_params->round == CONVOLVE_OPT_ROUND); assert(conv_params->round == CONVOLVE_OPT_ROUND);
if (filter_params.taps == SUBPEL_TAPS) { if (filter_params.taps == SUBPEL_TAPS) {
const int16_t *filter_x = const int16_t *filter_x =
...@@ -256,11 +257,12 @@ void av1_convolve_horiz_facade(const uint8_t *src, int src_stride, uint8_t *dst, ...@@ -256,11 +257,12 @@ void av1_convolve_horiz_facade(const uint8_t *src, int src_stride, uint8_t *dst,
} }
} }
void av1_convolve_horiz_facade_c(const uint8_t *src, int src_stride, static void av1_convolve_horiz_facade_c(const uint8_t *src, int src_stride,
uint8_t *dst, int dst_stride, int w, int h, uint8_t *dst, int dst_stride, int w,
const InterpFilterParams filter_params, int h,
const int subpel_x_q4, int x_step_q4, const InterpFilterParams filter_params,
ConvolveParams *conv_params) { const int subpel_x_q4, int x_step_q4,
ConvolveParams *conv_params) {
assert(conv_params->round == CONVOLVE_OPT_ROUND); assert(conv_params->round == CONVOLVE_OPT_ROUND);
if (filter_params.taps == SUBPEL_TAPS) { if (filter_params.taps == SUBPEL_TAPS) {
const int16_t *filter_x = const int16_t *filter_x =
...@@ -299,11 +301,11 @@ void av1_convolve_horiz_facade_scale(const uint8_t *src, int src_stride, ...@@ -299,11 +301,11 @@ void av1_convolve_horiz_facade_scale(const uint8_t *src, int src_stride,
} }
} }
void av1_convolve_vert_facade(const uint8_t *src, int src_stride, uint8_t *dst, static void av1_convolve_vert_facade(const uint8_t *src, int src_stride,
int dst_stride, int w, int h, uint8_t *dst, int dst_stride, int w, int h,
const InterpFilterParams filter_params, const InterpFilterParams filter_params,
const int subpel_y_q4, int y_step_q4, const int subpel_y_q4, int y_step_q4,
ConvolveParams *conv_params) { ConvolveParams *conv_params) {
assert(conv_params->round == CONVOLVE_OPT_ROUND); assert(conv_params->round == CONVOLVE_OPT_ROUND);
if (filter_params.taps == SUBPEL_TAPS) { if (filter_params.taps == SUBPEL_TAPS) {
const int16_t *filter_y = const int16_t *filter_y =
...@@ -321,11 +323,12 @@ void av1_convolve_vert_facade(const uint8_t *src, int src_stride, uint8_t *dst, ...@@ -321,11 +323,12 @@ void av1_convolve_vert_facade(const uint8_t *src, int src_stride, uint8_t *dst,
} }
} }
void av1_convolve_vert_facade_c(const uint8_t *src, int src_stride, static void av1_convolve_vert_facade_c(const uint8_t *src, int src_stride,
uint8_t *dst, int dst_stride, int w, int h, uint8_t *dst, int dst_stride, int w,
const InterpFilterParams filter_params, int h,
const int subpel_y_q4, int y_step_q4, const InterpFilterParams filter_params,
ConvolveParams *conv_params) { const int subpel_y_q4, int y_step_q4,
ConvolveParams *conv_params) {
assert(conv_params->round == CONVOLVE_OPT_ROUND); assert(conv_params->round == CONVOLVE_OPT_ROUND);
if (filter_params.taps == SUBPEL_TAPS) { if (filter_params.taps == SUBPEL_TAPS) {
const int16_t *filter_y = const int16_t *filter_y =
...@@ -1575,12 +1578,10 @@ void av1_highbd_convolve_horiz_c(const uint16_t *src, int src_stride, ...@@ -1575,12 +1578,10 @@ void av1_highbd_convolve_horiz_c(const uint16_t *src, int src_stride,
} }
} }
void av1_highbd_convolve_horiz_scale(const uint16_t *src, int src_stride, static void av1_highbd_convolve_horiz_scale(
uint16_t *dst, int dst_stride, int w, const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w,
int h, int h, const InterpFilterParams filter_params, const int subpel_x_qn,
const InterpFilterParams filter_params, int x_step_qn, int avg, int bd) {
const int subpel_x_qn, int x_step_qn,
int avg, int bd) {
int x, y; int x, y;
int filter_size = filter_params.taps; int filter_size = filter_params.taps;
src -= filter_size / 2 - 1; src -= filter_size / 2 - 1;
...@@ -1642,11 +1643,10 @@ void av1_highbd_convolve_vert_c(const uint16_t *src, int src_stride, ...@@ -1642,11 +1643,10 @@ void av1_highbd_convolve_vert_c(const uint16_t *src, int src_stride,
} }
} }
void av1_highbd_convolve_vert_scale(const uint16_t *src, int src_stride, static void av1_highbd_convolve_vert_scale(
uint16_t *dst, int dst_stride, int w, int h, const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w,
const InterpFilterParams filter_params, int h, const InterpFilterParams filter_params, const int subpel_y_qn,
const int subpel_y_qn, int y_step_qn, int y_step_qn, int avg, int bd) {
int avg, int bd) {
int x, y; int x, y;
int filter_size = filter_params.taps; int filter_size = filter_params.taps;
src -= src_stride * (filter_size / 2 - 1); src -= src_stride * (filter_size / 2 - 1);
...@@ -1701,12 +1701,10 @@ static void highbd_convolve_copy(const uint16_t *src, int src_stride, ...@@ -1701,12 +1701,10 @@ static void highbd_convolve_copy(const uint16_t *src, int src_stride,
} }
} }
void av1_highbd_convolve_horiz_facade(const uint8_t *src8, int src_stride, static void av1_highbd_convolve_horiz_facade(
uint8_t *dst8, int dst_stride, int w, const uint8_t *src8, int src_stride, uint8_t *dst8, int dst_stride, int w,
int h, int h, const InterpFilterParams filter_params, const int subpel_x_q4,
const InterpFilterParams filter_params, int x_step_q4, int avg, int bd) {
const int subpel_x_q4, int x_step_q4,
int avg, int bd) {
uint16_t *src = CONVERT_TO_SHORTPTR(src8); uint16_t *src = CONVERT_TO_SHORTPTR(src8);
uint16_t *dst = CONVERT_TO_SHORTPTR(dst8); uint16_t *dst = CONVERT_TO_SHORTPTR(dst8);
if (filter_params.taps == SUBPEL_TAPS) { if (filter_params.taps == SUBPEL_TAPS) {
...@@ -1724,7 +1722,7 @@ void av1_highbd_convolve_horiz_facade(const uint8_t *src8, int src_stride, ...@@ -1724,7 +1722,7 @@ void av1_highbd_convolve_horiz_facade(const uint8_t *src8, int src_stride,
} }
} }
void av1_highbd_convolve_horiz_facade_scale( static void av1_highbd_convolve_horiz_facade_scale(
const uint8_t *src8, int src_stride, uint8_t *dst8, int dst_stride, int w, const uint8_t *src8, int src_stride, uint8_t *dst8, int dst_stride, int w,
int h, const InterpFilterParams filter_params, const int subpel_x_qn, int h, const InterpFilterParams filter_params, const int subpel_x_qn,
int x_step_qn, int avg, int bd) { int x_step_qn, int avg, int bd) {
...@@ -1737,12 +1735,10 @@ void av1_highbd_convolve_horiz_facade_scale( ...@@ -1737,12 +1735,10 @@ void av1_highbd_convolve_horiz_facade_scale(
bd); bd);
} }
void av1_highbd_convolve_vert_facade(const uint8_t *src8, int src_stride, static void av1_highbd_convolve_vert_facade(
uint8_t *dst8, int dst_stride, int w, const uint8_t *src8, int src_stride, uint8_t *dst8, int dst_stride, int w,
int h, int h, const InterpFilterParams filter_params, const int subpel_y_q4,
const InterpFilterParams filter_params, int y_step_q4, int avg, int bd) {
const int subpel_y_q4, int y_step_q4,
int avg, int bd) {
uint16_t *src = CONVERT_TO_SHORTPTR(src8); uint16_t *src = CONVERT_TO_SHORTPTR(src8);
uint16_t *dst = CONVERT_TO_SHORTPTR(dst8); uint16_t *dst = CONVERT_TO_SHORTPTR(dst8);
...@@ -1762,7 +1758,7 @@ void av1_highbd_convolve_vert_facade(const uint8_t *src8, int src_stride, ...@@ -1762,7 +1758,7 @@ void av1_highbd_convolve_vert_facade(const uint8_t *src8, int src_stride,
} }
} }
void av1_highbd_convolve_vert_facade_scale( static void av1_highbd_convolve_vert_facade_scale(
const uint8_t *src8, int src_stride, uint8_t *dst8, int dst_stride, int w, const uint8_t *src8, int src_stride, uint8_t *dst8, int dst_stride, int w,
int h, const InterpFilterParams filter_params, const int subpel_y_qn, int h, const InterpFilterParams filter_params, const int subpel_y_qn,
int y_step_qn, int avg, int bd) { int y_step_qn, int avg, int bd) {
......
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