diff options
| author | James Zern <jzern@google.com> | 2013-07-12 17:12:46 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2013-07-16 14:12:47 -0700 |
| commit | 9581eb6e8a15438a27bba10ba6f8de024296f1f7 (patch) | |
| tree | 6d259e66bd6dc128c5d3736329e45636a4ef88a6 /vp8/encoder/ratectrl.c | |
| parent | c0562d08f669683dc0d04a95e7d916195c39377a (diff) | |
| download | libvpx-9581eb6e8a15438a27bba10ba6f8de024296f1f7.tar libvpx-9581eb6e8a15438a27bba10ba6f8de024296f1f7.tar.gz libvpx-9581eb6e8a15438a27bba10ba6f8de024296f1f7.tar.bz2 libvpx-9581eb6e8a15438a27bba10ba6f8de024296f1f7.zip | |
use consistent framerate naming
s/frame_rate/framerate/g
Change-Id: I6fc3e088e419c5f46e3a9390dd8a2cad2677a2fc
Diffstat (limited to 'vp8/encoder/ratectrl.c')
| -rw-r--r-- | vp8/encoder/ratectrl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp8/encoder/ratectrl.c b/vp8/encoder/ratectrl.c index 8e3c01d93..fd71b9aa1 100644 --- a/vp8/encoder/ratectrl.c +++ b/vp8/encoder/ratectrl.c @@ -388,7 +388,7 @@ static void calc_iframe_target_size(VP8_COMP *cpi) int initial_boost = 32; /* |3.0 * per_frame_bandwidth| */ /* Boost depends somewhat on frame rate: only used for 1 layer case. */ if (cpi->oxcf.number_of_layers == 1) { - kf_boost = MAX(initial_boost, (int)(2 * cpi->output_frame_rate - 16)); + kf_boost = MAX(initial_boost, (int)(2 * cpi->output_framerate - 16)); } else { /* Initial factor: set target size to: |3.0 * per_frame_bandwidth|. */ @@ -399,9 +399,9 @@ static void calc_iframe_target_size(VP8_COMP *cpi) kf_boost = kf_boost * kf_boost_qadjustment[Q] / 100; /* frame separation adjustment ( down) */ - if (cpi->frames_since_key < cpi->output_frame_rate / 2) + if (cpi->frames_since_key < cpi->output_framerate / 2) kf_boost = (int)(kf_boost - * cpi->frames_since_key / (cpi->output_frame_rate / 2)); + * cpi->frames_since_key / (cpi->output_framerate / 2)); /* Minimal target size is |2* per_frame_bandwidth|. */ if (kf_boost < 16) @@ -1360,7 +1360,7 @@ static int estimate_keyframe_frequency(VP8_COMP *cpi) * whichever is smaller. */ int key_freq = cpi->oxcf.key_freq>0 ? cpi->oxcf.key_freq : 1; - av_key_frame_frequency = 1 + (int)cpi->output_frame_rate * 2; + av_key_frame_frequency = 1 + (int)cpi->output_framerate * 2; if (cpi->oxcf.auto_key && av_key_frame_frequency > key_freq) av_key_frame_frequency = key_freq; |