diff options
| author | Alex Converse <aconverse@google.com> | 2014-05-28 10:19:18 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-28 10:19:18 -0700 |
| commit | 8a69cef04242bb384e4195d7c1b903f42e97f9ca (patch) | |
| tree | 79e6446052d799c93694c2f9e9cb50ba5e26b98c | |
| parent | 15600eb8b86a1214034f46fadbe78e187bfd2e6e (diff) | |
| parent | 75d77e36db70b5ca667fab6d935dcb3b82456554 (diff) | |
| download | libvpx-8a69cef04242bb384e4195d7c1b903f42e97f9ca.tar libvpx-8a69cef04242bb384e4195d7c1b903f42e97f9ca.tar.gz libvpx-8a69cef04242bb384e4195d7c1b903f42e97f9ca.tar.bz2 libvpx-8a69cef04242bb384e4195d7c1b903f42e97f9ca.zip | |
Merge "Fix the all intra modes mask constant."
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 56fcf0fa6..d24850e6d 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3162,7 +3162,11 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, } if (bsize > cpi->sf.max_intra_bsize) { - mode_skip_mask |= 0xFF30808; + const int all_intra_modes = (1 << THR_DC) | (1 << THR_TM) | + (1 << THR_H_PRED) | (1 << THR_V_PRED) | (1 << THR_D135_PRED) | + (1 << THR_D207_PRED) | (1 << THR_D153_PRED) | (1 << THR_D63_PRED) | + (1 << THR_D117_PRED) | (1 << THR_D45_PRED); + mode_skip_mask |= all_intra_modes; } if (!x->in_active_map) { |