commit 94f491f1fc00380096ced4ad2d73838506abb310
author chiyotsai <chiyotsai@google.com> Tue Mar 22 15:28:43 2022 -0700
committer Chi Yo Tsai <chiyotsai@google.com> Thu Mar 24 15:48:21 2022 +0000
tree 20a6cce2cc7e22c618542bd2dffe549ef59e0675
parent 36ae6d57f63eec1a84cd5ac3f7ee0b485dd4bb19

RTC: Correct mv rate computation in non-rd path

Performance:
| SPD_SET | TESTSET | AVG_PSNR | OVR_PSNR |  SSIM   |  SPD  |
|---------|---------|----------|----------|---------|-------|
|    7    |rtc_derf | +0.023%  | +0.029%  | +0.042% | +0.0% |
|    7    |   rtc   | -0.042%  | -0.018%  | -0.051% | -0.0% |
|---------|---------|----------|----------|---------|-------|
|    8    |rtc_derf | -0.034%  | +0.005%  | -0.034% | +0.0% |
|    8    |   rtc   | +0.023%  | +0.047%  | -0.007% | +0.0% |
|---------|---------|----------|----------|---------|-------|
|    9    |rtc_derf | -0.104%  | -0.122%  | -0.094% | -0.0% |
|    9    |   rtc   | +0.024%  | +0.052%  | +0.005% | +0.0% |
|---------|---------|----------|----------|---------|-------|
|   10    |rtc_derf | -0.040%  | -0.053%  | -0.098% | -0.0% |
|   10    |   rtc   | -0.038%  | -0.024%  | -0.044% | -0.0% |

STATS_CHANGED

Change-Id: Ic9a84f8c5e8cafb99ae544e7e800af75c4d4d1bd

av1/encoder/nonrd_pickmode.c

diff --git a/av1/encoder/nonrd_pickmode.c b/av1/encoder/nonrd_pickmode.c
index 9545176..56141c9 100644
--- a/av1/encoder/nonrd_pickmode.c
+++ b/av1/encoder/nonrd_pickmode.c
@@ -351,7 +351,6 @@
       gf_temporal_ref) {
     int tmp_sad;
     int dis;
-    int cost_list[5] = { INT_MAX, INT_MAX, INT_MAX, INT_MAX, INT_MAX };
 
     if (bsize < BLOCK_16X16) return -1;
 
@@ -366,16 +365,11 @@
     best_mv.as_mv.row >>= 3;
     best_mv.as_mv.col >>= 3;
     MV ref_mv = av1_get_ref_mv(x, 0).as_mv;
-
-    *rate_mv = av1_mv_bit_cost(&frame_mv[NEWMV][ref_frame].as_mv, &ref_mv,
-                               x->mv_costs->nmv_joint_cost,
-                               x->mv_costs->mv_cost_stack, MV_COST_WEIGHT);
     frame_mv[NEWMV][ref_frame].as_mv.row >>= 3;
     frame_mv[NEWMV][ref_frame].as_mv.col >>= 3;
 
     SUBPEL_MOTION_SEARCH_PARAMS ms_params;
-    av1_make_default_subpel_ms_params(&ms_params, cpi, x, bsize, &ref_mv,
-                                      cost_list);
+    av1_make_default_subpel_ms_params(&ms_params, cpi, x, bsize, &ref_mv, NULL);
     if (cpi->sf.rt_sf.force_half_pel_block &&
         cpi->sf.mv_sf.subpel_force_stop < HALF_PEL)
       ms_params.forced_stop = subpel_select(cpi, bsize, &best_mv);
@@ -384,6 +378,10 @@
         xd, cm, &ms_params, start_mv, &best_mv.as_mv, &dis,
         &x->pred_sse[ref_frame], NULL);
     frame_mv[NEWMV][ref_frame].as_int = best_mv.as_int;
+
+    *rate_mv = av1_mv_bit_cost(&frame_mv[NEWMV][ref_frame].as_mv, &ref_mv,
+                               x->mv_costs->nmv_joint_cost,
+                               x->mv_costs->mv_cost_stack, MV_COST_WEIGHT);
   } else if (!combined_motion_search(cpi, x, bsize, mi_row, mi_col,
                                      &frame_mv[NEWMV][ref_frame], rate_mv,
                                      best_rdc->rdcost, 0)) {