commit 5e911428431530bd0f0edbd990c7320ae693f92d
author Frederic Barbier <frederic.barbier@allegrodvt.com> Tue Dec 12 17:17:07 2017 +0100
committer Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Mon Feb 05 08:19:02 2018 +0000
tree fd5f0d69daf70310a9fed9b0a477992991b29595
parent 880ab1ca20a78d272549691bc68618a7e5573c4b

Make segmentation compatible with scaling

Fallback on intra block when the segmentation doesn't allow to reference
a frame in scaling use case (e.g: after use of a segmentation map with
another dimension).

Change-Id: I4aa037f07ec3d18c96752e0d49f5afa4e8674d49

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index ff1d8dc..a0a44f0 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -281,6 +281,14 @@
 static void write_is_inter(const AV1_COMMON *cm, const MACROBLOCKD *xd,
                            int segment_id, aom_writer *w, const int is_inter) {
   if (!segfeature_active(&cm->seg, segment_id, SEG_LVL_REF_FRAME)) {
+    if (segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP)
+#if CONFIG_SEGMENT_GLOBALMV
+        || segfeature_active(&cm->seg, segment_id, SEG_LVL_GLOBALMV)
+#endif
+            )
+      if (!av1_is_valid_scale(&cm->frame_refs[0].sf))
+        return;  // LAST_FRAME not valid for reference
+
     const int ctx = av1_get_intra_inter_context(xd);
     FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
     aom_write_symbol(w, is_inter, ec_ctx->intra_inter_cdf[ctx], 2);