shithub: libvpx

Info  •  Files  •  Log  •  Branches

Minor fix on an assert

Fixes assert that fails occasionally on small values of
max-key frame intervals. Also, adds a small change on
updating frames_to_key for frame drops.

Change-Id: Icc2b33b25e3e4ced7e49f8db73e0a887ef9c99e0

--- a/vp9/encoder/vp9_onyx_if.c

+++ b/vp9/encoder/vp9_onyx_if.c

@@ -3420,7 +3420,7 @@

 #endif

       frames_to_arf = cpi->rc.frames_till_gf_update_due;

-    assert(frames_to_arf < cpi->rc.frames_to_key);

+    assert(frames_to_arf <= cpi->rc.frames_to_key);

     if ((cpi->source = vp9_lookahead_peek(cpi->lookahead, frames_to_arf))) {

 #if CONFIG_MULTIPLE_ARF

--- a/vp9/encoder/vp9_ratectrl.c

+++ b/vp9/encoder/vp9_ratectrl.c

@@ -965,5 +965,5 @@

 void vp9_rc_postencode_update_drop_frame(VP9_COMP *cpi) {

   cpi->rc.frames_since_key++;

-  // cpi->rc.frames_to_key--;

+  cpi->rc.frames_to_key--;

 }

-- 

⑨