commit 42d9610a797dbc778797c04445578eba514d4099
author Sarah Parker <sarahparker@google.com> Tue Jan 31 21:05:27 2017 -0800
committer Sarah Parker <sarahparker@google.com> Wed Feb 08 04:37:16 2017 +0000
tree 14fdbdf4bc8fd6c2fffc0d3a2f88def2b33f4a49
parent 0115691e3bedec7893eb27761354bae25d28e5b1

Avoid sending bits for the compound type for sub 8x8 blocks

The only compound mode used with sub 8x8 blocks is COMPOUND_AVERAGE, so
we don't have to send anything in this case

Change-Id: I90d0162e5f7f1ad205e65094293cde2a48eb77b1

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 83a2278..4b9f4dc 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1714,7 +1714,7 @@
 #if CONFIG_MOTION_VAR
         && mbmi->motion_mode == SIMPLE_TRANSLATION
 #endif  // CONFIG_MOTION_VAR
-        ) {
+        && is_any_masked_compound_used(bsize)) {
       av1_write_token(
           w, av1_compound_type_tree, cm->fc->compound_type_prob[bsize],
           &compound_type_encodings[mbmi->interinter_compound_data.type]);