From b09d37af0c4715db6fb29264d33b48bae0bd3e1b Mon Sep 17 00:00:00 2001 From: James Zern Date: Sat, 13 Jul 2013 18:14:03 -0700 Subject: [PATCH] vp9_loopfilter.c: make some functions static + drop 'vp9_' Change-Id: I8c8f1f421f7fc84d2efb80349cd725de3c9bf6bd --- vp9/common/vp9_loopfilter.c | 13 ++++++------- vp9/common/vp9_loopfilter.h | 12 ------------ 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/vp9/common/vp9_loopfilter.c b/vp9/common/vp9_loopfilter.c index 37209a74b..278fe179c 100644 --- a/vp9/common/vp9_loopfilter.c +++ b/vp9/common/vp9_loopfilter.c @@ -33,8 +33,7 @@ static void lf_init_lut(loop_filter_info_n *lfi) { lfi->mode_lf_lut[NEWMV] = 1; } -void vp9_loop_filter_update_sharpness(loop_filter_info_n *lfi, - int sharpness_lvl) { +static void update_sharpness(loop_filter_info_n *const lfi, int sharpness_lvl) { int lvl; // For each possible value for the loop filter fill out limits @@ -62,7 +61,7 @@ void vp9_loop_filter_init(VP9_COMMON *cm) { int i; // init limits for given sharpness - vp9_loop_filter_update_sharpness(lfi, cm->sharpness_level); + update_sharpness(lfi, cm->sharpness_level); cm->last_sharpness_level = cm->sharpness_level; // init LUT for lvl and hev thr picking @@ -73,8 +72,8 @@ void vp9_loop_filter_init(VP9_COMMON *cm) { vpx_memset(lfi->hev_thr[i], i, SIMD_WIDTH); } -void vp9_loop_filter_frame_init(VP9_COMMON *cm, MACROBLOCKD *xd, - int default_filt_lvl) { +static void loop_filter_frame_init(VP9_COMMON *const cm, MACROBLOCKD *const xd, + int default_filt_lvl) { int seg; // n_shift is the a multiplier for lf_deltas // the multiplier is 1 for when filter_lvl is between 0 and 31; @@ -84,7 +83,7 @@ void vp9_loop_filter_frame_init(VP9_COMMON *cm, MACROBLOCKD *xd, // update limits if sharpness has changed if (cm->last_sharpness_level != cm->sharpness_level) { - vp9_loop_filter_update_sharpness(lfi, cm->sharpness_level); + update_sharpness(lfi, cm->sharpness_level); cm->last_sharpness_level = cm->sharpness_level; } @@ -355,7 +354,7 @@ void vp9_loop_filter_frame(VP9_COMMON *cm, MACROBLOCKD *xd, int mi_row, mi_col; // Initialize the loop filter for this frame. - vp9_loop_filter_frame_init(cm, xd, frame_filter_level); + loop_filter_frame_init(cm, xd, frame_filter_level); for (mi_row = 0; mi_row < cm->mi_rows; mi_row += MI_BLOCK_SIZE) { MODE_INFO* const mi = cm->mi + mi_row * cm->mode_info_stride; diff --git a/vp9/common/vp9_loopfilter.h b/vp9/common/vp9_loopfilter.h index 52d3b2d63..093f89360 100644 --- a/vp9/common/vp9_loopfilter.h +++ b/vp9/common/vp9_loopfilter.h @@ -68,20 +68,8 @@ struct macroblockd; void vp9_loop_filter_init(struct VP9Common *cm); -void vp9_loop_filter_frame_init(struct VP9Common *cm, - struct macroblockd *mbd, - int default_filt_lvl); - void vp9_loop_filter_frame(struct VP9Common *cm, struct macroblockd *mbd, int filter_level, int y_only); - -void vp9_loop_filter_partial_frame(struct VP9Common *cm, - struct macroblockd *mbd, - int default_filt_lvl); - -void vp9_loop_filter_update_sharpness(loop_filter_info_n *lfi, - int sharpness_lvl); - #endif // VP9_COMMON_VP9_LOOPFILTER_H_