summaryrefslogtreecommitdiff
path: root/vp9/encoder
diff options
context:
space:
mode:
authorYaowu Xu <yaowu@google.com>2014-11-19 15:32:11 -0800
committerYaowu Xu <yaowu@google.com>2014-11-19 15:32:11 -0800
commit21db24efcb9978244a5c10e70ce74f7ffcb04444 (patch)
treebe99a89374612e45b3cac80c6d99c47df96d96cc /vp9/encoder
parentbf63652d346e0b130461e2f83c330377d1c1864e (diff)
downloadlibvpx-21db24efcb9978244a5c10e70ce74f7ffcb04444.tar
libvpx-21db24efcb9978244a5c10e70ce74f7ffcb04444.tar.gz
libvpx-21db24efcb9978244a5c10e70ce74f7ffcb04444.tar.bz2
libvpx-21db24efcb9978244a5c10e70ce74f7ffcb04444.zip
Add a reset to rc tracking for dropped frames
VP9/DatarateTestVP9Large.ChangingDropFrameThresh/[34] fails post the merge of commit#ffa06b37. This commit adds reset of rc tracking info when frame is dropped, and fixes the causes of the bad interaction between the tests and the previous commit. Change-Id: I848acfd9fcb336359662274325190f94aac76eae
Diffstat (limited to 'vp9/encoder')
-rw-r--r--vp9/encoder/vp9_ratectrl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index f1d4774d1..32acea0ff 100644
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -1289,6 +1289,8 @@ void vp9_rc_postencode_update_drop_frame(VP9_COMP *cpi) {
cpi->common.last_frame_type = cpi->common.frame_type;
cpi->rc.frames_since_key++;
cpi->rc.frames_to_key--;
+ cpi->rc.rc_2_frame = 0;
+ cpi->rc.rc_1_frame = 0;
}
// Use this macro to turn on/off use of alt-refs in one-pass mode.