commit 2c390b792ab581b05beeaa061e161479f6022e71
author Debargha Mukherjee <debargha@google.com> Sun Mar 25 14:44:33 2018 -0700
committer Debargha Mukherjee <debargha@google.com> Tue Mar 27 00:41:38 2018 +0000
tree 63e996865f52d67aa2fcd0931ef6cd0b1b7fcc82
parent f81d77bf3f11b64cc14f782ac94c4fe8eeaf958b

Rename extra_cfg use_jnt_comp to enable_jnt_comp

Cosmetics and consistency

Change-Id: I764f61f4e304c32d613f7c0bfc6898ef0fd26977

av1/av1_cx_iface.c

diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index 528e6a0..531ec96 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -96,7 +96,7 @@
   unsigned int cdf_update_mode;
 #endif  // CONFIG_CDF_UPDATE_MODE
   int enable_order_hint;
-  int use_jnt_comp;
+  int enable_jnt_comp;
   int enable_ref_frame_mvs;  // sequence level
   int allow_ref_frame_mvs;   // frame level
   int enable_superres;
@@ -662,7 +662,7 @@
   oxcf->enable_dual_filter = extra_cfg->use_dual_filter;
   oxcf->enable_order_hint = extra_cfg->enable_order_hint;
   oxcf->enable_jnt_comp =
-      extra_cfg->use_jnt_comp & extra_cfg->enable_order_hint;
+      extra_cfg->enable_jnt_comp & extra_cfg->enable_order_hint;
   oxcf->enable_ref_frame_mvs =
       extra_cfg->enable_ref_frame_mvs & extra_cfg->enable_order_hint;
   oxcf->enable_superres =
@@ -971,7 +971,7 @@
 static aom_codec_err_t ctrl_set_enable_jnt_comp(aom_codec_alg_priv_t *ctx,
                                                 va_list args) {
   struct av1_extracfg extra_cfg = ctx->extra_cfg;
-  extra_cfg.use_jnt_comp = CAST(AV1E_SET_ENABLE_JNT_COMP, args);
+  extra_cfg.enable_jnt_comp = CAST(AV1E_SET_ENABLE_JNT_COMP, args);
   return update_extra_cfg(ctx, &extra_cfg);
 }