commit b035d57ac2de236295df0272606f30d159747656
author Yeqing Wu <yeqing_wu@apple.com> Wed Jun 15 18:24:09 2022 +0000
committer Leo (Liang) Zhao <leolzhao@tencent.com> Wed Jun 15 18:24:09 2022 +0000
tree 45a7ed5454c78d44c6802cbfa82c9501a962fbd0
parent e8e69453ccd50fc4a3a3116ed781f276c1f1dbc4

Fix MVD coding with integer precision

av1/encoder/mv_prec.c

diff --git a/av1/encoder/mv_prec.c b/av1/encoder/mv_prec.c
index dac68cc..c4c76a0 100644
--- a/av1/encoder/mv_prec.c
+++ b/av1/encoder/mv_prec.c
@@ -134,36 +134,23 @@
 #endif  // CONFIG_ADAPTIVE_MVD
   }
   rates[r_idx++] = int_bit_rate;
+  int use_fractional_mv = !cpi->common.features.cur_frame_force_integer_mv;
 #if CONFIG_ADAPTIVE_MVD
-  int use_fractional_mv = 1;
   if (is_adaptive_mvd && (mv_class != MV_CLASS_0 || int_part > 0))
     use_fractional_mv = 0;
 #endif  // CONFIG_ADAPTIVE_MVD
-#if CONFIG_ADAPTIVE_MVD
   const int frac_part_rate =
       use_fractional_mv ? get_symbol_cost(frac_part_cdf, frac_part) : 0;
-#else
-  const int frac_part_rate = get_symbol_cost(frac_part_cdf, frac_part);
-#endif  // CONFIG_ADAPTIVE_MVD
   rates[r_idx++] = frac_part_rate;
-#if CONFIG_ADAPTIVE_MVD
   const int high_part_rate = (use_hp && use_fractional_mv)
                                  ? get_symbol_cost(high_part_cdf, high_part)
                                  : 0;
-#else
-  const int high_part_rate =
-      use_hp ? get_symbol_cost(high_part_cdf, high_part) : 0;
-#endif  // CONFIG_ADAPTIVE_MVD
-#if CONFIG_ADAPTIVE_MVD
   if (use_fractional_mv) {
-#endif  // CONFIG_ADAPTIVE_MVD
     update_cdf(frac_part_cdf, frac_part, MV_FP_SIZE);
     if (use_hp) {
       update_cdf(high_part_cdf, high_part, 2);
     }
-#if CONFIG_ADAPTIVE_MVD
   }
-#endif  // CONFIG_ADAPTIVE_MVD
   rates[r_idx++] = high_part_rate;
 
   mv_stats->last_bit_zero += !high_part;