tpl_model.c: add missing CONFIG_* checks av1_laplace_estimate_frame_rate() is only used in tpl_model.c if `CONFIG_BITRATE_ACCURACY=1`. In tpl_model.h it is only used by rc_log_frame_encode_param() which is only used in a block protected by `CONFIG_RATECTRL_LOG && CONFIG_THREE_PASS && CONFIG_BITRATE_ACCURACY`. Bug: aomedia:3416 Change-Id: I9ec618fc3c99a280c54abd0a178c6090ef7e847c
diff --git a/av1/encoder/tpl_model.c b/av1/encoder/tpl_model.c index 901d444..202ac1f 100644 --- a/av1/encoder/tpl_model.c +++ b/av1/encoder/tpl_model.c
@@ -2148,6 +2148,7 @@ return r; } +#if CONFIG_BITRATE_ACCURACY double av1_laplace_estimate_frame_rate(int q_index, int block_count, const double *abs_coeff_mean, int coeff_num) { @@ -2165,6 +2166,7 @@ est_rate *= block_count; return est_rate; } +#endif // CONFIG_BITRATE_ACCURACY double av1_estimate_coeff_entropy(double q_step, double b, double zero_bin_ratio, int qcoeff) {
diff --git a/av1/encoder/tpl_model.h b/av1/encoder/tpl_model.h index 44e1f32..3690671 100644 --- a/av1/encoder/tpl_model.h +++ b/av1/encoder/tpl_model.h
@@ -519,6 +519,7 @@ */ double av1_laplace_entropy(double q_step, double b, double zero_bin_ratio); +#if CONFIG_BITRATE_ACCURACY /*!\brief Compute the frame rate using transform block stats * * Assume each position i in the transform block is of Laplace distribution @@ -539,6 +540,7 @@ double av1_laplace_estimate_frame_rate(int q_index, int block_count, const double *abs_coeff_mean, int coeff_num); +#endif // CONFIG_BITRATE_ACCURACY /* *!\brief Init TplTxfmStats @@ -712,6 +714,7 @@ rc_log->txfm_stats_list[coding_index] = *txfm_stats; } +#if CONFIG_RATECTRL_LOG && CONFIG_THREE_PASS && CONFIG_BITRATE_ACCURACY static inline void rc_log_frame_encode_param(RATECTRL_LOG *rc_log, int coding_index, double qstep_ratio, int q_index, @@ -727,6 +730,7 @@ txfm_stats->coeff_num); } } +#endif // CONFIG_RATECTRL_LOG && CONFIG_THREE_PASS && CONFIG_BITRATE_ACCURACY static inline void rc_log_frame_entropy(RATECTRL_LOG *rc_log, int coding_index, double act_rate,