generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Using clamp() function instead of the same raw code.

Browse Source 
Change-Id: Ia2ffca072f5391b277ce1a0c4e5b4ece9ffc6831
This commit is contained in:
Dmitry Kovalev
2014-01-13 16:27:50 -08:00
parent dd31f2e4ae
commit 46a951c846
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vp9/encoder/vp9_firstpass.c
View File

@@ -1932,12 +1932,9 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) {
// Allocate bits to a normal frame that is neither a gf an arf or a key frame.
static void assign_std_frame_bits(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) {
int target_frame_size;
double modified_err;
double err_fraction;
// Max for a single frame.
int max_bits = frame_max_bits(cpi);
const int max_bits = frame_max_bits(cpi); // Max for a single frame.
// Calculate modified prediction error used in bit allocation.
modified_err = calculate_modified_err(cpi, this_frame);
@@ -1953,15 +1950,8 @@ static void assign_std_frame_bits(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) {
// Clip target size to 0 - max_bits (or cpi->twopass.gf_group_bits) at
// the top end.
if (target_frame_size < 0) {
target_frame_size = 0;
} else {
if (target_frame_size > max_bits)
target_frame_size = max_bits;
if (target_frame_size > cpi->twopass.gf_group_bits)
target_frame_size = (int)cpi->twopass.gf_group_bits;
}
target_frame_size = clamp(target_frame_size, 0,
MIN(max_bits, (int)cpi->twopass.gf_group_bits));
// Adjust error and bits remaining.
cpi->twopass.gf_group_error_left -= (int64_t)modified_err;