Disable JNT_COMP in error resilient mode

In error resilient mode, when a frame is dropped, the distance is
no longer correctly synced at encoder/decoder. Thus, JNT_COMP can't
work.

Turn jnt_comp on by default

BUG=aomedia:1422

Change-Id: I24509324cf6039444eda12a46a2eb26befd5e339

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 1652159..5f33353 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -1110,6 +1110,8 @@
   cm->seq_params.enable_dual_filter = oxcf->enable_dual_filter;
 #if CONFIG_JNT_COMP
   cm->seq_params.enable_jnt_comp = oxcf->enable_jnt_comp;
+  // disable jnt_comp at sequence header for error resilient mode
+  cm->seq_params.enable_jnt_comp &= !oxcf->error_resilient_mode;
 #endif
   cm->width = oxcf->width;
   cm->height = oxcf->height;

build/cmake/aom_config_defaults.cmake

diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 910a7b6..c7b991c 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -120,7 +120,7 @@
 set(CONFIG_INTRABC 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_INTRA_EDGE 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_INTRA_EDGE2 1 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_JNT_COMP 0 CACHE NUMBER "AV1 experiment flag.")
+set(CONFIG_JNT_COMP 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_LOOPFILTERING_ACROSS_TILES 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_LOOPFILTERING_ACROSS_TILES_EXT 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_LOOPFILTER_LEVEL 1 CACHE NUMBER "AV1 experiment flag.")