commit 22b150bf040608028a56d8bf39e72f771383d836
author Urvang Joshi <urvang@google.com> Thu Jan 10 14:32:32 2019 -0800
committer Urvang Joshi <urvang@google.com> Fri Jan 11 23:43:02 2019 +0000
tree 51b03d9f07eec7ad3eb9e12730cca59d9475b209
parent 691e27a450a47067fe449bf4e219f3fddc41e3f6

Bugfix for SUPERRES_QTHRESH mode.

Earlier, superres denominator of last frame was used to calculate
active_cq_level of current frame -- which affected superres denominator
calculation for this frame as well.

We avoid this by resetting superres denominator from previous frame before
computing the superres params for this frame.

Also, related const-correctness.

Change-Id: Ia59c81ad66f858b09fc190d931bd2442d4b30eed

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 545c5b3..4c0e13e 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -4349,7 +4349,8 @@
   return rsz;
 }
 
-static void setup_frame_size_from_params(AV1_COMP *cpi, size_params_type *rsz) {
+static void setup_frame_size_from_params(AV1_COMP *cpi,
+                                         const size_params_type *rsz) {
   int encode_width = rsz->resize_width;
   int encode_height = rsz->resize_height;
 
@@ -4363,7 +4364,9 @@
 }
 
 static void setup_frame_size(AV1_COMP *cpi) {
-  size_params_type rsz = av1_calculate_next_size_params(cpi);
+  // Reset superres params from previous frame.
+  cpi->common.superres_scale_denominator = SCALE_NUMERATOR;
+  const size_params_type rsz = av1_calculate_next_size_params(cpi);
   setup_frame_size_from_params(cpi, &rsz);
 }