commit 23cd339baab64028ab54180671e431c63730cebb
author Anupam Pandey <anupam.pandey@ittiam.com> Thu Dec 22 11:34:09 2022 +0530
committer Yunqing Wang <yunqingwang@google.com> Mon Dec 26 19:54:33 2022 +0000
tree 4696a18cd6f4229ff1cd8b4410f9a6766836ac4b
parent e2b9b5f3b7854b0bdf2b03211d831d8dcd403df3

rtc: Move *ctx argument to CONFIG_AV1_TEMPORAL_DENOISING flag

The function argument PICK_MODE_CONTEXT *ctx is required if
CONFIG_AV1_TEMPORAL_DENOISING flag is enabled. Hence, moved the
argument under the config flag.

Change-Id: I00876717b50459eddf39143dfb9aceba8897b109

av1/encoder/nonrd_pickmode.c

diff --git a/av1/encoder/nonrd_pickmode.c b/av1/encoder/nonrd_pickmode.c
index 13e9cdd..ec2c3df 100644
--- a/av1/encoder/nonrd_pickmode.c
+++ b/av1/encoder/nonrd_pickmode.c
@@ -3483,12 +3483,12 @@
 // Function to setup parameters used for inter mode evaluation in non-rd.
 static AOM_FORCE_INLINE void set_params_nonrd_pick_inter_mode(
     AV1_COMP *cpi, MACROBLOCK *x, InterModeSearchStateNonrd *search_state,
-    PICK_MODE_CONTEXT *ctx, RD_STATS *rd_cost, int *force_skip_low_temp_var,
-    int *skip_pred_mv, int mi_row, int mi_col, int gf_temporal_ref,
-    unsigned char segment_id, BLOCK_SIZE bsize
+    RD_STATS *rd_cost, int *force_skip_low_temp_var, int *skip_pred_mv,
+    int mi_row, int mi_col, int gf_temporal_ref, unsigned char segment_id,
+    BLOCK_SIZE bsize
 #if CONFIG_AV1_TEMPORAL_DENOISING
     ,
-    int denoise_svc_pickmode
+    PICK_MODE_CONTEXT *ctx, int denoise_svc_pickmode
 #endif
 ) {
   AV1_COMMON *const cm = &cpi->common;
@@ -3496,7 +3496,6 @@
   TxfmSearchInfo *txfm_info = &x->txfm_search_info;
   MB_MODE_INFO *const mi = xd->mi[0];
   const ModeCosts *mode_costs = &x->mode_costs;
-  (void)ctx;
 
   // Initialize variance and distortion (chroma) for all modes and reference
   // frames
@@ -4370,11 +4369,11 @@
 
   // Setup parameters used for inter mode evaluation.
   set_params_nonrd_pick_inter_mode(
-      cpi, x, &search_state, ctx, rd_cost, &force_skip_low_temp_var,
-      &skip_pred_mv, mi_row, mi_col, gf_temporal_ref, segment_id, bsize
+      cpi, x, &search_state, rd_cost, &force_skip_low_temp_var, &skip_pred_mv,
+      mi_row, mi_col, gf_temporal_ref, segment_id, bsize
 #if CONFIG_AV1_TEMPORAL_DENOISING
       ,
-      denoise_svc_pickmode
+      ctx, denoise_svc_pickmode
 #endif
   );