[intra-edge] Convert 4x4 VP9 to ext-intra; upsample edge samples
Updates to intra-edge experiment
- Convert VP9-style intra pred to Ext-intra style
- Upsample edge predictors by 2x based on angle and edge size
BD-rate, 1-kf AWCY
360p: -0.11%
720p: -0.54
1080p: -0.96
Change-Id: Ib73805d31d5d286e607a7ee7470fcbdf11edbbff
diff --git a/av1/common/reconintra.h b/av1/common/reconintra.h
index 8ad3bae..67e5706 100644
--- a/av1/common/reconintra.h
+++ b/av1/common/reconintra.h
@@ -73,10 +73,27 @@
#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) {
+#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
