Commit 2edfc37b authored by Joe Young's avatar Joe Young

Enable ext-intra-mod by default

Provisionally adopted on 2017-10-31

(Also an asan warning fix + few non-functional changes)

Change-Id: I2ff4f34f8b20d2eeb567f2e5b1e57b296a97be82
parent 2a91ab7e
...@@ -5680,7 +5680,7 @@ static const aom_cdf_prob ...@@ -5680,7 +5680,7 @@ static const aom_cdf_prob
#endif // CONFIG_LPF_SB #endif // CONFIG_LPF_SB
#if CONFIG_EXT_INTRA_MOD #if CONFIG_EXT_INTRA_MOD
const aom_cdf_prob default_angle_delta_cdf[DIRECTIONAL_MODES][CDF_SIZE( static const aom_cdf_prob default_angle_delta_cdf[DIRECTIONAL_MODES][CDF_SIZE(
2 * MAX_ANGLE_DELTA + 1)] = { 2 * MAX_ANGLE_DELTA + 1)] = {
{ AOM_ICDF(2340), AOM_ICDF(5327), AOM_ICDF(7611), AOM_ICDF(23102), { AOM_ICDF(2340), AOM_ICDF(5327), AOM_ICDF(7611), AOM_ICDF(23102),
AOM_ICDF(27196), AOM_ICDF(30546), AOM_ICDF(32768), 0 }, AOM_ICDF(27196), AOM_ICDF(30546), AOM_ICDF(32768), 0 },
......
...@@ -1472,8 +1472,12 @@ static void highbd_filter_intra_predictors(FILTER_INTRA_MODE mode, ...@@ -1472,8 +1472,12 @@ static void highbd_filter_intra_predictors(FILTER_INTRA_MODE mode,
#if CONFIG_INTRA_EDGE #if CONFIG_INTRA_EDGE
static int is_smooth(MB_MODE_INFO *mbmi) { static int is_smooth(MB_MODE_INFO *mbmi) {
#if CONFIG_SMOOTH_HV
return (mbmi->mode == SMOOTH_PRED || mbmi->mode == SMOOTH_V_PRED || return (mbmi->mode == SMOOTH_PRED || mbmi->mode == SMOOTH_V_PRED ||
mbmi->mode == SMOOTH_H_PRED); mbmi->mode == SMOOTH_H_PRED);
#else
return mbmi->mode == SMOOTH_PRED;
#endif
} }
static int get_filt_type(const MACROBLOCKD *xd) { static int get_filt_type(const MACROBLOCKD *xd) {
...@@ -1589,7 +1593,7 @@ void av1_filter_intra_edge_c(uint8_t *p, int sz, int strength) { ...@@ -1589,7 +1593,7 @@ void av1_filter_intra_edge_c(uint8_t *p, int sz, int strength) {
} }
#if CONFIG_EXT_INTRA_MOD #if CONFIG_EXT_INTRA_MOD
void av1_filter_intra_edge_corner(uint8_t *p_above, uint8_t *p_left) { static void av1_filter_intra_edge_corner(uint8_t *p_above, uint8_t *p_left) {
const int kernel[3] = { 5, 6, 5 }; const int kernel[3] = { 5, 6, 5 };
int s = (p_left[0] * kernel[0]) + (p_above[-1] * kernel[1]) + int s = (p_left[0] * kernel[0]) + (p_above[-1] * kernel[1]) +
...@@ -1625,7 +1629,8 @@ void av1_filter_intra_edge_high_c(uint16_t *p, int sz, int strength) { ...@@ -1625,7 +1629,8 @@ void av1_filter_intra_edge_high_c(uint16_t *p, int sz, int strength) {
} }
#if CONFIG_EXT_INTRA_MOD #if CONFIG_EXT_INTRA_MOD
void av1_filter_intra_edge_corner_high(uint16_t *p_above, uint16_t *p_left) { static void av1_filter_intra_edge_corner_high(uint16_t *p_above,
uint16_t *p_left) {
const int kernel[3] = { 5, 6, 5 }; const int kernel[3] = { 5, 6, 5 };
int s = (p_left[0] * kernel[0]) + (p_above[-1] * kernel[1]) + int s = (p_left[0] * kernel[0]) + (p_above[-1] * kernel[1]) +
......
...@@ -4356,7 +4356,7 @@ static void sum_intra_stats(FRAME_COUNTS *counts, MACROBLOCKD *xd, ...@@ -4356,7 +4356,7 @@ static void sum_intra_stats(FRAME_COUNTS *counts, MACROBLOCKD *xd,
xd->plane[1].subsampling_y)) xd->plane[1].subsampling_y))
return; return;
#if CONFIG_EXT_INTRA && CONFIG_EXT_INTRA_MOD #if CONFIG_EXT_INTRA && CONFIG_EXT_INTRA_MOD
if (av1_is_directional_mode(mbmi->uv_mode, bsize) && if (av1_is_directional_mode(get_uv_mode(mbmi->uv_mode), bsize) &&
av1_use_angle_delta(bsize)) { av1_use_angle_delta(bsize)) {
#if CONFIG_ENTROPY_STATS #if CONFIG_ENTROPY_STATS
++counts->angle_delta[mbmi->uv_mode - V_PRED] ++counts->angle_delta[mbmi->uv_mode - V_PRED]
......
...@@ -136,7 +136,7 @@ set(CONFIG_EOB_FIRST 0 CACHE NUMBER "AV1 experiment flag.") ...@@ -136,7 +136,7 @@ set(CONFIG_EOB_FIRST 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_EXT_COMP_REFS 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_EXT_COMP_REFS 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_EXT_DELTA_Q 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_EXT_DELTA_Q 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_EXT_INTRA 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_EXT_INTRA 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_EXT_INTRA_MOD 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_EXT_INTRA_MOD 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_EXT_PARTITION 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_EXT_PARTITION 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_EXT_PARTITION_TYPES 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_EXT_PARTITION_TYPES 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_EXT_PARTITION_TYPES_AB 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_EXT_PARTITION_TYPES_AB 0 CACHE NUMBER "AV1 experiment flag.")
......
...@@ -527,6 +527,7 @@ post_process_cmdline() { ...@@ -527,6 +527,7 @@ post_process_cmdline() {
soft_enable frame_marker soft_enable frame_marker
soft_enable kf_ctx soft_enable kf_ctx
soft_enable striped_loop_restoration soft_enable striped_loop_restoration
soft_enable ext_intra_mod
fi fi
# Enable low-bitdepth pixel pipeline by default # Enable low-bitdepth pixel pipeline by default
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment