diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2014-04-04 06:30:40 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-04-04 06:30:40 -0700 |
| commit | 1259cd7bcecc21e1db065f76383e44781051bc84 (patch) | |
| tree | 36b5af49c35be12bd13589f68e09e95dfd4535ee | |
| parent | 3b39d7503f4ce75dce962445dddfbfb18f6babf0 (diff) | |
| parent | be8d2b054e81e10c944efa2040fc2a13dce2b070 (diff) | |
| download | libvpx-1259cd7bcecc21e1db065f76383e44781051bc84.tar libvpx-1259cd7bcecc21e1db065f76383e44781051bc84.tar.gz libvpx-1259cd7bcecc21e1db065f76383e44781051bc84.tar.bz2 libvpx-1259cd7bcecc21e1db065f76383e44781051bc84.zip | |
Merge "Reinstating the DISABLE_RC_LONG_TERM_MEM macro"
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 7ec52556e..26fc28004 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -61,6 +61,8 @@ #define MIN_GF_INTERVAL 4 #endif +#define DISABLE_RC_LONG_TERM_MEM + static void swap_yv12(YV12_BUFFER_CONFIG *a, YV12_BUFFER_CONFIG *b) { YV12_BUFFER_CONFIG temp = *a; *a = *b; @@ -2330,7 +2332,11 @@ void vp9_rc_get_second_pass_params(VP9_COMP *cpi) { } void vp9_twopass_postencode_update(VP9_COMP *cpi) { +#ifdef DISABLE_RC_LONG_TERM_MEM + const uint64_t bits_used = cpi->rc.this_frame_target; +#else const uint64_t bits_used = cpi->rc.projected_frame_size; +#endif cpi->twopass.bits_left -= bits_used; cpi->twopass.bits_left = MAX(cpi->twopass.bits_left, 0); // Update bits left to the kf and gf groups to account for overshoot or |