diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-04-30 16:13:20 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-04-30 16:13:20 -0700 |
| commit | d068d869b93e2139a53d3d3037c009a1aa22e3d4 (patch) | |
| tree | f51938560cbbac5056d43acabfd259f8524a5c04 /vp9/encoder/vp9_segmentation.c | |
| parent | ad6890316c4fe742b047fd3d167cc591e01f5ec1 (diff) | |
| download | libvpx-d068d869b93e2139a53d3d3037c009a1aa22e3d4.tar libvpx-d068d869b93e2139a53d3d3037c009a1aa22e3d4.tar.gz libvpx-d068d869b93e2139a53d3d3037c009a1aa22e3d4.tar.bz2 libvpx-d068d869b93e2139a53d3d3037c009a1aa22e3d4.zip | |
sb8x8 integration in rd loop.
Work-in-progress, not yet ready for review. TODO items:
- bitstream writing (encoder) and reading (decoder)
- decoder reconstruction
Change-Id: I5afb7284e7e0480847b47cd0097cb469433c9081
Diffstat (limited to 'vp9/encoder/vp9_segmentation.c')
| -rw-r--r-- | vp9/encoder/vp9_segmentation.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_segmentation.c b/vp9/encoder/vp9_segmentation.c index 7f792ae2b..fbe6c7fd3 100644 --- a/vp9/encoder/vp9_segmentation.c +++ b/vp9/encoder/vp9_segmentation.c @@ -199,9 +199,17 @@ static void count_segs_sb(VP9_COMP *cpi, MODE_INFO *mi, assert(bwl < bsl && bhl < bsl); if (bsize == BLOCK_SIZE_SB64X64) { subsize = BLOCK_SIZE_SB32X32; +#if CONFIG_SB8X8 + } else if (bsize == BLOCK_SIZE_SB32X32) { + subsize = BLOCK_SIZE_MB16X16; + } else { + assert(bsize == BLOCK_SIZE_MB16X16); + subsize = BLOCK_SIZE_SB8X8; +#else } else { assert(bsize == BLOCK_SIZE_SB32X32); subsize = BLOCK_SIZE_MB16X16; +#endif } for (n = 0; n < 4; n++) { |