From 0a6e42c241ba96448dbe57665f254c8c24430c8c Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Thu, 22 May 2014 12:17:18 -0700 Subject: [PATCH] Adding several consts to assign_std_frame_bits(). Change-Id: I6c27c60f7192b1b397f01882ab68a68cdf767534 --- vp9/encoder/vp9_firstpass.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index efc20f6..de3fc28 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -1769,23 +1769,14 @@ static void assign_std_frame_bits(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) { const int max_bits = frame_max_bits(&cpi->rc, oxcf); // Calculate modified prediction error used in bit allocation. const double modified_err = calculate_modified_err(twopass, oxcf, this_frame); - int target_frame_size; - double err_fraction; - - if (twopass->gf_group_error_left > 0) - // What portion of the remaining GF group error is used by this frame. - err_fraction = modified_err / twopass->gf_group_error_left; - else - err_fraction = 0.0; - - // How many of those bits available for allocation should we give it? - target_frame_size = (int)((double)twopass->gf_group_bits * err_fraction); - - // Clip target size to 0 - max_bits (or cpi->twopass.gf_group_bits) at - // the top end. - target_frame_size = clamp(target_frame_size, 0, - MIN(max_bits, (int)twopass->gf_group_bits)); - + // What portion of the remaining GF group error is used by this frame. + const double err_fraction = twopass->gf_group_error_left > 0 ? + modified_err / twopass->gf_group_error_left : 0.0; + // How many of those bits available for allocation should we give it? Clip + // target size to 0 - max_bits (or cpi->twopass.gf_group_bits) at the top end. + const int target_frame_size = + clamp((int)(twopass->gf_group_bits * err_fraction), + 0, MIN(max_bits, (int)twopass->gf_group_bits)); // Adjust error and bits remaining. twopass->gf_group_error_left -= (int64_t)modified_err; -- 2.7.4