commit 520916280b9bba4952ef892383e081640ae81624
author Cheng Chen <chengchen@google.com> Mon Mar 12 17:27:13 2018 -0700
committer Cheng Chen <chengchen@google.com> Tue Mar 13 21:36:36 2018 +0000
tree a64be378d0974bf58bb0698553c4470e7cc1a511
parent 53462b3c18fb143d1f8cda60b3929b7cce163484

Allow compound mode when order hint isn't available

BUG=aomedia:1570

Change-Id: Ibd0c5cf2ae8b408ff2d4c791ef06c72c1a9ebfad

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 9c429f2..59de549 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -89,10 +89,10 @@
 
 static REFERENCE_MODE read_frame_reference_mode(
     const AV1_COMMON *cm, struct aom_read_bit_buffer *rb) {
-  if (av1_is_compound_reference_allowed(cm)) {
-    return aom_rb_read_bit(rb) ? REFERENCE_MODE_SELECT : SINGLE_REFERENCE;
-  } else {
+  if (frame_is_intra_only(cm)) {
     return SINGLE_REFERENCE;
+  } else {
+    return aom_rb_read_bit(rb) ? REFERENCE_MODE_SELECT : SINGLE_REFERENCE;
   }
 }