diff options
author | Marco <marpan@chromium.org> | 2015-08-05 13:53:26 -0700 |
---|---|---|
committer | Marco <marpan@chromium.org> | 2015-08-05 13:59:52 -0700 |
commit | f6255dbb530d5a07851501851a4cea4ca563030a (patch) | |
tree | 4c3472cf712fe9d02b329d71026a4530165cb27c /vp9/encoder/vp9_ratectrl.c | |
parent | 16c0ec711c02062d10cf9ad53e1a4978792ecb43 (diff) | |
download | libvpx-f6255dbb530d5a07851501851a4cea4ca563030a.tar libvpx-f6255dbb530d5a07851501851a4cea4ca563030a.tar.gz libvpx-f6255dbb530d5a07851501851a4cea4ca563030a.tar.bz2 libvpx-f6255dbb530d5a07851501851a4cea4ca563030a.zip |
Bugfix for svc.
Condition usage of rc.frames_since_golden to non-svc mode.
rc.frames_since_golden, which is used in non-svc mode to add second reference,
was causing, under certain condiiton, the turning off of golden reference
for svc case.
Change-Id: Icec644d235d0471e56d8ff73d6c37278bd6ecd3b
Diffstat (limited to 'vp9/encoder/vp9_ratectrl.c')
-rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index 7427ccfb9..d16241642 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -1339,13 +1339,15 @@ void vp9_rc_postencode_update(VP9_COMP *cpi, uint64_t bytes_used) { rc->total_target_vs_actual = rc->total_actual_bits - rc->total_target_bits; - if (is_altref_enabled(cpi) && cpi->refresh_alt_ref_frame && - (cm->frame_type != KEY_FRAME)) - // Update the alternate reference frame stats as appropriate. - update_alt_ref_frame_stats(cpi); - else - // Update the Golden frame stats as appropriate. - update_golden_frame_stats(cpi); + if (!cpi->use_svc) { + if (is_altref_enabled(cpi) && cpi->refresh_alt_ref_frame && + (cm->frame_type != KEY_FRAME)) + // Update the alternate reference frame stats as appropriate. + update_alt_ref_frame_stats(cpi); + else + // Update the Golden frame stats as appropriate. + update_golden_frame_stats(cpi); + } if (cm->frame_type == KEY_FRAME) rc->frames_since_key = 0; |