diff options
| author | Minghai Shang <minghai@google.com> | 2015-04-15 14:59:17 -0700 |
|---|---|---|
| committer | Minghai Shang <minghai@google.com> | 2015-04-16 12:56:30 -0700 |
| commit | 4aa9255efa38719029d1559fed65e607fce427ef (patch) | |
| tree | 5a96fc35e2773b0bd334bec8b0c2f14642e6d903 /vp9/encoder | |
| parent | 2baa3debd5cf7539e3a99d177801fa36c05a754b (diff) | |
| download | libvpx-4aa9255efa38719029d1559fed65e607fce427ef.tar libvpx-4aa9255efa38719029d1559fed65e607fce427ef.tar.gz libvpx-4aa9255efa38719029d1559fed65e607fce427ef.tar.bz2 libvpx-4aa9255efa38719029d1559fed65e607fce427ef.zip | |
[svc] Fix syntax error when encoding multiple tiles.
Change-Id: Ia77b551415f3b3386e22a6c805f244f2d13fe3e3
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 82f99b3e5..61a6195ae 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -692,9 +692,14 @@ 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); - cm->log2_tile_cols = clamp(cpi->oxcf.tile_columns, - min_log2_tile_cols, max_log2_tile_cols); - cm->log2_tile_rows = cpi->oxcf.tile_rows; + if (is_two_pass_svc(cpi) && cpi->svc.encode_empty_frame_state == ENCODING) { + cm->log2_tile_cols = 0; + cm->log2_tile_rows = 0; + } else { + cm->log2_tile_cols = clamp(cpi->oxcf.tile_columns, + min_log2_tile_cols, max_log2_tile_cols); + cm->log2_tile_rows = cpi->oxcf.tile_rows; + } } static void init_buffer_indices(VP9_COMP *cpi) { |