Merge "[svc] Disable tiles for spatial svc case"

45db2978 · Minghai Shang · Gerrit Code Review · 7c16dcc7 · 9843e7c6 · 45db2978
Commit 45db2978 authored May 28, 2015 by Minghai Shang Committed by Gerrit Code Review May 28, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

vp9/encoder/vp9_encoder.c vp9/encoder/vp9_encoder.c +3 -1

No files found.
--- 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 {