Fix decoding Daala deringing and CLPF filters with tiling.

cherry-picked #14ed7a61 from aom/master

Change-Id: I077b0e97186bdd292f925e08966a2ca3cf8c250d

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 031ddbc72d030fd780cce111fe785c6b3a8a2377..bff026750a23fb7d2bcf7b17030a85557185ec9b 100644 (file)
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -2747,16 +2747,6 @@ static const uint8_t *decode_tiles(AV1Decoder *pbi, const uint8_t *data,
     winterface->execute(&pbi->lf_worker);
   }
 #endif  // CONFIG_VAR_TX
-#if CONFIG_CLPF
-  if (cm->clpf && !cm->skip_loop_filter)
-    av1_clpf_frame(&pbi->cur_buf->buf, cm, &pbi->mb);
-#endif
-#if CONFIG_DERING
-  if (cm->dering_level && !cm->skip_loop_filter) {
-    av1_dering_frame(&pbi->cur_buf->buf, cm, &pbi->mb, cm->dering_level);
-  }
-#endif  // CONFIG_DERING
-
   if (cm->frame_parallel_decode)
     av1_frameworker_broadcast(pbi->cur_buf, INT_MAX);
 
@@ -3853,6 +3843,16 @@ void av1_decode_frame(AV1Decoder *pbi, const uint8_t *data,
   }
 #endif  // CONFIG_LOOP_RESTORATION
 
+#if CONFIG_CLPF
+  if (cm->clpf && !cm->skip_loop_filter)
+    av1_clpf_frame(&pbi->cur_buf->buf, cm, &pbi->mb);
+#endif
+#if CONFIG_DERING
+  if (cm->dering_level && !cm->skip_loop_filter) {
+    av1_dering_frame(&pbi->cur_buf->buf, cm, &pbi->mb, cm->dering_level);
+  }
+#endif  // CONFIG_DERING
+
   if (!xd->corrupted) {
     if (cm->refresh_frame_context == REFRESH_FRAME_CONTEXT_BACKWARD) {
 #if CONFIG_ENTROPY