commit 8db8a2082e2698fb2d317c0855ff2331964294af
author Vishesh <vishesh.garg@ittiam.com> Tue Jun 02 17:09:45 2020 +0530
committer Yunqing Wang <yunqingwang@google.com> Tue Jun 02 23:15:14 2020 +0000
tree 9cd607ab252d0adda9e3641e0122df98d891d9b5
parent 28709f2b10a0279d5c010991bde27966dfbfd971

Group compound type elements in AV1EncoderConfig

This CL groups together compound type related elements from
AV1EncoderConfig into a new structure CompoundTypeCfg, changes
datatypes of flags to bool, and adds relevant documentation.

BUG=aomedia:2701

Change-Id: If00dc76a3a1c785d53906364f56b96efc173bef2

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index cebff7a5..3b2b2a1 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -1334,7 +1334,8 @@
   seq->delta_frame_id_length = DELTA_FRAME_ID_LENGTH;
 
   seq->enable_dual_filter = oxcf->enable_dual_filter;
-  seq->order_hint_info.enable_dist_wtd_comp = oxcf->enable_dist_wtd_comp;
+  seq->order_hint_info.enable_dist_wtd_comp =
+      oxcf->comp_type_cfg.enable_dist_wtd_comp;
   seq->order_hint_info.enable_dist_wtd_comp &=
       seq->order_hint_info.enable_order_hint;
   seq->order_hint_info.enable_ref_frame_mvs = oxcf->enable_ref_frame_mvs;
@@ -1345,7 +1346,7 @@
   seq->enable_restoration = oxcf->enable_restoration;
   seq->enable_warped_motion = oxcf->enable_warped_motion;
   seq->enable_interintra_compound = oxcf->enable_interintra_comp;
-  seq->enable_masked_compound = oxcf->enable_masked_comp;
+  seq->enable_masked_compound = oxcf->comp_type_cfg.enable_masked_comp;
   seq->enable_intra_edge_filter = oxcf->intra_mode_cfg.enable_intra_edge_filter;
   seq->enable_filter_intra = oxcf->intra_mode_cfg.enable_filter_intra;