From e807517a93f315264b48bc9fbfe918c5032e3fc0 Mon Sep 17 00:00:00 2001 From: Debargha Mukherjee Date: Tue, 24 Nov 2015 16:40:27 -0800 Subject: Spatial SVC crash fix Fixes a spatial_svc breakage introduced in https://chromium-review.googlesource.com/#/c/305228/3. Change-Id: I7f2cecbdca980addb85d5e58b58b5454f4730ada --- vp9/encoder/vp9_encodeframe.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'vp9/encoder/vp9_encodeframe.c') diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index f9c28f6a9..edccc4dd2 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -2432,8 +2432,15 @@ static void rd_pick_partition(VP9_COMP *cpi, ThreadData *td, 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); -- cgit v1.2.3