commit 8c90fffc4e69d91d8a0ff3c5322db25a63cb9d89
author Vishesh <vishesh.garg@ittiam.com> Mon Apr 13 11:32:56 2020 +0530
committer Yunqing Wang <yunqingwang@google.com> Mon Apr 13 17:53:53 2020 +0000
tree 335649655d003dd014184ae9248797718f224381
parent dbe5aaa51eafd2d10352924186fef7668e57591d

Refactor segmentation related params in AV1_COMP

This CL groups together segmentation related params in AV1_COMP into
a new struct EncSegmentationInfo, and adds documentation for the
members.

BUG=aomedia:2610

Change-Id: Ib14e451b1f50b5ae7f9f7ef1fa6ec61c66afc8a1

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index aafa9fd..daa8ce1 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -455,11 +455,11 @@
     // Still need to transmit tx size for intra blocks even if skip is
     // true. Changing segment_id may make the tx size become invalid, e.g
     // changing from lossless to lossy.
-    assert(is_inter_block(mbmi) || !cpi->has_lossless_segment);
+    assert(is_inter_block(mbmi) || !cpi->enc_seg.has_lossless_segment);
 
     set_spatial_segment_id(&cm->mi_params, cm->cur_frame->seg_map,
                            mbmi->sb_type, mi_row, mi_col, pred);
-    set_spatial_segment_id(&cm->mi_params, cpi->segmentation_map, mbmi->sb_type,
+    set_spatial_segment_id(&cm->mi_params, cpi->enc_seg.map, mbmi->sb_type,
                            mi_row, mi_col, pred);
     /* mbmi is read only but we need to update segment_id */
     ((MB_MODE_INFO *)mbmi)->segment_id = pred;