diff options
| author | Jingning Han <jingning@google.com> | 2014-04-24 17:27:14 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-04-24 17:27:14 -0700 |
| commit | 7e6d851675869339dd26be8513f525bfe66b7ea9 (patch) | |
| tree | f75a5955b088fee06a03622e40f646c1ef897a25 /vp9/encoder | |
| parent | 03e7deae4f1a6323468983b0be1abc205a609bca (diff) | |
| parent | 5a4e17b42f8aee5c50a4169c56b810e3ed1bff1e (diff) | |
| download | libvpx-7e6d851675869339dd26be8513f525bfe66b7ea9.tar libvpx-7e6d851675869339dd26be8513f525bfe66b7ea9.tar.gz libvpx-7e6d851675869339dd26be8513f525bfe66b7ea9.tar.bz2 libvpx-7e6d851675869339dd26be8513f525bfe66b7ea9.zip | |
Merge "Apply max intra block size condition to non-RD mode decision"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index c1493e719..56eb9440c 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -418,7 +418,7 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, // Perform intra prediction search, if the best SAD is above a certain // threshold. - if (best_rd > inter_mode_thresh) { + if (best_rd > inter_mode_thresh && bsize < cpi->sf.max_intra_bsize) { for (this_mode = DC_PRED; this_mode <= DC_PRED; ++this_mode) { vp9_predict_intra_block(xd, 0, b_width_log2(bsize), mbmi->tx_size, this_mode, |