Fix ext-tile without ext-partition. Default case (when ext-partition was not configured) was incorrect in encoder tile size initialization. BUG=https://bugs.chromium.org/p/webm/issues/detail?id=1197 Change-Id: Ibe57cb1dc16b9fa300573816fc16d2d2f6849fc6
diff --git a/vp10/encoder/encoder.c b/vp10/encoder/encoder.c index 437b366..21ed965 100644 --- a/vp10/encoder/encoder.c +++ b/vp10/encoder/encoder.c
@@ -833,14 +833,18 @@ cm->tile_height = clamp(cpi->oxcf.tile_rows, 1, 32); cm->tile_width <<= MAX_MIB_SIZE_LOG2; cm->tile_height <<= MAX_MIB_SIZE_LOG2; - } else -#endif // CONFIG_EXT_PARTITION - { + } else { cm->tile_width = clamp(cpi->oxcf.tile_columns, 1, 64); cm->tile_height = clamp(cpi->oxcf.tile_rows, 1, 64); cm->tile_width <<= MAX_MIB_SIZE_LOG2 - 1; cm->tile_height <<= MAX_MIB_SIZE_LOG2 - 1; } +#else + cm->tile_width = clamp(cpi->oxcf.tile_columns, 1, 64); + cm->tile_height = clamp(cpi->oxcf.tile_rows, 1, 64); + cm->tile_width <<= MAX_MIB_SIZE_LOG2; + cm->tile_height <<= MAX_MIB_SIZE_LOG2; +#endif // CONFIG_EXT_PARTITION cm->tile_width = VPXMIN(cm->tile_width, cm->mi_cols); cm->tile_height = VPXMIN(cm->tile_height, cm->mi_rows);