commit f8935c9c925ab6c5e7fa9f1d9660e0133ed954ad
author David Barker <david.barker@argondesign.com> Wed Oct 26 14:54:06 2016 +0100
committer David Barker <david.barker@argondesign.com> Thu Oct 27 13:19:01 2016 +0000
tree 4132f2662603fa2c61b49fb4c1502c33aaa21eb1
parent 199502f259133f3090306645985e7b1603ea7fe7

Fix clpf and dering signalling when used with ext-partition-types

Previously, when ext-partition-types and either clpf or dering were
enabled, the signalling for clpf/dering would not be encoded or decoded,
as the code to do so was inside a #if !CONFIG_EXT_PARTITION_TYPES block.
This caused many tests (eg, AV1/EndToEndTestLarge.EndToEndPSNRTest/0)
to fail with encode/decode mismatches.

Change-Id: If1742deb1812877813b2c3e93a048430f9a504ba

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 899aa81..82ca3b6 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2058,6 +2058,7 @@
   if (bsize >= BLOCK_8X8 &&
       (bsize == BLOCK_8X8 || partition != PARTITION_SPLIT))
     update_partition_context(xd, mi_row, mi_col, subsize, bsize);
+#endif  // CONFIG_EXT_PARTITION_TYPES
 
 #if CONFIG_CLPF
   if (bsize == BLOCK_64X64 && cm->clpf_blocks && cm->clpf_strength_y &&
@@ -2099,7 +2100,6 @@
         DERING_REFINEMENT_BITS);
   }
 #endif
-#endif  // CONFIG_EXT_PARTITION_TYPES
 }
 
 static void write_modes(AV1_COMP *const cpi, const TileInfo *const tile,