diff options
| author | Marco Paniconi <marpan@google.com> | 2021-10-01 22:25:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-10-01 22:25:12 +0000 |
| commit | fd70206fa450eb5cb8e2fdd481aeaf0f8e906b9c (patch) | |
| tree | cb9839bfbfd52cfaf1f4ccc7d46251b8bd7e5653 /vp8/encoder | |
| parent | f8733b3fb7eb3cf1154a9e693351097ec42005a2 (diff) | |
| parent | 167de33ca8b24f072a88fcf51fbe782763717d00 (diff) | |
| download | libvpx-fd70206fa450eb5cb8e2fdd481aeaf0f8e906b9c.tar libvpx-fd70206fa450eb5cb8e2fdd481aeaf0f8e906b9c.tar.gz libvpx-fd70206fa450eb5cb8e2fdd481aeaf0f8e906b9c.tar.bz2 libvpx-fd70206fa450eb5cb8e2fdd481aeaf0f8e906b9c.zip | |
Merge "vp8: Condition decimation drop logic on drop_frames_allowed" into main
Diffstat (limited to 'vp8/encoder')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 6890a470a..ff4a59be7 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; |