commit c130b4f0e748b7c3c65646258b3bab1b72cca903
author Urvang Joshi <urvang@google.com> Tue Jul 22 23:03:46 2025 +0000
committer Urvang Joshi <urvang@google.com> Tue Jul 22 23:03:46 2025 +0000
tree f688abdd0a172c27afe0922a796f5c6aa8797f29
parent 5c997d155c8f0988b1a18df8237d88f4b36f996b

pickccso.c: Compile fix on Windows + Visual Studio.

av1/encoder/pickccso.c

diff --git a/av1/encoder/pickccso.c b/av1/encoder/pickccso.c
index 487cd3b..31843db 100644
--- a/av1/encoder/pickccso.c
+++ b/av1/encoder/pickccso.c
@@ -1683,14 +1683,13 @@
                             ctx->training_dist_block, ctx->filter_control,
                             &cur_total_dist, &cur_total_rate, &ccso_enable,
                             rdmult);
-                        cur_total_rate = av1_cost_literal(
-                            reuse_ccso_idx ? 0 :
 #if CONFIG_CCSO_SIGNALING_IMPROV
-                                           aom_ceil_log2(num_ref_frames)
+                        const int ref_frame_bits = aom_ceil_log2(num_ref_frames);
 #else
-                                           3
+                        const int ref_frame_bits = 3;
 #endif  // CONFIG_CCSO_SIGNALING_IMPROV
-                        );
+                        cur_total_rate = av1_cost_literal(
+                            reuse_ccso_idx ? 0 : ref_frame_bits);
                       } else {
                         derive_blk_md(cm, xd, plane, ctx->unfiltered_dist_block,
                                       ctx->training_dist_block,
@@ -1706,15 +1705,14 @@
                             lut_bits +
                             (ccso_bo_only ? frame_bits_bo_only : frame_bits);
 
+#if CONFIG_CCSO_SIGNALING_IMPROV
+                        const int ref_frame_bits = aom_ceil_log2(num_ref_frames);
+#else
+                        const int ref_frame_bits = 3;
+#endif  // CONFIG_CCSO_SIGNALING_IMPROV
                         cur_total_rate +=
                             (reuse_ccso_idx ? av1_cost_literal(
-                                                  2 +
-#if CONFIG_CCSO_SIGNALING_IMPROV
-                                                  aom_ceil_log2(num_ref_frames)
-#else
-                                                  3
-#endif  // CONFIG_CCSO_SIGNALING_IMPROV
-                                                      )
+                                                  2 + ref_frame_bits)
                                             : av1_cost_literal(cur_total_bits));
                         const uint64_t cur_total_cost =
                             RDCOST(rdmult, cur_total_rate, cur_total_dist * 16);