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

Merge "Fix unit test failures"

Browse Source
This commit is contained in:
Yaowu Xu 2013-11-26 11:22:30 -08:00 committed by Gerrit Code Review
commit 5e4f4196a9
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vp9/encoder/vp9_firstpass.c
View File

@ -336,9 +336,11 @@ static int frame_max_bits(VP9_COMP *cpi) {
const double max_bits = (1.0 * cpi->twopass.bits_left /
(cpi->twopass.total_stats.count - cpi->common.current_video_frame)) *
(cpi->oxcf.two_pass_vbrmax_section / 100.0);
// Trap case where we are out of bits.
return MAX((int)max_bits, 0);
if (max_bits < 0)
return 0;
if (max_bits >= INT_MAX)
return INT_MAX;
return (int)max_bits;
}
void vp9_init_first_pass(VP9_COMP *cpi) {

4
vp9/encoder/vp9_ratectrl.c
View File

@ -244,7 +244,7 @@ static void calc_iframe_target_size(VP9_COMP *cpi) {
cpi->rc.this_frame_target = target;
// Target rate per SB64 (including partial SB64s.
cpi->rc.sb64_target_rate = (cpi->rc.this_frame_target * 64 * 64) /
cpi->rc.sb64_target_rate = ((int64_t)cpi->rc.this_frame_target * 64 * 64) /
(cpi->common.width * cpi->common.height);
}
@ -274,7 +274,7 @@ static void calc_pframe_target_size(VP9_COMP *cpi) {
}
// Target rate per SB64 (including partial SB64s.
cpi->rc.sb64_target_rate = (cpi->rc.this_frame_target * 64 * 64) /
cpi->rc.sb64_target_rate = ((int64_t)cpi->rc.this_frame_target * 64 * 64) /
(cpi->common.width * cpi->common.height);