summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_encoder.c
diff options
context:
space:
mode:
authorPaul Wilkins <paulwilkins@google.com>2014-06-26 09:48:31 +0100
committerPaul Wilkins <paulwilkins@google.com>2014-06-26 09:59:53 +0100
commit1c27e1f127e9f6c775b71922eb85de1e11fc81d4 (patch)
tree75583677d3a099318257ee34dfb261324f484979 /vp9/encoder/vp9_encoder.c
parent9f76c1ec507e1c866c8952c6003e99af9bc9d73c (diff)
downloadlibvpx-1c27e1f127e9f6c775b71922eb85de1e11fc81d4.tar
libvpx-1c27e1f127e9f6c775b71922eb85de1e11fc81d4.tar.gz
libvpx-1c27e1f127e9f6c775b71922eb85de1e11fc81d4.tar.bz2
libvpx-1c27e1f127e9f6c775b71922eb85de1e11fc81d4.zip
Fix quality regression for multi arf off case.
Bug introduced during multiple iterations on: I3831* gf_group->arf_update_idx[] cannot currently be used to select the arf buffer index if buffer flipping on overlays is enabled (still currently the case when multi arf OFF). Change-Id: I4ce9ea08f1dd03ac3ad8b3e27375a91ee1d964dc
Diffstat (limited to 'vp9/encoder/vp9_encoder.c')
-rw-r--r--vp9/encoder/vp9_encoder.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
index ef31c7478..11e5eefff 100644
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -1514,7 +1514,7 @@ void vp9_update_reference_frames(VP9_COMP *cpi) {
} else { /* For non key/golden frames */
if (cpi->refresh_alt_ref_frame) {
int arf_idx = cpi->alt_fb_idx;
- if (cpi->pass == 2) {
+ if ((cpi->pass == 2) && cpi->multi_arf_allowed) {
const GF_GROUP *const gf_group = &cpi->twopass.gf_group;
arf_idx = gf_group->arf_update_idx[gf_group->index];
}
@@ -2481,7 +2481,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
cm->show_frame = 1;
cm->intra_only = 0;
- // Check to see if the frame should be encoded is an arf overlay.
+ // Check to see if the frame should be encoded as an arf overlay.
check_src_altref(cpi);
}
}