commit 2f6ce75e9ac6ad792bbdb7489139b9b92a52cbeb
author Sarah Parker <sarahparker@google.com> Thu Dec 08 15:26:46 2016 -0800
committer Sarah Parker <sarahparker@google.com> Sat Dec 10 00:38:37 2016 +0000
tree 7a06deca5515dd5a4acbabe1d1d34cffe52aaf0c
parent eda3d7646cdff6f0017b59f03efda7ba07f6d126

Add compound segment experiment flag

Change-Id: Id80f76ea2598daa93e693c5efe29b782abe33957

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index a701e80..70b93b9 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4382,6 +4382,11 @@
   switch (comp_type) {
     case COMPOUND_AVERAGE: return 0;
     case COMPOUND_WEDGE: return get_interinter_wedge_bits(bsize);
+#if CONFIG_COMPOUND_SEGMENT
+    // TODO(sarahparker) this 0 is just a placeholder, it is possible this will
+    // need to change once this mode is fully implemented
+    case COMPOUND_SEG: return 0;
+#endif  // CONFIG_COMPOUND_SEGMENT
     default: assert(0); return 0;
   }
 }
@@ -7605,6 +7610,9 @@
             }
           }
           break;
+#if CONFIG_COMPOUND_SEGMENT
+        case COMPOUND_SEG: break;
+#endif  // CONFIG_COMPOUND_SEGMENT
         default: assert(0); return 0;
       }
     }