Commit 5306eda9 authored by Deb Mukherjee's avatar Deb Mukherjee Committed by Gerrit Code Review

Merge "Enforce max-intra-pct in one-pass cbr mode"

parents ecf392a1 12ae6eaf
......@@ -1338,9 +1338,10 @@ static int calc_pframe_target_size_one_pass_cbr(const VP9_COMP *cpi) {
static int calc_iframe_target_size_one_pass_cbr(const VP9_COMP *cpi) {
const RATE_CONTROL *rc = &cpi->rc;
int target;
if (cpi->common.current_video_frame == 0) {
return ((cpi->oxcf.starting_buffer_level / 2) > INT_MAX)
target = ((cpi->oxcf.starting_buffer_level / 2) > INT_MAX)
? INT_MAX : (int)(cpi->oxcf.starting_buffer_level / 2);
} else {
const int initial_boost = 32;
......@@ -1349,8 +1350,9 @@ static int calc_iframe_target_size_one_pass_cbr(const VP9_COMP *cpi) {
kf_boost = (int)(kf_boost * rc->frames_since_key /
(cpi->output_framerate / 2));
}
return ((16 + kf_boost) * rc->av_per_frame_bandwidth) >> 4;
target = ((16 + kf_boost) * rc->av_per_frame_bandwidth) >> 4;
}
return vp9_rc_clamp_iframe_target_size(cpi, target);
}
void vp9_rc_get_svc_params(VP9_COMP *cpi) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment