ref: 45db29784d4ae2d32c387d58ac0a670a7a8533af
parent: 7c16dcc79bb0d9c8be8c56f4ae43cd8bc3cb9fb9
parent: 9843e7c6355cecc84229bc812c10bb88bb7b74ca
author: Minghai Shang <[email protected]>
date: Thu May 28 18:13:53 EDT 2015
Merge "[svc] Disable tiles for spatial svc case"
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -697,7 +697,9 @@
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 {