diff --git a/src/alf.c b/src/alf.c index b4c511ed..f3ce60b7 100644 --- a/src/alf.c +++ b/src/alf.c @@ -19,7 +19,7 @@ typedef struct filter_idx_count uint8_t filter_idx; } filter_idx_count; -int comparator(const void *v1, const void *v2) +static int comparator(const void *v1, const void *v2) { const filter_idx_count *p1 = (filter_idx_count *)v1; const filter_idx_count *p2 = (filter_idx_count *)v2; @@ -466,7 +466,7 @@ static double calc_error_for_cc_alf_coeffs(const alf_covariance *cov, const int1 return error / factor; } -int length_uvlc(int ui_code) +static int length_uvlc(int ui_code) { int ui_length = 1; int ui_temp = ++ui_code; @@ -3779,7 +3779,7 @@ static void alf_cabac_reset_bits(cabac_data_t * const data) data->buffered_byte = 0xff; } -void code_alf_ctu_enable_flags_channel(encoder_state_t * const state, +static void code_alf_ctu_enable_flags_channel(encoder_state_t * const state, cabac_data_t * const cabac, channel_type channel, alf_aps *aps) @@ -5255,7 +5255,7 @@ static void round_filt_coeff_cc_alf(int16_t *filter_coeff_quant, double *filter_ } } -int get_coeff_rate_cc_alf(short chroma_coeff[MAX_NUM_CC_ALF_FILTERS][MAX_NUM_CC_ALF_CHROMA_COEFF], bool filter_enabled[MAX_NUM_CC_ALF_FILTERS], uint8_t filter_count, alf_component_id comp_id) +static int get_coeff_rate_cc_alf(short chroma_coeff[MAX_NUM_CC_ALF_FILTERS][MAX_NUM_CC_ALF_CHROMA_COEFF], bool filter_enabled[MAX_NUM_CC_ALF_FILTERS], uint8_t filter_count, alf_component_id comp_id) { int bits = 0; diff --git a/src/alf.h b/src/alf.h index ee74091e..3be810ee 100644 --- a/src/alf.h +++ b/src/alf.h @@ -326,6 +326,7 @@ static int gns_solve_by_chol(double lhs[MAX_NUM_ALF_LUMA_COEFF][MAX_NUM_ALF_LUMA static int gns_solve_by_chol_clip_gns(alf_covariance *cov, const int *clip, double *x, int num_eq); static double calc_error_for_coeffs(const alf_covariance *cov, const int *clip, const int *coeff, const int num_coeff, const int bit_depth); static double calc_error_for_cc_alf_coeffs(const alf_covariance *cov, const int16_t* coeff, const int num_coeff, const int bit_depth); +static int length_uvlc(int ui_code); static double get_dist_coeff_force_0(bool* coded_var_bins, double error_force_0_coeff_tab[MAX_NUM_ALF_CLASSES][2], int* bits_var_bin, int zero_bits_var_bin, const int num_filters, double lambda); static double get_dist_force_0(const alf_aps *alf_param, channel_type channel, const int num_filters, double error_tab_force_0_coeff[MAX_NUM_ALF_CLASSES][2], bool* coded_var_bins, double lambda, int filter_coeff_set[MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_LUMA_COEFF], int filter_clipp_set[MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_LUMA_COEFF]); static int get_cost_filter_coeff_force_0(const alf_aps *alf_param, channel_type channel, const int num_filters, bool* coded_var_bins, int p_diff_q_filter_coeff_int_pp[MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_LUMA_COEFF], int filter_clipp_set[MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_LUMA_COEFF]); @@ -491,6 +492,10 @@ static void round_filt_coeff_cc_alf(int16_t *filter_coeff_quant, double *filter_coeff, const int num_coeff, const int factor); +static int get_coeff_rate_cc_alf(short chroma_coeff[MAX_NUM_CC_ALF_FILTERS][MAX_NUM_CC_ALF_CHROMA_COEFF], + bool filter_enabled[MAX_NUM_CC_ALF_FILTERS], + uint8_t filter_count, alf_component_id comp_id); + static void derive_cc_alf_filter_coeff(alf_covariance *alf_covariance_frame_cc_alf, short filter_coeff[MAX_NUM_CC_ALF_FILTERS][MAX_NUM_CC_ALF_CHROMA_COEFF], const uint8_t filter_idx); @@ -570,7 +575,7 @@ static void filter_blk_cc_alf(encoder_state_t * const state, static void alf_cabac_reset_bits(cabac_data_t * const data); -void code_alf_ctu_enable_flags_channel(encoder_state_t * const state, +static void code_alf_ctu_enable_flags_channel(encoder_state_t * const state, cabac_data_t * const cabac, channel_type channel, alf_aps *aps);