diff options
| author | Minghai Shang <minghai@google.com> | 2015-05-20 14:31:49 -0700 |
|---|---|---|
| committer | Minghai Shang <minghai@google.com> | 2015-05-20 14:31:49 -0700 |
| commit | 9843e7c6355cecc84229bc812c10bb88bb7b74ca (patch) | |
| tree | f6e73aa5edcdfc0ae0e6633e308e23259fc0b8a3 /vp9/encoder | |
| parent | 976f7f42c1ad1ff3cc0792572f9c4f41f05bb375 (diff) | |
| download | libvpx-9843e7c6355cecc84229bc812c10bb88bb7b74ca.tar libvpx-9843e7c6355cecc84229bc812c10bb88bb7b74ca.tar.gz libvpx-9843e7c6355cecc84229bc812c10bb88bb7b74ca.tar.bz2 libvpx-9843e7c6355cecc84229bc812c10bb88bb7b74ca.zip | |
[svc] Disable tiles for spatial svc case
Change-Id: I8655a6760ab61947c09f337ddd9f4c1baf803a56
Diffstat (limited to 'vp9/encoder')
| -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 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 { |