diff options
| author | Deb Mukherjee <debargha@google.com> | 2014-01-14 12:44:10 -0800 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2014-01-14 12:51:13 -0800 |
| commit | 1699d6bd53a81d8844d297f98ec752ff8551ffff (patch) | |
| tree | d6c24b51b20df452d16c905522faca4285189cf9 | |
| parent | dd31f2e4ae480f074841e0653dff91ccda9df091 (diff) | |
| download | libvpx-1699d6bd53a81d8844d297f98ec752ff8551ffff.tar libvpx-1699d6bd53a81d8844d297f98ec752ff8551ffff.tar.gz libvpx-1699d6bd53a81d8844d297f98ec752ff8551ffff.tar.bz2 libvpx-1699d6bd53a81d8844d297f98ec752ff8551ffff.zip | |
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
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 8e60bc96d..669fe0a97 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -3420,7 +3420,7 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags, #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 diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index 939a7f998..aefef5319 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -965,5 +965,5 @@ void vp9_rc_postencode_update(VP9_COMP *cpi, uint64_t bytes_used) { 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--; } |