Commit d0d6097d authored by Frederic Barbier's avatar Frederic Barbier Committed by Sebastien Alaiwan

Remove CTX1D experiment

This experiment has been abandonned for AV1.

Change-Id: I83fb51a17d67df6713308665d2626c232376d25a
parent 9f001f35
...@@ -1632,11 +1632,6 @@ void av1_average_tile_coef_cdfs(FRAME_CONTEXT *fc, FRAME_CONTEXT *ec_ctxs[], ...@@ -1632,11 +1632,6 @@ void av1_average_tile_coef_cdfs(FRAME_CONTEXT *fc, FRAME_CONTEXT *ec_ctxs[],
AVERAGE_TILE_CDFS(coeff_lps_cdf) AVERAGE_TILE_CDFS(coeff_lps_cdf)
#endif #endif
AVERAGE_TILE_CDFS(coeff_br_cdf) AVERAGE_TILE_CDFS(coeff_br_cdf)
#if CONFIG_CTX1D
AVERAGE_TILE_CDFS(eob_mode_cdf)
AVERAGE_TILE_CDFS(empty_line_cdf)
AVERAGE_TILE_CDFS(hv_eob_cdf)
#endif
#else #else
AVERAGE_TILE_CDFS(coef_head_cdfs) AVERAGE_TILE_CDFS(coef_head_cdfs)
AVERAGE_TILE_CDFS(coef_tail_cdfs) AVERAGE_TILE_CDFS(coef_tail_cdfs)
......
...@@ -61,14 +61,7 @@ extern "C" { ...@@ -61,14 +61,7 @@ extern "C" {
#if CONFIG_LV_MAP #if CONFIG_LV_MAP
#define TXB_SKIP_CONTEXTS 13 #define TXB_SKIP_CONTEXTS 13
#if CONFIG_CTX1D
#define EOB_COEF_CONTEXTS_2D 25
#define EOB_COEF_CONTEXTS_1D 25
#define EOB_COEF_CONTEXTS \
(EOB_COEF_CONTEXTS_2D + EOB_COEF_CONTEXTS_1D + EOB_COEF_CONTEXTS_1D)
#else // CONFIG_CTX1D
#define EOB_COEF_CONTEXTS 22 #define EOB_COEF_CONTEXTS 22
#endif // CONFIG_CTX1D
#define USE_CAUSAL_BASE_CTX 1 #define USE_CAUSAL_BASE_CTX 1
...@@ -119,11 +112,6 @@ extern "C" { ...@@ -119,11 +112,6 @@ extern "C" {
#define BASE_CONTEXT_POSITION_NUM 12 #define BASE_CONTEXT_POSITION_NUM 12
#if CONFIG_CTX1D
#define EMPTY_LINE_CONTEXTS 5
#define HV_EOB_CONTEXTS 24
#endif // CONFIG_CTX1D
typedef enum TX_CLASS { typedef enum TX_CLASS {
TX_CLASS_2D = 0, TX_CLASS_2D = 0,
TX_CLASS_HORIZ = 1, TX_CLASS_HORIZ = 1,
......
This diff is collapsed.
...@@ -142,11 +142,6 @@ typedef struct frame_contexts { ...@@ -142,11 +142,6 @@ typedef struct frame_contexts {
#if !CONFIG_LV_MAP_MULTI #if !CONFIG_LV_MAP_MULTI
aom_prob coeff_br[TX_SIZES][PLANE_TYPES][BASE_RANGE_SETS][LEVEL_CONTEXTS]; aom_prob coeff_br[TX_SIZES][PLANE_TYPES][BASE_RANGE_SETS][LEVEL_CONTEXTS];
#endif #endif
#if CONFIG_CTX1D
aom_prob eob_mode[TX_SIZES][PLANE_TYPES][TX_CLASSES];
aom_prob empty_line[TX_SIZES][PLANE_TYPES][TX_CLASSES][EMPTY_LINE_CONTEXTS];
aom_prob hv_eob[TX_SIZES][PLANE_TYPES][TX_CLASSES][HV_EOB_CONTEXTS];
#endif // CONFIG_CTX1D
aom_cdf_prob txb_skip_cdf[TX_SIZES][TXB_SKIP_CONTEXTS][CDF_SIZE(2)]; aom_cdf_prob txb_skip_cdf[TX_SIZES][TXB_SKIP_CONTEXTS][CDF_SIZE(2)];
#if !CONFIG_LV_MAP_MULTI #if !CONFIG_LV_MAP_MULTI
...@@ -175,13 +170,6 @@ typedef struct frame_contexts { ...@@ -175,13 +170,6 @@ typedef struct frame_contexts {
aom_cdf_prob coeff_br_cdf[TX_SIZES][PLANE_TYPES][BASE_RANGE_SETS] aom_cdf_prob coeff_br_cdf[TX_SIZES][PLANE_TYPES][BASE_RANGE_SETS]
[LEVEL_CONTEXTS][CDF_SIZE(2)]; [LEVEL_CONTEXTS][CDF_SIZE(2)];
#endif #endif
#if CONFIG_CTX1D
aom_cdf_prob eob_mode_cdf[TX_SIZES][PLANE_TYPES][TX_CLASSES][CDF_SIZE(2)];
aom_cdf_prob empty_line_cdf[TX_SIZES][PLANE_TYPES][TX_CLASSES]
[EMPTY_LINE_CONTEXTS][CDF_SIZE(2)];
aom_cdf_prob hv_eob_cdf[TX_SIZES][PLANE_TYPES][TX_CLASSES][HV_EOB_CONTEXTS]
[CDF_SIZE(2)];
#endif // CONFIG_CTX1D
#endif #endif
aom_cdf_prob newmv_cdf[NEWMV_MODE_CONTEXTS][CDF_SIZE(2)]; aom_cdf_prob newmv_cdf[NEWMV_MODE_CONTEXTS][CDF_SIZE(2)];
...@@ -350,12 +338,6 @@ typedef struct FRAME_COUNTS { ...@@ -350,12 +338,6 @@ typedef struct FRAME_COUNTS {
unsigned int coeff_br[TX_SIZES][PLANE_TYPES][BASE_RANGE_SETS][LEVEL_CONTEXTS] unsigned int coeff_br[TX_SIZES][PLANE_TYPES][BASE_RANGE_SETS][LEVEL_CONTEXTS]
[2]; [2];
#endif #endif
#if CONFIG_CTX1D
unsigned int eob_mode[TX_SIZES][PLANE_TYPES][TX_CLASSES][2];
unsigned int empty_line[TX_SIZES][PLANE_TYPES][TX_CLASSES]
[EMPTY_LINE_CONTEXTS][2];
unsigned int hv_eob[TX_SIZES][PLANE_TYPES][TX_CLASSES][HV_EOB_CONTEXTS][2];
#endif // CONFIG_CTX1D
#endif // CONFIG_LV_MAP #endif // CONFIG_LV_MAP
#if CONFIG_SYMBOLRATE #if CONFIG_SYMBOLRATE
......
...@@ -228,44 +228,6 @@ void av1_init_txb_probs(FRAME_CONTEXT *fc) { ...@@ -228,44 +228,6 @@ void av1_init_txb_probs(FRAME_CONTEXT *fc) {
#endif #endif
} }
} }
#if CONFIG_CTX1D
for (tx_size = 0; tx_size < TX_SIZES; ++tx_size) {
for (plane = 0; plane < PLANE_TYPES; ++plane) {
for (int tx_class = 0; tx_class < TX_CLASSES; ++tx_class) {
fc->eob_mode_cdf[tx_size][plane][tx_class][0] = AOM_ICDF(
128 * (aom_cdf_prob)fc->eob_mode[tx_size][plane][tx_class]);
fc->eob_mode_cdf[tx_size][plane][tx_class][1] = AOM_ICDF(32768);
fc->eob_mode_cdf[tx_size][plane][tx_class][2] = 0;
}
}
}
for (tx_size = 0; tx_size < TX_SIZES; ++tx_size) {
for (plane = 0; plane < PLANE_TYPES; ++plane) {
for (int tx_class = 0; tx_class < TX_CLASSES; ++tx_class) {
for (ctx = 0; ctx < EMPTY_LINE_CONTEXTS; ++ctx) {
fc->empty_line_cdf[tx_size][plane][tx_class][ctx][0] = AOM_ICDF(
128 *
(aom_cdf_prob)fc->empty_line[tx_size][plane][tx_class][ctx]);
fc->empty_line_cdf[tx_size][plane][tx_class][ctx][1] =
AOM_ICDF(32768);
fc->empty_line_cdf[tx_size][plane][tx_class][ctx][2] = 0;
}
}
}
}
for (tx_size = 0; tx_size < TX_SIZES; ++tx_size) {
for (plane = 0; plane < PLANE_TYPES; ++plane) {
for (int tx_class = 0; tx_class < TX_CLASSES; ++tx_class) {
for (ctx = 0; ctx < HV_EOB_CONTEXTS; ++ctx) {
fc->hv_eob_cdf[tx_size][plane][tx_class][ctx][0] = AOM_ICDF(
128 * (aom_cdf_prob)fc->hv_eob[tx_size][plane][tx_class][ctx]);
fc->hv_eob_cdf[tx_size][plane][tx_class][ctx][1] = AOM_ICDF(32768);
fc->hv_eob_cdf[tx_size][plane][tx_class][ctx][2] = 0;
}
}
}
}
#endif // CONFIG_CTX1D
} }
void av1_init_lv_map(AV1_COMMON *cm) { void av1_init_lv_map(AV1_COMMON *cm) {
......
...@@ -460,15 +460,7 @@ static INLINE int get_nz_map_ctx(const uint8_t *const levels, ...@@ -460,15 +460,7 @@ static INLINE int get_nz_map_ctx(const uint8_t *const levels,
static INLINE int get_eob_ctx(const int coeff_idx, // raster order static INLINE int get_eob_ctx(const int coeff_idx, // raster order
const TX_SIZE txs_ctx, const TX_TYPE tx_type) { const TX_SIZE txs_ctx, const TX_TYPE tx_type) {
int offset = 0; int offset = 0;
#if CONFIG_CTX1D
const TX_CLASS tx_class = get_tx_class(tx_type);
if (tx_class == TX_CLASS_VERT)
offset = EOB_COEF_CONTEXTS_2D;
else if (tx_class == TX_CLASS_HORIZ)
offset = EOB_COEF_CONTEXTS_2D + EOB_COEF_CONTEXTS_1D;
#else
(void)tx_type; (void)tx_type;
#endif
if (txs_ctx == TX_4X4) return offset + av1_coeff_band_4x4[coeff_idx]; if (txs_ctx == TX_4X4) return offset + av1_coeff_band_4x4[coeff_idx];
if (txs_ctx == TX_8X8) return offset + av1_coeff_band_8x8[coeff_idx]; if (txs_ctx == TX_8X8) return offset + av1_coeff_band_8x8[coeff_idx];
......
...@@ -81,11 +81,6 @@ typedef struct { ...@@ -81,11 +81,6 @@ typedef struct {
#if !CONFIG_LV_MAP_MULTI #if !CONFIG_LV_MAP_MULTI
int br_cost[BASE_RANGE_SETS][LEVEL_CONTEXTS][2]; int br_cost[BASE_RANGE_SETS][LEVEL_CONTEXTS][2];
#endif #endif
#if CONFIG_CTX1D
int eob_mode_cost[TX_CLASSES][2];
int empty_line_cost[TX_CLASSES][EMPTY_LINE_CONTEXTS][2];
int hv_eob_cost[TX_CLASSES][HV_EOB_CONTEXTS][2];
#endif
} LV_MAP_COEFF_COST; } LV_MAP_COEFF_COST;
typedef struct { typedef struct {
......
...@@ -545,24 +545,6 @@ void av1_fill_coeff_costs(MACROBLOCK *x, FRAME_CONTEXT *fc) { ...@@ -545,24 +545,6 @@ void av1_fill_coeff_costs(MACROBLOCK *x, FRAME_CONTEXT *fc) {
} }
#endif #endif
} }
#if CONFIG_CTX1D
for (int tx_class = 0; tx_class < TX_CLASSES; ++tx_class)
av1_cost_tokens_from_cdf(pcost->eob_mode_cost[tx_class],
fc->eob_mode_cdf[tx_size][plane][tx_class],
NULL);
for (int tx_class = 0; tx_class < TX_CLASSES; ++tx_class)
for (int ctx = 0; ctx < EMPTY_LINE_CONTEXTS; ++ctx)
av1_cost_tokens_from_cdf(
pcost->empty_line_cost[tx_class][ctx],
fc->empty_line_cdf[tx_size][plane][tx_class][ctx], NULL);
for (int tx_class = 0; tx_class < TX_CLASSES; ++tx_class)
for (int ctx = 0; ctx < HV_EOB_CONTEXTS; ++ctx)
av1_cost_tokens_from_cdf(
pcost->hv_eob_cost[tx_class][ctx],
fc->hv_eob_cdf[tx_size][plane][tx_class][ctx], NULL);
#endif // CONFIG_CTX1D
} }
} }
} }
......
...@@ -116,7 +116,6 @@ set(CONFIG_CFL 1 CACHE NUMBER "AV1 experiment flag.") ...@@ -116,7 +116,6 @@ set(CONFIG_CFL 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_COLORSPACE_HEADERS 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_COLORSPACE_HEADERS 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_COMPOUND_ROUND 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_COMPOUND_ROUND 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_CONVOLVE_ROUND 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_CONVOLVE_ROUND 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_CTX1D 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DAALA_TX 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_DAALA_TX 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DAALA_TX16 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_DAALA_TX16 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DAALA_TX32 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_DAALA_TX32 0 CACHE NUMBER "AV1 experiment flag.")
......
...@@ -32,12 +32,6 @@ macro (fix_experiment_configs) ...@@ -32,12 +32,6 @@ macro (fix_experiment_configs)
endif () endif ()
endif () endif ()
if (CONFIG_CTX1D)
if (NOT CONFIG_LV_MAP)
change_config_and_warn(CONFIG_LV_MAP 1 CONFIG_CTX1D)
endif ()
endif ()
if (CONFIG_EOB_FIRST) if (CONFIG_EOB_FIRST)
if (NOT CONFIG_LV_MAP) if (NOT CONFIG_LV_MAP)
change_config_and_warn(CONFIG_LV_MAP 1 CONFIG_EOB_FIRST) change_config_and_warn(CONFIG_LV_MAP 1 CONFIG_EOB_FIRST)
......
...@@ -299,7 +299,6 @@ EXPERIMENT_LIST=" ...@@ -299,7 +299,6 @@ EXPERIMENT_LIST="
ref_adapt ref_adapt
lv_map lv_map
lv_map_multi lv_map_multi
ctx1d
txk_sel txk_sel
mv_compress mv_compress
segment_globalmv segment_globalmv
...@@ -538,7 +537,6 @@ post_process_cmdline() { ...@@ -538,7 +537,6 @@ post_process_cmdline() {
enabled lv_map_multi && soft_enable lv_map enabled lv_map_multi && soft_enable lv_map
enabled eob_first && enable_feature lv_map enabled eob_first && enable_feature lv_map
enabled txk_sel && soft_enable lv_map enabled txk_sel && soft_enable lv_map
enabled ctx1d && soft_enable lv_map
enabled compound_round && soft_enable convolve_round enabled compound_round && soft_enable convolve_round
enabled ext_intra_mod && enable_feature intra_edge enabled ext_intra_mod && enable_feature intra_edge
enabled intra_edge && enable_feature ext_intra enabled intra_edge && enable_feature ext_intra
......
...@@ -702,49 +702,6 @@ int main(int argc, const char **argv) { ...@@ -702,49 +702,6 @@ int main(int argc, const char **argv) {
"default_coeff_br_cdf[TX_SIZES][PLANE_TYPES][BASE_RANGE_" "default_coeff_br_cdf[TX_SIZES][PLANE_TYPES][BASE_RANGE_"
"SETS][LEVEL_CONTEXTS][CDF_SIZE(2)]"); "SETS][LEVEL_CONTEXTS][CDF_SIZE(2)]");
#if CONFIG_CTX1D
cts_each_dim[0] = TX_SIZES;
cts_each_dim[1] = PLANE_TYPES;
cts_each_dim[2] = TX_CLASSES;
cts_each_dim[3] = 2;
optimize_entropy_table(&fc.eob_mode[0][0][0][0], probsfile, 4, cts_each_dim,
NULL, 1,
"static const aom_prob "
"default_eob_mode[TX_SIZES][PLANE_TYPES][TX_CLASSES]");
optimize_cdf_table(&fc.eob_mode[0][0][0][0], probsfile, 4, cts_each_dim,
"static const aom_cdf_prob "
"default_eob_mode_cdf[TX_SIZES][PLANE_TYPES][TX_CLASSES]["
"CDF_SIZE(2)]");
cts_each_dim[0] = TX_SIZES;
cts_each_dim[1] = PLANE_TYPES;
cts_each_dim[2] = TX_CLASSES;
cts_each_dim[3] = EMPTY_LINE_CONTEXTS;
cts_each_dim[4] = 2;
optimize_entropy_table(&fc.empty_line[0][0][0][0][0], probsfile, 5,
cts_each_dim, NULL, 1,
"static const aom_prob "
"default_empty_line[TX_SIZES][PLANE_TYPES][TX_CLASSES]"
"[EMPTY_LINE_CONTEXTS]");
optimize_cdf_table(&fc.empty_line[0][0][0][0][0], probsfile, 5, cts_each_dim,
"static const aom_cdf_prob "
"default_empty_line_cdf[TX_SIZES][PLANE_TYPES][TX_CLASSES]"
"[EMPTY_LINE_CONTEXTS][CDF_SIZE(2)]");
cts_each_dim[0] = TX_SIZES;
cts_each_dim[1] = PLANE_TYPES;
cts_each_dim[2] = TX_CLASSES;
cts_each_dim[3] = HV_EOB_CONTEXTS;
cts_each_dim[4] = 2;
optimize_entropy_table(
&fc.hv_eob[0][0][0][0][0], probsfile, 5, cts_each_dim, NULL, 1,
"static const aom_prob "
"default_hv_eob[TX_SIZES][PLANE_TYPES][TX_CLASSES][HV_EOB_CONTEXTS]");
optimize_cdf_table(&fc.hv_eob[0][0][0][0][0], probsfile, 5, cts_each_dim,
"static const aom_cdf_prob "
"default_hv_eob_cdf[TX_SIZES][PLANE_TYPES][TX_CLASSES][HV_"
"EOB_CONTEXTS][CDF_SIZE(2)]");
#endif // CONFIG_CTX1D
#endif // CONFIG_LV_MAP #endif // CONFIG_LV_MAP
/* lgt_from_pred experiment */ /* lgt_from_pred experiment */
......
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