ref: fd70206fa450eb5cb8e2fdd481aeaf0f8e906b9c
parent: f8733b3fb7eb3cf1154a9e693351097ec42005a2
parent: 167de33ca8b24f072a88fcf51fbe782763717d00
author: Marco Paniconi <marpan@google.com>
date: Fri Oct 1 18:25:12 EDT 2021
Merge "vp8: Condition decimation drop logic on drop_frames_allowed" into main
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -3481,7 +3481,7 @@
* Note that dropping a key frame can be problematic if spatial
* resampling is also active
*/
- if (cpi->decimation_factor > 0) {+ if (cpi->decimation_factor > 0 && cpi->drop_frames_allowed) { switch (cpi->decimation_factor) {case 1:
cpi->per_frame_bandwidth = cpi->per_frame_bandwidth * 3 / 2;