commit 7b2d1448a67dbcbc37a9d3b1e6e1b7c50ecf6f99
author Fergus Simpson <afergs@google.com> Mon May 22 17:18:33 2017 -0700
committer Fergus Simpson <afergs@google.com> Fri Jun 02 16:48:25 2017 +0000
tree daf7139d329145a5e59cea3c248d4a411c19b485
parent 6f9dfa51410d37167051d4cc98c30e857a5ef48b

Revert "frame_superres: Send scale every frame"

This reverts commit 846d67dd67a348650fa42bd97288d9642bd1cc26.

Writing the scale every frame was not the right decision. The correct
thing to do will be also writing the superres scale when the size is
set using a previous frame.

Change-Id: I0402e7f6d2b89ac7c386f81e8628198d22db5066

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 71d544a..6f01afe 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -4128,7 +4128,7 @@
     aom_wb_write_bit(wb, 0);  // no scaling
   } else {
     aom_wb_write_bit(wb, 1);  // scaling, write scale factor
-    // TODO(afergs): write factor to the compressed header instead?
+    // TODO(afergs): write factor to the compressed header instead
     aom_wb_write_literal(
         wb, cm->superres_scale_numerator - SUPERRES_SCALE_NUMERATOR_MIN,
         SUPERRES_SCALE_BITS);
@@ -4142,6 +4142,9 @@
   aom_wb_write_literal(wb, cm->height - 1, 16);
 
   write_render_size(cm, wb);
+#if CONFIG_FRAME_SUPERRES
+  write_superres_scale(cm, wb);
+#endif  // CONFIG_FRAME_SUPERRES
 }
 
 static void write_frame_size_with_refs(AV1_COMP *cpi,
@@ -4443,9 +4446,6 @@
   assert(cm->sb_size == BLOCK_64X64);
 #endif  // CONFIG_EXT_PARTITION
 
-#if CONFIG_FRAME_SUPERRES
-  write_superres_scale(cm, wb);
-#endif  // CONFIG_FRAME_SUPERRES
   encode_loopfilter(cm, wb);
 #if CONFIG_CDEF
   encode_cdef(cm, wb);