commit eb4b7def4f0aa6e98176ded752a1a7129404c3f4
author Hui Su <huisu@google.com> Wed Apr 03 11:00:18 2019 -0700
committer Hui Su <huisu@google.com> Wed Apr 03 22:02:15 2019 +0000
tree c0e25e2aa471b7655bb17ab307a5e6fa5378f027
parent 748f93bfbab303ada9bb2ea533003be21e830763

Do not change SB size when seq_params is locked

Change-Id: I996535104e854c0d395461a9c64b46e490067c6e

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index c79d511..d2b9ab2 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -357,10 +357,11 @@
     av1_setup_past_independence(cm);
   }
 
-  if (cm->current_frame.frame_type == KEY_FRAME && cm->show_frame) {
-    set_sb_size(&cm->seq_params, select_sb_size(cpi));
-  } else if (frame_is_sframe(cm)) {
-    set_sb_size(&cm->seq_params, select_sb_size(cpi));
+  if ((cm->current_frame.frame_type == KEY_FRAME && cm->show_frame) ||
+      frame_is_sframe(cm)) {
+    if (!cpi->seq_params_locked) {
+      set_sb_size(&cm->seq_params, select_sb_size(cpi));
+    }
   } else {
     const RefCntBuffer *const primary_ref_buf = get_primary_ref_frame_buf(cm);
     if (primary_ref_buf == NULL) {