From 9843e7c6355cecc84229bc812c10bb88bb7b74ca Mon Sep 17 00:00:00 2001 From: Minghai Shang Date: Wed, 20 May 2015 14:31:49 -0700 Subject: [svc] Disable tiles for spatial svc case Change-Id: I8655a6760ab61947c09f337ddd9f4c1baf803a56 --- vp9/encoder/vp9_encoder.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'vp9/encoder') diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index e89ee5eb7..df7094949 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -697,7 +697,9 @@ static void set_tile_limits(VP9_COMP *cpi) { int min_log2_tile_cols, max_log2_tile_cols; vp9_get_tile_n_bits(cm->mi_cols, &min_log2_tile_cols, &max_log2_tile_cols); - if (is_two_pass_svc(cpi) && cpi->svc.encode_empty_frame_state == ENCODING) { + if (is_two_pass_svc(cpi) && + (cpi->svc.encode_empty_frame_state == ENCODING || + cpi->svc.number_spatial_layers > 1)) { cm->log2_tile_cols = 0; cm->log2_tile_rows = 0; } else { -- cgit v1.2.3