From: Marco Paniconi <marpan@google.com>
Date: Fri, 1 Oct 2021 20:16:56 +0000 (-0700)
Subject: vp8: Condition decimation drop logic on drop_frames_allowed
X-Git-Tag: v1.12.0-rc1~136^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=167de33ca8b24f072a88fcf51fbe782763717d00;p=libvpx

vp8: Condition decimation drop logic on drop_frames_allowed

This allows user to make sure frame will be encoded
when drop_frames is set off (on the fly), no matter
the state of the buffer.

Change-Id: Ia7b39b93fe3721dd586bdbede72c525db87b6890
---

diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index c57c74646..8466bba7c 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -3481,7 +3481,7 @@ static void encode_frame_to_data_rate(VP8_COMP *cpi, size_t *size,
    * 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;