commit 1df427eff84decce3e08a4fe26313b1b05c3e0c4
author Jean-Marc Valin <jmvalin@mozilla.com> Thu Mar 23 18:32:57 2017 -0400
committer Jean-Marc Valin <jvalin@mozilla.com> Fri Mar 24 00:29:33 2017 +0000
tree 2bbd84e95fba55534cd93f0765c14e6be428073f
parent 9620bcd5650a4a7c3a8f2dd491c679eaf4b7ffba

Fix ext_partition with cdef

Change-Id: If3a4c7e6aee747afd675e0233560f6e721c10f79

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index a5abb90..6c53113 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -2385,14 +2385,11 @@
 #if CONFIG_EXT_PARTITION
   if (cm->sb_size == BLOCK_128X128 && bsize == BLOCK_128X128) {
     if (!sb_all_skip(cm, mi_row, mi_col)) {
-      cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col]->mbmi.dering_gain =
-          aom_read_literal(r, cm->dering_bits, ACCT_STR);
-      cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col]->mbmi.clpf_strength =
-          aom_read_literal(r, cm->clpf_bits, ACCT_STR);
+      cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col]->mbmi.cdef_strength =
+          aom_read_literal(r, cm->cdef_bits, ACCT_STR);
     } else {
-      cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col]->mbmi.dering_gain =
-          cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col]
-              ->mbmi.clpf_strength = 0;
+      cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col]->mbmi.cdef_strength =
+          0;
     }
   } else if (cm->sb_size == BLOCK_64X64 && bsize == BLOCK_64X64) {
 #else

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 9a3d3be..72c9068 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2777,13 +2777,9 @@
 #if CONFIG_EXT_PARTITION
   if (cm->sb_size == BLOCK_128X128 && bsize == BLOCK_128X128 &&
       !sb_all_skip(cm, mi_row, mi_col)) {
-    aom_write_literal(
-        w,
-        cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col]->mbmi.dering_gain,
-        cm->dering_bits);
     aom_write_literal(w, cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col]
-                             ->mbmi.clpf_strength,
-                      cm->clpf_bits);
+                             ->mbmi.cdef_strength,
+                      cm->cdef_bits);
   } else if (cm->sb_size == BLOCK_64X64 && bsize == BLOCK_64X64 &&
 #else
   if (bsize == BLOCK_64X64 &&