commit 5d99c65ee6d16a3d8aadbf933df06d5642a41c8d
author Jingning Han <jingning@google.com> Thu Dec 08 15:59:42 2022 -0800
committer Jingning Han <jingning@google.com> Fri Dec 09 02:25:52 2022 +0000
tree 92c99d54f27769f960f1d75d5b2429481aca5164
parent fe9647fcd4e899330cb46df5267ff5a82806adfd

Disable flow motion estimation in super resolution mode

Resolve encoder failure due to the interaction of the two modules.

BUG=b/261325007

Change-Id: I2cacf226a76c74f39aaf99267f8a05e911f60d4a

av1/encoder/global_motion_facade.c

diff --git a/av1/encoder/global_motion_facade.c b/av1/encoder/global_motion_facade.c
index cdcaf65..0df070a 100644
--- a/av1/encoder/global_motion_facade.c
+++ b/av1/encoder/global_motion_facade.c
@@ -498,6 +498,7 @@
   }
 
   if (cpi->common.current_frame.frame_type == INTER_FRAME && cpi->source &&
+      cpi->superres_mode == AOM_SUPERRES_NONE &&
       cpi->oxcf.tool_cfg.enable_global_motion && !gm_info->search_done) {
     setup_global_motion_info_params(cpi);
     if (cpi->mt_info.num_workers > 1)