diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-08-14 18:26:35 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-08-14 18:26:35 -0700 |
| commit | 480693b9951120f32788e7f82bbc6c6079fb12b0 (patch) | |
| tree | cae3e3c48e7dc8fb0f7ff69490fef9bb2425a5df /vp9/encoder/vp9_ratectrl.c | |
| parent | 2aea20d6137ad9ba322660ed1a9d90c6909a002c (diff) | |
| parent | 5a78c4065727c6bc113d1c83222cc0ba4abf9e36 (diff) | |
| download | libvpx-480693b9951120f32788e7f82bbc6c6079fb12b0.tar libvpx-480693b9951120f32788e7f82bbc6c6079fb12b0.tar.gz libvpx-480693b9951120f32788e7f82bbc6c6079fb12b0.tar.bz2 libvpx-480693b9951120f32788e7f82bbc6c6079fb12b0.zip | |
Merge "Moving framerate from VP9EncoderConfig to VP9_COMP."
Diffstat (limited to 'vp9/encoder/vp9_ratectrl.c')
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index 290567ef1..9da2adec4 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -1208,7 +1208,7 @@ static int calc_iframe_target_size_one_pass_cbr(const VP9_COMP *cpi) { ? INT_MAX : (int)(rc->starting_buffer_level / 2); } else { int kf_boost = 32; - double framerate = oxcf->framerate; + double framerate = cpi->framerate; if (svc->number_temporal_layers > 1 && oxcf->rc_mode == VPX_CBR) { // Use the layer framerate for temporal layers CBR mode. @@ -1364,7 +1364,7 @@ void vp9_rc_update_framerate(VP9_COMP *cpi) { RATE_CONTROL *const rc = &cpi->rc; int vbr_max_bits; - rc->avg_frame_bandwidth = (int)(oxcf->target_bandwidth / oxcf->framerate); + rc->avg_frame_bandwidth = (int)(oxcf->target_bandwidth / cpi->framerate); rc->min_frame_bandwidth = (int)(rc->avg_frame_bandwidth * oxcf->two_pass_vbrmin_section / 100); |