diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2013-08-02 15:55:09 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-08-02 15:55:09 -0700 |
| commit | d340c114fbbb76f7f12cf5f36055d81f91c54620 (patch) | |
| tree | 47fbfccd8fb888114b615ba2b070259add8a256b /vp9/encoder/vp9_encodeframe.c | |
| parent | 5d86f3886d7d2edda7fd80faf6e735ea3a796ae6 (diff) | |
| parent | 215b010f4b3b1a530b4d9d774b87107ec0172a0b (diff) | |
| download | libvpx-d340c114fbbb76f7f12cf5f36055d81f91c54620.tar libvpx-d340c114fbbb76f7f12cf5f36055d81f91c54620.tar.gz libvpx-d340c114fbbb76f7f12cf5f36055d81f91c54620.tar.bz2 libvpx-d340c114fbbb76f7f12cf5f36055d81f91c54620.zip | |
Merge "Add more checking to using_small_partition_info"
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index d1ecdf0f6..e03c1f2e8 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1584,13 +1584,16 @@ static void rd_pick_partition(VP9_COMP *cpi, TOKENEXTRA **tp, int mi_row, } } + // Use 4 subblocks' motion estimation results to speed up current + // partition's checking. x->fast_ms = 0; x->pred_mv.as_int = 0; x->subblock_ref = 0; - // Use 4 subblocks' motion estimation results to speed up current - // partition's checking. - if (cpi->sf.using_small_partition_info) { + if (cpi->sf.using_small_partition_info && + (!cpi->sf.auto_min_max_partition_size || + (bsize <= cpi->sf.max_partition_size && + bsize >= cpi->sf.min_partition_size))) { // Only use 8x8 result for non HD videos. // int use_8x8 = (MIN(cpi->common.width, cpi->common.height) < 720) ? 1 : 0; int use_8x8 = 1; |