diff options
| author | Minghai Shang <minghai@google.com> | 2015-05-28 22:13:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-05-28 22:13:54 +0000 |
| commit | 45db29784d4ae2d32c387d58ac0a670a7a8533af (patch) | |
| tree | c8b3cf60fc3d00fa1213c54d89b9cf272484fbfa | |
| parent | 7c16dcc79bb0d9c8be8c56f4ae43cd8bc3cb9fb9 (diff) | |
| parent | 9843e7c6355cecc84229bc812c10bb88bb7b74ca (diff) | |
| download | libvpx-45db29784d4ae2d32c387d58ac0a670a7a8533af.tar libvpx-45db29784d4ae2d32c387d58ac0a670a7a8533af.tar.gz libvpx-45db29784d4ae2d32c387d58ac0a670a7a8533af.tar.bz2 libvpx-45db29784d4ae2d32c387d58ac0a670a7a8533af.zip | |
Merge "[svc] Disable tiles for spatial svc case"
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 4a7561342..2fdf4082a 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 { |