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 /vp9/encoder/vp9_firstpass.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 'vp9/encoder/vp9_firstpass.c')
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 55d2a7062..b5932eb2f 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -1093,13 +1093,13 @@ static int estimate_cq(VP9_COMP *cpi, } -extern void vp9_new_frame_rate(VP9_COMP *cpi, double framerate); +extern void vp9_new_framerate(VP9_COMP *cpi, double framerate); void vp9_init_second_pass(VP9_COMP *cpi) { FIRSTPASS_STATS this_frame; FIRSTPASS_STATS *start_pos; - double lower_bounds_min_rate = FRAME_OVERHEAD_BITS * cpi->oxcf.frame_rate; + double lower_bounds_min_rate = FRAME_OVERHEAD_BITS * cpi->oxcf.framerate; double two_pass_min_rate = (double)(cpi->oxcf.target_bandwidth * cpi->oxcf.two_pass_vbrmin_section / 100); @@ -1120,10 +1120,10 @@ void vp9_init_second_pass(VP9_COMP *cpi) { // encoded in the second pass is a guess. However the sum duration is not. // Its calculated based on the actual durations of all frames from the first // pass. - vp9_new_frame_rate(cpi, 10000000.0 * cpi->twopass.total_stats.count / + vp9_new_framerate(cpi, 10000000.0 * cpi->twopass.total_stats.count / cpi->twopass.total_stats.duration); - cpi->output_frame_rate = cpi->oxcf.frame_rate; + cpi->output_framerate = cpi->oxcf.framerate; cpi->twopass.bits_left = (int64_t)(cpi->twopass.total_stats.duration * cpi->oxcf.target_bandwidth / 10000000.0); cpi->twopass.bits_left -= (int64_t)(cpi->twopass.total_stats.duration * @@ -2203,7 +2203,7 @@ void vp9_second_pass(VP9_COMP *cpi) { // Set nominal per second bandwidth for this frame cpi->target_bandwidth = (int)(cpi->per_frame_bandwidth - * cpi->output_frame_rate); + * cpi->output_framerate); if (cpi->target_bandwidth < 0) cpi->target_bandwidth = 0; @@ -2623,7 +2623,7 @@ static void find_next_key_frame(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) { cpi->per_frame_bandwidth = cpi->twopass.kf_bits; // Convert to a per second bitrate cpi->target_bandwidth = (int)(cpi->twopass.kf_bits * - cpi->output_frame_rate); + cpi->output_framerate); } // Note the total error score of the kf group minus the key frame itself |