Make search filter level function static This is a legacy function but not used outside of the file. Make it static. Change-Id: I1d32c26aaf243202a7fa72056f5e74cf25bbb62a
diff --git a/av1/encoder/picklpf.c b/av1/encoder/picklpf.c index 48f6d08..a76f3a8 100644 --- a/av1/encoder/picklpf.c +++ b/av1/encoder/picklpf.c
@@ -100,13 +100,13 @@ return filt_err; } -int av1_search_filter_level(const YV12_BUFFER_CONFIG *sd, AV1_COMP *cpi, - int partial_frame, double *best_cost_ret +static int search_filter_level(const YV12_BUFFER_CONFIG *sd, AV1_COMP *cpi, + int partial_frame, double *best_cost_ret #if CONFIG_LOOPFILTER_LEVEL - , - int plane, int dir + , + int plane, int dir #endif - ) { + ) { const AV1_COMMON *const cm = &cpi->common; const struct loopfilter *const lf = &cm->lf; const int min_filter_level = 0; @@ -271,20 +271,20 @@ #endif } else { #if CONFIG_LOOPFILTER_LEVEL - lf->filter_level[0] = lf->filter_level[1] = av1_search_filter_level( + lf->filter_level[0] = lf->filter_level[1] = search_filter_level( sd, cpi, method == LPF_PICK_FROM_SUBIMAGE, NULL, 0, 2); - lf->filter_level[0] = av1_search_filter_level( + lf->filter_level[0] = search_filter_level( sd, cpi, method == LPF_PICK_FROM_SUBIMAGE, NULL, 0, 0); - lf->filter_level[1] = av1_search_filter_level( + lf->filter_level[1] = search_filter_level( sd, cpi, method == LPF_PICK_FROM_SUBIMAGE, NULL, 0, 1); - lf->filter_level_u = av1_search_filter_level( + lf->filter_level_u = search_filter_level( sd, cpi, method == LPF_PICK_FROM_SUBIMAGE, NULL, 1, 0); - lf->filter_level_v = av1_search_filter_level( + lf->filter_level_v = search_filter_level( sd, cpi, method == LPF_PICK_FROM_SUBIMAGE, NULL, 2, 0); #else - lf->filter_level = av1_search_filter_level( - sd, cpi, method == LPF_PICK_FROM_SUBIMAGE, NULL); + lf->filter_level = + search_filter_level(sd, cpi, method == LPF_PICK_FROM_SUBIMAGE, NULL); #endif // CONFIG_LOOPFILTER_LEVEL } }
diff --git a/av1/encoder/picklpf.h b/av1/encoder/picklpf.h index a61addf..2a16835 100644 --- a/av1/encoder/picklpf.h +++ b/av1/encoder/picklpf.h
@@ -21,13 +21,6 @@ struct yv12_buffer_config; struct AV1_COMP; int av1_get_max_filter_level(const AV1_COMP *cpi); -#if CONFIG_LOOPFILTER_LEVEL -int av1_search_filter_level(const YV12_BUFFER_CONFIG *sd, AV1_COMP *cpi, - int partial_frame, double *err, int plane, int dir); -#else -int av1_search_filter_level(const YV12_BUFFER_CONFIG *sd, AV1_COMP *cpi, - int partial_frame, double *err); -#endif void av1_pick_filter_level(const struct yv12_buffer_config *sd, struct AV1_COMP *cpi, LPF_PICK_METHOD method); #ifdef __cplusplus