commit f4db04befe03ca3ead84ef30a82a56437bd91a90
author Cheng Chen <chengchen@google.com> Wed Oct 18 10:36:35 2023 -0700
committer Wan-Teh Chang <wtc@google.com> Wed Oct 18 17:41:34 2023 -0700
tree b2c31062ec11afdba1b994a6f58b68ad095cdae6
parent dc2c3eb26556636dbdae1fef9dbe624276544124

Cosmetic changes for cpi->consec_zero_mv

Bug: aomedia:3349
Change-Id: I14b09dae59dd1743f4de5c37e6ae16d734648f36
(cherry picked from commit 213c3f89c6f30e82959c5f407882e5dfddd4cbcf)

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index a45913d..49932cc 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -1484,10 +1484,11 @@
     max_mi_rows = size_in_mi(oxcf->frm_dim_cfg.forced_max_frame_height);
   }
 
-  CHECK_MEM_ERROR(cm, cpi->consec_zero_mv,
-                  aom_calloc((max_mi_rows * max_mi_cols) >> 2,
-                             sizeof(*cpi->consec_zero_mv)));
-  cpi->consec_zero_mv_alloc_size = (max_mi_rows * max_mi_cols) >> 2;
+  const int consec_zero_mv_alloc_size = (max_mi_rows * max_mi_cols) >> 2;
+  CHECK_MEM_ERROR(
+      cm, cpi->consec_zero_mv,
+      aom_calloc(consec_zero_mv_alloc_size, sizeof(*cpi->consec_zero_mv)));
+  cpi->consec_zero_mv_alloc_size = consec_zero_mv_alloc_size;
 
   cpi->mb_weber_stats = NULL;
   cpi->mb_delta_q = NULL;
@@ -2575,18 +2576,18 @@
       cm, unscaled, &cpi->scaled_source, filter_scaler, phase_scaler, true,
       false, cpi->oxcf.border_in_pixels, cpi->image_pyramid_levels);
   if (frame_is_intra_only(cm) || resize_pending != 0) {
-    const int current_size = cm->mi_params.mi_rows * cm->mi_params.mi_cols >> 2;
+    const int current_size =
+        (cm->mi_params.mi_rows * cm->mi_params.mi_cols) >> 2;
     if (cpi->consec_zero_mv &&
         (cpi->consec_zero_mv_alloc_size < current_size)) {
       aom_free(cpi->consec_zero_mv);
+      cpi->consec_zero_mv_alloc_size = 0;
       CHECK_MEM_ERROR(cm, cpi->consec_zero_mv,
-                      aom_calloc(current_size, sizeof(*cpi->consec_zero_mv)));
+                      aom_malloc(current_size * sizeof(*cpi->consec_zero_mv)));
+      cpi->consec_zero_mv_alloc_size = current_size;
     }
     assert(cpi->consec_zero_mv != NULL);
-    memset(cpi->consec_zero_mv, 0,
-           ((cm->mi_params.mi_rows * cm->mi_params.mi_cols) >> 2) *
-               sizeof(*cpi->consec_zero_mv));
-    cpi->consec_zero_mv_alloc_size = current_size;
+    memset(cpi->consec_zero_mv, 0, current_size * sizeof(*cpi->consec_zero_mv));
   }
 
   if (cpi->unscaled_last_source != NULL) {

av1/encoder/encoder_alloc.h

diff --git a/av1/encoder/encoder_alloc.h b/av1/encoder/encoder_alloc.h
index 7dd81bd..9a1d60f 100644
--- a/av1/encoder/encoder_alloc.h
+++ b/av1/encoder/encoder_alloc.h
@@ -307,6 +307,7 @@
   if (cpi->consec_zero_mv) {
     aom_free(cpi->consec_zero_mv);
     cpi->consec_zero_mv = NULL;
+    cpi->consec_zero_mv_alloc_size = 0;
   }
 
   if (cpi->src_sad_blk_64x64) {