generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Reinstating the DISABLE_RC_LONG_TERM_MEM macro"

Browse Source
This commit is contained in:
Paul Wilkins 2014-04-04 06:30:40 -07:00 committed by Gerrit Code Review
commit 1259cd7bce
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vp9/encoder/vp9_firstpass.c
View File

@ -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