commit a1d71846eae15ed0d3e7635894b59cad33b0c866
author Hui Su <huisu@google.com> Wed Jul 31 12:02:24 2019 -0700
committer Hui Su <huisu@google.com> Thu Aug 01 16:50:04 2019 +0000
tree 4372683fb9eaa2281aa32233da936fde771a4254
parent 0cbf0e4fdd939ddf535784a79c0bc2ab4e4c0c63

Do dummy bitstream pack when min CR is specified

When the minimum compression ratio is specified, we need to do dummy
bitstream packing to get the compressed frame size and decide if we need
to recode.

Change-Id: Ia932c4aa00c81d94002f064d6b41734369f7b463

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 4f55317..05f31a4 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -4660,6 +4660,8 @@
   AV1_COMMON *const cm = &cpi->common;
   RATE_CONTROL *const rc = &cpi->rc;
   const int allow_recode = (cpi->sf.recode_loop != DISALLOW_RECODE);
+  // Must allow recode if minimum compression ratio is set.
+  assert(IMPLIES(cpi->oxcf.min_cr > 0, allow_recode));
 
   set_size_independent_vars(cpi);
   if (cpi->oxcf.pass == 2 && cpi->sf.adaptive_interp_filter_search)
@@ -4764,7 +4766,9 @@
     // Dummy pack of the bitstream using up to date stats to get an
     // accurate estimate of output frame size to determine if we need
     // to recode.
-    if (cpi->sf.recode_loop >= ALLOW_RECODE_KFARFGF) {
+    const int do_dummy_pack =
+        cpi->sf.recode_loop >= ALLOW_RECODE_KFARFGF || cpi->oxcf.min_cr > 0;
+    if (do_dummy_pack) {
       restore_coding_context(cpi);
 
       finalize_encoded_frame(cpi);