commit 847210cc2dc40c67969416e9363aac71d8414eaa
author Marco Paniconi <marpan@google.com> Tue Mar 21 14:55:46 2023 -0700
committer Marco Paniconi <marpan@google.com> Wed Mar 22 02:40:39 2023 +0000
tree a47bdde655f6c68f5f4ed0eaf3389e0c96a97a27
parent 365a9686841edfb0c9884ff693347c0295b72aa3

rtc: Removed unused variable from block_yrd

Change-Id: Iad5cb5f1f3bbf4cac8f5dc43d17c890dfacb8bc3

av1/encoder/nonrd_opt.c

diff --git a/av1/encoder/nonrd_opt.c b/av1/encoder/nonrd_opt.c
index 9777616..5aa11b4 100644
--- a/av1/encoder/nonrd_opt.c
+++ b/av1/encoder/nonrd_opt.c
@@ -143,7 +143,6 @@
   const int bh = 4 * num_4x4_h;
   const int use_hbd = is_cur_buf_hbd(xd);
   int num_blk_skip_w = num_4x4_w;
-  int sh_blk_skip = 0;
 
 #if CONFIG_AV1_HIGHBITDEPTH
   if (use_hbd) {
@@ -299,12 +298,12 @@
       if (use_hbd)
         update_yrd_loop_vars_hbd(x, &temp_skippable, step, *eob, coeff, qcoeff,
                                  dqcoeff, this_rdc, &eob_cost,
-                                 (r * num_blk_skip_w + c) >> sh_blk_skip);
+                                 r * num_blk_skip_w + c);
       else
 #endif
         update_yrd_loop_vars(x, &temp_skippable, step, *eob, low_coeff,
                              low_qcoeff, low_dqcoeff, this_rdc, &eob_cost,
-                             (r * num_blk_skip_w + c) >> sh_blk_skip);
+                             r * num_blk_skip_w + c);
     }
     block += row_step;
   }
@@ -394,7 +393,6 @@
   const int bw = 4 * num_4x4_w;
   const int bh = 4 * num_4x4_h;
   const int num_blk_skip_w = num_4x4_w;
-  const int sh_blk_skip = 0;
   // Keep the intermediate value on the stack here. Writing directly to
   // skippable causes speed regression due to load-and-store issues in
   // update_yrd_loop_vars.
@@ -442,7 +440,7 @@
       assert(*eob <= 1024);
       update_yrd_loop_vars(x, &temp_skippable, step, *eob, low_coeff,
                            low_qcoeff, low_dqcoeff, this_rdc, &eob_cost,
-                           (r * num_blk_skip_w + c) >> sh_blk_skip);
+                           r * num_blk_skip_w + c);
     }
   }
   this_rdc->skip_txfm = *skippable = temp_skippable;