diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-01-29 16:36:06 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-29 16:36:06 -0800 |
| commit | 08b912b4d1614c7c997708ea05b9d6d7007ab091 (patch) | |
| tree | b69900704fc5c68b8b366c5469f3ece0606e5dfb /vp9/encoder/vp9_encodeframe.c | |
| parent | afc8f4344885e47afcc8ae90463054b778a46efb (diff) | |
| parent | 1ca118652901b8ea8beccc71bc7079c77cc5554d (diff) | |
| download | libvpx-08b912b4d1614c7c997708ea05b9d6d7007ab091.tar libvpx-08b912b4d1614c7c997708ea05b9d6d7007ab091.tar.gz libvpx-08b912b4d1614c7c997708ea05b9d6d7007ab091.tar.bz2 libvpx-08b912b4d1614c7c997708ea05b9d6d7007ab091.zip | |
Merge "Add a strict mode for auto_min_max_partition_size feature"
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index fba97736d..6a8a34c21 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1446,15 +1446,19 @@ static void rd_use_partition(VP9_COMP *cpi, } static const BLOCK_SIZE min_partition_size[BLOCK_SIZES] = { - BLOCK_4X4, BLOCK_4X4, BLOCK_4X4, BLOCK_4X4, - BLOCK_4X4, BLOCK_4X4, BLOCK_8X8, BLOCK_8X8, - BLOCK_8X8, BLOCK_16X16, BLOCK_16X16, BLOCK_16X16, BLOCK_16X16 + BLOCK_4X4, BLOCK_4X4, BLOCK_4X4, + BLOCK_4X4, BLOCK_4X4, BLOCK_4X4, + BLOCK_8X8, BLOCK_8X8, BLOCK_8X8, + BLOCK_16X16, BLOCK_16X16, BLOCK_16X16, + BLOCK_16X16 }; static const BLOCK_SIZE max_partition_size[BLOCK_SIZES] = { - BLOCK_8X8, BLOCK_16X16, BLOCK_16X16, BLOCK_16X16, - BLOCK_32X32, BLOCK_32X32, BLOCK_32X32, BLOCK_64X64, - BLOCK_64X64, BLOCK_64X64, BLOCK_64X64, BLOCK_64X64, BLOCK_64X64 + BLOCK_8X8, BLOCK_16X16, BLOCK_16X16, + BLOCK_16X16, BLOCK_32X32, BLOCK_32X32, + BLOCK_32X32, BLOCK_64X64, BLOCK_64X64, + BLOCK_64X64, BLOCK_64X64, BLOCK_64X64, + BLOCK_64X64 }; // Look at all the mode_info entries for blocks that are part of this @@ -1540,9 +1544,11 @@ static void rd_auto_partition_range(VP9_COMP *cpi, const TileInfo *const tile, } } - // Give a bit of leaway either side of the observed min and max - *min_block_size = min_partition_size[*min_block_size]; - *max_block_size = max_partition_size[*max_block_size]; + // adjust observed min and max + if (cpi->sf.auto_min_max_partition_size == RELAXED_NEIGHBORING_MIN_MAX) { + *min_block_size = min_partition_size[*min_block_size]; + *max_block_size = max_partition_size[*max_block_size]; + } // Check border cases where max and min from neighbours may not be legal. *max_block_size = find_partition_size(*max_block_size, |