ref: 8a69cef04242bb384e4195d7c1b903f42e97f9ca
parent: 15600eb8b86a1214034f46fadbe78e187bfd2e6e
parent: 75d77e36db70b5ca667fab6d935dcb3b82456554
author: Alex Converse <aconverse@google.com>
date: Wed May 28 06:19:18 EDT 2014
Merge "Fix the all intra modes mask constant."
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -3162,7 +3162,11 @@
}
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) {