summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Wilkins <paulwilkins@google.com>2010-05-26 09:06:49 -0700
committerCode Review <code-review@webmproject.org>2010-05-26 09:06:49 -0700
commit57d59f6ee78314c661ae1d21278c83ab7e178741 (patch)
tree9979a3e4990e8496ab3d96514de991f8b7abb97c
parent4071d167d6400bebd98edd497eb51c90bf85b5f6 (diff)
parentea4b6f18cb10082aeea6be256de673848eb85fa1 (diff)
downloadlibvpx-57d59f6ee78314c661ae1d21278c83ab7e178741.tar
libvpx-57d59f6ee78314c661ae1d21278c83ab7e178741.tar.gz
libvpx-57d59f6ee78314c661ae1d21278c83ab7e178741.tar.bz2
libvpx-57d59f6ee78314c661ae1d21278c83ab7e178741.zip
Merge "Correct bit allocation when the alternative reference frame"
-rw-r--r--vp8/encoder/ratectrl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/vp8/encoder/ratectrl.c b/vp8/encoder/ratectrl.c
index 7ab9605e3..23a2d1abd 100644
--- a/vp8/encoder/ratectrl.c
+++ b/vp8/encoder/ratectrl.c
@@ -1118,8 +1118,9 @@ void vp8_calc_pframe_target_size(VP8_COMP *cpi)
cpi->this_frame_target = (baseline_bits_at_q(1, Q, cpi->common.MBs) * cpi->last_boost) / 100;
}
- // If there is an active ARF at this location use the minimum bits on this frame
- else
+ // If there is an active ARF at this location use the minimum
+ // bits on this frame unless it was a contructed arf.
+ else if (cpi->oxcf.arnr_max_frames == 0)
{
cpi->this_frame_target = 0; // Minimial spend on gf that is replacing an arf
}