commit f83031942330007caae2c152facab85f0af605ea
author Remya Prakasan <remya.prakasan@ittiam.com> Thu Mar 17 09:12:10 2022 +0530
committer Yunqing Wang <yunqingwang@google.com> Mon Mar 21 15:46:16 2022 +0000
tree ede5b5062393c5106a69921964aaa308c4a1410f
parent 7d10bc970d4bc32e3075c653ee5d52a8c51d9819

FPMT: Fix mv_stats pointer in av1_pick_and_set_high_precision_mv

Corrected mv_stats pointer being accessed in
av1_pick_and_set_high_precision_mv() in case of FPMT.

Change-Id: Ibee77462bc744f2e444af2c65ba7586b55d0f077

av1/encoder/mv_prec.c

diff --git a/av1/encoder/mv_prec.c b/av1/encoder/mv_prec.c
index 3ff80c8..2ff713d 100644
--- a/av1/encoder/mv_prec.c
+++ b/av1/encoder/mv_prec.c
@@ -415,18 +415,22 @@
 
 void av1_pick_and_set_high_precision_mv(AV1_COMP *cpi, int qindex) {
   int use_hp = qindex < HIGH_PRECISION_MV_QTHRESH;
+#if !CONFIG_REALTIME_ONLY
+  MV_STATS *mv_stats;
+#if CONFIG_FRAME_PARALLEL_ENCODE
+  mv_stats = &cpi->mv_stats;
+#else
+  mv_stats = &cpi->ppi->mv_stats;
+#endif
+#endif  // !CONFIG_REALTIME_ONLY
 
   if (cpi->sf.hl_sf.high_precision_mv_usage == QTR_ONLY) {
     use_hp = 0;
   }
 #if !CONFIG_REALTIME_ONLY
   else if (cpi->sf.hl_sf.high_precision_mv_usage == LAST_MV_DATA &&
-           av1_frame_allows_smart_mv(cpi) && cpi->ppi->mv_stats.valid) {
-#if CONFIG_FRAME_PARALLEL_ENCODE
-    use_hp = get_smart_mv_prec(cpi, &cpi->mv_stats, qindex);
-#else
-    use_hp = get_smart_mv_prec(cpi, &cpi->ppi->mv_stats, qindex);
-#endif
+           av1_frame_allows_smart_mv(cpi) && mv_stats->valid) {
+    use_hp = get_smart_mv_prec(cpi, mv_stats, qindex);
   }
 #endif  // !CONFIG_REALTIME_ONLY