From 5a019e148e6ffb612e7df2a410d4b41e699d34ca Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Thu, 16 Jun 2016 15:00:31 -0700 Subject: [PATCH] Reject sub8x8 partitions with SEG_LVL_SKIP. Change-Id: I2503f163464862dc3a7a3141d43d3f07c81b33d2 --- vp10/encoder/encodeframe.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/vp10/encoder/encodeframe.c b/vp10/encoder/encodeframe.c index 19ce4c37e..caca29576 100644 --- a/vp10/encoder/encodeframe.c +++ b/vp10/encoder/encodeframe.c @@ -1810,14 +1810,20 @@ static void rd_pick_sb_modes(VP10_COMP *cpi, #endif // CONFIG_SUPERTX } } else { - vp10_rd_pick_inter_mode_sub8x8(cpi, tile_data, x, mi_row, mi_col, rd_cost, + if (segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP)) { + // The decoder rejects sub8x8 partitions when SEG_LVL_SKIP is set. + rd_cost->rate = INT_MAX; + } else { + vp10_rd_pick_inter_mode_sub8x8(cpi, tile_data, x, mi_row, mi_col, + rd_cost, #if CONFIG_SUPERTX - totalrate_nocoef, + totalrate_nocoef, #endif // CONFIG_SUPERTX - bsize, ctx, best_rd); + bsize, ctx, best_rd); #if CONFIG_SUPERTX assert(*totalrate_nocoef >= 0); #endif // CONFIG_SUPERTX + } } } -- 2.49.0