commit 88e0bd404ee2b0b971092aec10a0cfd60c09403d
author James Zern <jzern@google.com> Thu Oct 17 17:48:42 2024 -0700
committer James Zern <jzern@google.com> Thu Oct 17 18:57:58 2024 -0700
tree a0978de918f1db0d2375b88d86dda9f7ad4f3d00
parent 6b3cfa1947c3c9e77701b6c111aaad6ef69a3472

partition_strategy.c: add missing CONFIG_ check

av1_prepare_motion_search_features_block() is only used if
`CONFIG_PARTITION_SEARCH_ORDER=1`.

Bug: aomedia:3416
Change-Id: Iad8bf5a7432a94a6055123e673e1407408d3db4a

av1/encoder/partition_strategy.c

diff --git a/av1/encoder/partition_strategy.c b/av1/encoder/partition_strategy.c
index c1d3e3e..4081b3f 100644
--- a/av1/encoder/partition_strategy.c
+++ b/av1/encoder/partition_strategy.c
@@ -2465,6 +2465,7 @@
   aom_free(sms_tree);
 }
 
+#if CONFIG_PARTITION_SEARCH_ORDER
 void av1_prepare_motion_search_features_block(
     AV1_COMP *const cpi, ThreadData *td, TileDataEnc *tile_data,
     const int mi_row, const int mi_col, const BLOCK_SIZE bsize,
@@ -2532,6 +2533,7 @@
 
   aom_free(sms_tree);
 }
+#endif  // CONFIG_PARTITION_SEARCH_ORDER
 #endif  // !CONFIG_REALTIME_ONLY
 
 static inline void init_simple_motion_search_mvs(

av1/encoder/partition_strategy.h

diff --git a/av1/encoder/partition_strategy.h b/av1/encoder/partition_strategy.h
index b95e967..1309148 100644
--- a/av1/encoder/partition_strategy.h
+++ b/av1/encoder/partition_strategy.h
@@ -12,6 +12,8 @@
 #ifndef AOM_AV1_ENCODER_PARTITION_STRATEGY_H_
 #define AOM_AV1_ENCODER_PARTITION_STRATEGY_H_
 
+#include "config/aom_config.h"
+
 #include "av1/encoder/encodeframe.h"
 #include "av1/encoder/encodeframe_utils.h"
 #include "av1/encoder/encodemb.h"
@@ -106,6 +108,7 @@
                                            const int mi_row, const int mi_col,
                                            const BLOCK_SIZE bsize,
                                            aom_partition_features_t *features);
+#if CONFIG_PARTITION_SEARCH_ORDER
 void av1_prepare_motion_search_features_block(
     AV1_COMP *const cpi, ThreadData *td, TileDataEnc *tile_data,
     const int mi_row, const int mi_col, const BLOCK_SIZE bsize,
@@ -114,6 +117,7 @@
     unsigned int sub_block_var[4], unsigned int horz_block_sse[2],
     unsigned int horz_block_var[2], unsigned int vert_block_sse[2],
     unsigned int vert_block_var[2]);
+#endif  // CONFIG_PARTITION_SEARCH_ORDER
 #endif  // !CONFIG_REALTIME_ONLY
 
 // A simplified version of set_offsets meant to be used for