commit 1f4e1bd20feac1e4631ed780d4197639a745896a
author Deepa K G <deepa.kg@ittiam.com> Tue Aug 02 00:54:27 2022 +0530
committer Yunqing Wang <yunqingwang@google.com> Wed Aug 10 18:14:32 2022 +0000
tree 0b3417eecbade2adb0399d8e24fc66f18ffa2364
parent 0c702dcc8b83ca2535dd0dc99327015d5d99f229

Remove redundant copy of segment map

Removed a redundant function call at frame level to
update_reference_segmentation_map(), as segment
ids are already copied to segmentation map buffer
at block level during bitstream write.

Change-Id: I3cb293aebafcfd56b9b87de406d98450aeeacf3a

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 4dafcbe..ef4cd7d 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -203,22 +203,6 @@
   if (!is_allintra || end_usage != AOM_Q) av1_rc_init_minq_luts();
 }
 
-static void update_reference_segmentation_map(AV1_COMP *cpi) {
-  AV1_COMMON *const cm = &cpi->common;
-  const CommonModeInfoParams *const mi_params = &cm->mi_params;
-  MB_MODE_INFO **mi_4x4_ptr = mi_params->mi_grid_base;
-  uint8_t *cache_ptr = cm->cur_frame->seg_map;
-
-  for (int row = 0; row < mi_params->mi_rows; row++) {
-    MB_MODE_INFO **mi_4x4 = mi_4x4_ptr;
-    uint8_t *cache = cache_ptr;
-    for (int col = 0; col < mi_params->mi_cols; col++, mi_4x4++, cache++)
-      cache[0] = mi_4x4[0]->segment_id;
-    mi_4x4_ptr += mi_params->mi_stride;
-    cache_ptr += mi_params->mi_cols;
-  }
-}
-
 void av1_new_framerate(AV1_COMP *cpi, double framerate) {
   cpi->framerate = framerate < 0.1 ? 30 : framerate;
   av1_rc_update_framerate(cpi, cpi->common.width, cpi->common.height);
@@ -3668,9 +3652,7 @@
 #endif  // DUMP_RECON_FRAMES
 
   if (cm->seg.enabled) {
-    if (cm->seg.update_map) {
-      update_reference_segmentation_map(cpi);
-    } else if (cm->last_frame_seg_map) {
+    if (cm->seg.update_map == 0 && cm->last_frame_seg_map) {
       memcpy(cm->cur_frame->seg_map, cm->last_frame_seg_map,
              cm->cur_frame->mi_cols * cm->cur_frame->mi_rows *
                  sizeof(*cm->cur_frame->seg_map));