summaryrefslogtreecommitdiffstats
path: root/third_party/aom/av1/common/reconintra.h
diff options
context:
space:
mode:
authortrav90 <travawine@palemoon.org>2018-10-18 06:04:57 -0500
committertrav90 <travawine@palemoon.org>2018-10-18 06:04:57 -0500
commit7369c7d7a5eed32963d8af37658286617919f91c (patch)
tree5397ce7ee9bca1641118fdc3187bd9e2b24fdc9c /third_party/aom/av1/common/reconintra.h
parent77887af9c4ad1420bbdb33984af4f74b55ca59db (diff)
downloadUXP-7369c7d7a5eed32963d8af37658286617919f91c.tar
UXP-7369c7d7a5eed32963d8af37658286617919f91c.tar.gz
UXP-7369c7d7a5eed32963d8af37658286617919f91c.tar.lz
UXP-7369c7d7a5eed32963d8af37658286617919f91c.tar.xz
UXP-7369c7d7a5eed32963d8af37658286617919f91c.zip
Update aom to commit id f5bdeac22930ff4c6b219be49c843db35970b918
Diffstat (limited to 'third_party/aom/av1/common/reconintra.h')
-rw-r--r--third_party/aom/av1/common/reconintra.h26
1 files changed, 18 insertions, 8 deletions
diff --git a/third_party/aom/av1/common/reconintra.h b/third_party/aom/av1/common/reconintra.h
index fbcb7f9b4..67e5706d6 100644
--- a/third_party/aom/av1/common/reconintra.h
+++ b/third_party/aom/av1/common/reconintra.h
@@ -73,17 +73,27 @@ static const INTERINTRA_MODE intra_to_interintra_mode[INTRA_MODES] = {
#define FILTER_INTRA_PREC_BITS 10
#endif // CONFIG_FILTER_INTRA
+#define CONFIG_INTRA_EDGE_UPSAMPLE CONFIG_INTRA_EDGE
+#define CONFIG_USE_ANGLE_DELTA_SUB8X8 0
+
#if CONFIG_EXT_INTRA
static INLINE int av1_is_directional_mode(PREDICTION_MODE mode,
BLOCK_SIZE bsize) {
- return mode != DC_PRED && mode != TM_PRED &&
-#if CONFIG_ALT_INTRA
- mode != SMOOTH_PRED &&
-#if CONFIG_SMOOTH_HV
- mode != SMOOTH_V_PRED && mode != SMOOTH_H_PRED &&
-#endif // CONFIG_SMOOTH_HV
-#endif // CONFIG_ALT_INTRA
- bsize >= BLOCK_8X8;
+#if CONFIG_INTRA_EDGE_UPSAMPLE
+ (void)bsize;
+ return mode >= V_PRED && mode <= D63_PRED;
+#else
+ return mode >= V_PRED && mode <= D63_PRED && bsize >= BLOCK_8X8;
+#endif
+}
+
+static INLINE int av1_use_angle_delta(BLOCK_SIZE bsize) {
+ (void)bsize;
+#if CONFIG_USE_ANGLE_DELTA_SUB8X8
+ return 1;
+#else
+ return bsize >= BLOCK_8X8;
+#endif
}
#endif // CONFIG_EXT_INTRA