shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Spatial SVC crash fix"

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -2423,8 +2423,15 @@

   if (cpi->sf.use_square_partition_only &&

       bsize > cpi->sf.use_square_only_threshold) {

+    if (cpi->use_svc) {

+      if (!vp9_active_h_edge(cpi, mi_row, mi_step) || x->e_mbd.lossless)

+        partition_horz_allowed &= force_horz_split;

+      if (!vp9_active_v_edge(cpi, mi_row, mi_step) || x->e_mbd.lossless)

+        partition_vert_allowed &= force_vert_split;

+    } else {

       partition_horz_allowed &= force_horz_split;

       partition_vert_allowed &= force_vert_split;

+    }

   }

   save_context(x, mi_row, mi_col, a, l, sa, sl, bsize);

-- 

⑨