diff options
| author | Debargha Mukherjee <debargha@google.com> | 2014-05-02 04:03:29 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-02 04:03:29 -0700 |
| commit | 6497f2718fcbda087b6a64d2339356d3dc684f56 (patch) | |
| tree | 3769950cd5057b6eae6d10780caddd943067b22f /vp9 | |
| parent | 53888035f9325c31f6e8e84ebb62d5ca944e9444 (diff) | |
| parent | 307b6c22a30b31aa0c8f48f1863e8e0e8bfcb254 (diff) | |
| download | libvpx-6497f2718fcbda087b6a64d2339356d3dc684f56.tar libvpx-6497f2718fcbda087b6a64d2339356d3dc684f56.tar.gz libvpx-6497f2718fcbda087b6a64d2339356d3dc684f56.tar.bz2 libvpx-6497f2718fcbda087b6a64d2339356d3dc684f56.zip | |
Merge "Switch the default 2 pass vbr variant."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 1f995c9e7..5867fb3fc 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -61,7 +61,7 @@ #define MIN_GF_INTERVAL 4 #endif -#define LONG_TERM_VBR_CORRECTION +// #define LONG_TERM_VBR_CORRECTION static void swap_yv12(YV12_BUFFER_CONFIG *a, YV12_BUFFER_CONFIG *b) { YV12_BUFFER_CONFIG temp = *a; @@ -2402,8 +2402,8 @@ void vp9_twopass_postencode_update(VP9_COMP *cpi) { const double progress = (double)(cpi->twopass.stats_in - cpi->twopass.stats_in_start) / (cpi->twopass.stats_in_end - cpi->twopass.stats_in_start); - const int bits_used = progress * cpi->rc.this_frame_target + - (1.0 - progress) * cpi->rc.projected_frame_size; + const int bits_used = progress * rc->this_frame_target + + (1.0 - progress) * rc->projected_frame_size; #endif cpi->twopass.bits_left -= bits_used; |