commit b09e55cf668e65daefcd78d9e8a74ff6fd94fb29
author Cheng Chen <chengchen@google.com> Fri Nov 10 12:09:19 2017 -0800
committer Cheng Chen <chengchen@google.com> Tue Nov 14 00:33:36 2017 +0000
tree 4bf38648fb0cc52db25daf0bdeacb5f74056e793
parent a6a486c1ddedb395d6c745fbb7bdedd74b955e86

Revert "JNT_COMP: turn off for one_sided_compound"

This reverts commit 060e192bfc5e0b8d1e96ff78b206c11e55e005c6.

Change-Id: I5700d351a3cbb682ec49a0efb9cca4d0e83f9a3a

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 7752e49..d885269 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -2155,7 +2155,7 @@
   is_compound = has_second_ref(mbmi);
 
 #if CONFIG_JNT_COMP
-  if (has_two_sided_comp_refs(cm, mbmi)) {
+  if (is_compound) {
     const int comp_index_ctx = get_comp_index_context(cm, xd);
 #if CONFIG_NEW_MULTISYMBOL
     mbmi->compound_idx = aom_read_symbol(
@@ -2166,8 +2166,6 @@
 #endif  // CONFIG_NEW_MULTISYMBOL
     if (xd->counts)
       ++xd->counts->compound_index[comp_index_ctx][mbmi->compound_idx];
-  } else {
-    mbmi->compound_idx = 1;
   }
 #endif  // CONFIG_JNT_COMP