Skip to content

GitLab

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

Remove CTX1D experiment 

This experiment has been abandonned for AV1.

Change-Id: I83fb51a17d67df6713308665d2626c232376d25a
parent 9f001f35
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 322 deletions
av1/common/entropy.c
View file @ d0d6097d
......@@ -1632,11 +1632,6 @@ void av1_average_tile_coef_cdfs(FRAME_CONTEXT *fc, FRAME_CONTEXT *ec_ctxs[],
AVERAGE_TILE_CDFS(coeff_lps_cdf)
#endif
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
AVERAGE_TILE_CDFS(coef_head_cdfs)
AVERAGE_TILE_CDFS(coef_tail_cdfs)
......
av1/common/entropy.h
View file @ d0d6097d
......@@ -61,14 +61,7 @@ extern "C" {
#if CONFIG_LV_MAP
#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
#endif // CONFIG_CTX1D
#define USE_CAUSAL_BASE_CTX 1
......@@ -119,11 +112,6 @@ extern "C" {
#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 {
TX_CLASS_2D = 0,
TX_CLASS_HORIZ = 1,
......
av1/common/entropymode.c
View file @ d0d6097d
......@@ -345,78 +345,6 @@ static const aom_prob default_nz_map[TX_SIZES][PLANE_TYPES][SIG_COEF_CONTEXTS] =
#endif // USE_CAUSAL_BASE_CTX
#endif // CONFIG_LV_MAP_MULTI
#if CONFIG_CTX1D
const aom_prob default_eob_flag[TX_SIZES][PLANE_TYPES][EOB_COEF_CONTEXTS] = {
{ { 220, 225, 220, 216, 233, 225, 189, 178, 222, 199, 164, 112, 207,
171, 115, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
147, 125, 104, 36, 117, 107, 26, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
156, 124, 128, 128, 146, 68, 128, 128, 131, 17, 128, 128, 64,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 146, 150, 142, 144, 178, 167, 131, 116, 150, 123, 107, 63, 119,
89, 74, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
117, 127, 105, 69, 53, 56, 30, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
128, 86, 128, 128, 140, 72, 128, 128, 120, 44, 128, 128, 80,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 } },
{ { 237, 242, 242, 219, 192, 246, 246, 243, 233, 184, 155, 234, 217,
188, 152, 195, 167, 114, 89, 128, 128, 128, 128, 128, 128,
180, 173, 154, 133, 112, 147, 145, 142, 102, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
198, 173, 130, 200, 128, 208, 182, 160, 106, 171, 128, 144, 128,
128, 128, 124, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 140, 170, 162, 111, 94, 182, 195, 165, 153, 110, 81, 178, 169,
158, 83, 133, 85, 85, 38, 128, 128, 128, 128, 128, 128,
112, 127, 107, 87, 31, 57, 49, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
160, 143, 99, 126, 128, 164, 133, 126, 59, 71, 128, 138, 128,
128, 128, 99, 128, 128, 128, 128, 128, 128, 128, 128, 128 } },
{ { 229, 241, 243, 245, 247, 247, 251, 248, 235, 210, 247, 235, 208,
166, 245, 247, 244, 182, 236, 229, 180, 136, 128, 128, 128,
191, 197, 96, 70, 199, 128, 128, 191, 174, 117, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
211, 183, 215, 188, 138, 209, 136, 128, 170, 128, 191, 128, 161,
128, 182, 128, 128, 128, 164, 128, 128, 128, 128, 128, 128 },
{ 106, 153, 182, 191, 186, 202, 211, 203, 166, 147, 205, 205, 195,
128, 206, 212, 182, 109, 192, 154, 139, 79, 128, 128, 128,
112, 133, 128, 255, 128, 128, 128, 130, 154, 98, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
144, 185, 169, 199, 85, 183, 128, 128, 64, 128, 146, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 } },
{ { 169, 203, 224, 222, 220, 228, 229, 223, 234, 247, 242, 230, 222,
238, 246, 234, 196, 245, 249, 245, 192, 240, 235, 199, 161,
176, 148, 158, 77, 178, 128, 128, 158, 128, 128, 196, 208, 155,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
232, 187, 191, 221, 116, 217, 154, 128, 203, 128, 128, 192, 128,
201, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 133, 182, 215, 204, 176, 220, 182, 168, 187, 197, 181, 145, 75,
164, 136, 51, 57, 156, 128, 128, 128, 85, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 } },
};
#else // CONFIG_CTX1D
static const aom_prob
default_eob_flag[TX_SIZES][PLANE_TYPES][EOB_COEF_CONTEXTS] = {
{ { 225, 240, 225, 200, 128, 128, 128, 128, 128, 128, 128,
......@@ -472,7 +400,6 @@ static const aom_prob
145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145,
} }
};
#endif // CONFIG_CTX1D
const aom_prob default_coeff_lps[TX_SIZES][PLANE_TYPES][LEVEL_CONTEXTS] = {
{ { 96, 128, 86, 122, 128, 84, 125, 128, 88, 99, 126, 128,
......@@ -616,92 +543,6 @@ const aom_prob
125, 159, 128, 173, 212, 128, 85, 189, 128, 128, 255, 171 } } }
};
#endif
#if CONFIG_CTX1D
static const aom_prob default_eob_mode[TX_SIZES][PLANE_TYPES][TX_CLASSES] = {
{ { 128, 176, 157 }, { 128, 222, 198 } },
{ { 128, 35, 56 }, { 128, 203, 225 } },
{ { 128, 55, 136 }, { 128, 230, 253 } },
{ { 128, 101, 188 }, { 128, 128, 128 } }
};
static const aom_prob default_empty_line[TX_SIZES][PLANE_TYPES][TX_CLASSES]
[EMPTY_LINE_CONTEXTS] = {
{ { { 128, 128, 128, 128, 128 },
{ 142, 153, 211, 205, 128 },
{ 162, 142, 203, 197, 128 } },
{ { 128, 128, 128, 128, 128 },
{ 133, 116, 178, 123, 128 },
{ 139, 109, 159, 115, 128 } } },
{ { { 128, 128, 128, 128, 128 },
{ 185, 130, 183, 204, 227 },
{ 171, 81, 177, 200, 221 } },
{ { 128, 128, 128, 128, 128 },
{ 180, 127, 175, 189, 213 },
{ 120, 74, 129, 134, 156 } } },
{ { { 128, 128, 128, 128, 128 },
{ 202, 82, 183, 214, 248 },
{ 144, 41, 163, 185, 203 } },
{ { 128, 128, 128, 128, 128 },
{ 151, 93, 171, 224, 160 },
{ 128, 51, 171, 128, 1 } } },
{ { { 128, 128, 128, 128, 128 },
{ 154, 48, 174, 210, 233 },
{ 123, 16, 148, 189, 197 } },
{ { 128, 128, 128, 128, 128 },
{ 128, 128, 128, 128, 128 },
{ 128, 128, 128, 128, 128 } } }
};
static const aom_prob
default_hv_eob[TX_SIZES][PLANE_TYPES][TX_CLASSES][HV_EOB_CONTEXTS] = {
{ { { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 151, 173, 114, 128, 128, 128, 128, 128, 128, 162, 198, 128,
128, 128, 128, 128, 182, 198, 109, 128, 128, 128, 128, 128 },
{ 152, 173, 119, 128, 128, 128, 128, 128, 128, 164, 193, 128,
128, 128, 128, 128, 198, 209, 121, 128, 128, 128, 128, 128 } },
{ { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 123, 143, 70, 128, 128, 128, 128, 128, 128, 127, 154, 128,
128, 128, 128, 128, 176, 148, 36, 128, 128, 128, 128, 128 },
{ 132, 152, 73, 128, 128, 128, 128, 128, 128, 127, 159, 128,
128, 128, 128, 128, 186, 181, 48, 128, 128, 128, 128, 128 } } },
{ { { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 109, 105, 78, 44, 128, 128, 128, 128, 128, 146, 185, 221,
128, 128, 128, 128, 199, 188, 134, 69, 128, 128, 128, 128 },
{ 124, 127, 115, 82, 128, 128, 128, 128, 128, 162, 198, 224,
128, 128, 128, 128, 206, 214, 177, 135, 128, 128, 128, 128 } },
{ { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 95, 102, 65, 14, 128, 128, 128, 128, 128, 132, 164, 199,
128, 128, 128, 128, 162, 163, 66, 27, 128, 128, 128, 128 },
{ 83, 141, 97, 38, 128, 128, 128, 128, 128, 154, 132, 184,
128, 128, 128, 128, 194, 218, 112, 63, 128, 128, 128, 128 } } },
{ { { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 117, 107, 86, 61, 51, 104, 128, 128, 128, 160, 198, 238,
252, 251, 128, 128, 221, 223, 209, 186, 99, 81, 128, 128 },
{ 118, 122, 121, 100, 91, 97, 128, 128, 128, 168, 190, 214,
233, 235, 128, 128, 197, 216, 177, 165, 147, 126, 128, 128 } },
{ { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 109, 102, 63, 51, 255, 85, 128, 128, 128, 163, 131, 175,
128, 128, 128, 128, 183, 102, 40, 1, 128, 128, 128, 128 },
{ 255, 255, 1, 1, 128, 1, 128, 128, 128, 1, 128, 128,
128, 128, 128, 128, 255, 1, 128, 128, 128, 128, 128, 128 } } },
{ { { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 114, 108, 83, 61, 53, 28, 77, 177, 128, 161, 187, 218,
240, 237, 228, 234, 200, 207, 167, 136, 98, 78, 183, 128 },
{ 117, 138, 116, 77, 75, 85, 26, 1, 128, 197, 162, 200,
184, 212, 225, 236, 189, 225, 168, 124, 144, 171, 128, 128 } },
{ { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 } } }
};
#endif // CONFIG_CTX1D
#endif // CONFIG_LV_MAP
static const aom_cdf_prob default_newmv_cdf[NEWMV_MODE_CONTEXTS][CDF_SIZE(2)] =
......@@ -2751,20 +2592,13 @@ static void init_mode_probs(FRAME_CONTEXT *fc) {
av1_copy(fc->txb_skip, default_txb_skip);
av1_copy(fc->nz_map, default_nz_map);
av1_copy(fc->eob_flag, default_eob_flag);
#if !CONFIG_CTX1D
av1_copy(fc->eob_extra, default_eob_extra);
#endif
av1_copy(fc->dc_sign, default_dc_sign);
av1_copy(fc->coeff_base, default_coeff_base);
av1_copy(fc->coeff_lps, default_coeff_lps);
#if !CONFIG_LV_MAP_MULTI
av1_copy(fc->coeff_br, default_coeff_br);
#endif
#if CONFIG_CTX1D
av1_copy(fc->eob_mode, default_eob_mode);
av1_copy(fc->empty_line, default_empty_line);
av1_copy(fc->hv_eob, default_hv_eob);
#endif // CONFIG_CTX1D
av1_init_txb_probs(fc);
#endif
......
av1/common/entropymode.h
View file @ d0d6097d
......@@ -142,11 +142,6 @@ typedef struct frame_contexts {
#if !CONFIG_LV_MAP_MULTI
aom_prob coeff_br[TX_SIZES][PLANE_TYPES][BASE_RANGE_SETS][LEVEL_CONTEXTS];
#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)];
#if !CONFIG_LV_MAP_MULTI
......@@ -175,13 +170,6 @@ typedef struct frame_contexts {
aom_cdf_prob coeff_br_cdf[TX_SIZES][PLANE_TYPES][BASE_RANGE_SETS]
[LEVEL_CONTEXTS][CDF_SIZE(2)];
#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
aom_cdf_prob newmv_cdf[NEWMV_MODE_CONTEXTS][CDF_SIZE(2)];
......@@ -350,12 +338,6 @@ typedef struct FRAME_COUNTS {
unsigned int coeff_br[TX_SIZES][PLANE_TYPES][BASE_RANGE_SETS][LEVEL_CONTEXTS]
[2];
#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
#if CONFIG_SYMBOLRATE
......
av1/common/txb_common.c
View file @ d0d6097d
......@@ -228,44 +228,6 @@ void av1_init_txb_probs(FRAME_CONTEXT *fc) {
#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) {
......
av1/common/txb_common.h
View file @ d0d6097d
......@@ -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
const TX_SIZE txs_ctx, const TX_TYPE tx_type) {
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;
#endif
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];
......
av1/encoder/block.h
View file @ d0d6097d
......@@ -81,11 +81,6 @@ typedef struct {
#if !CONFIG_LV_MAP_MULTI
int br_cost[BASE_RANGE_SETS][LEVEL_CONTEXTS][2];
#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;
typedef struct {
......
av1/encoder/rd.c
View file @ d0d6097d
......@@ -545,24 +545,6 @@ void av1_fill_coeff_costs(MACROBLOCK *x, FRAME_CONTEXT *fc) {
}
#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
}
}
}
......
build/cmake/aom_config_defaults.cmake
View file @ d0d6097d
......@@ -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_COMPOUND_ROUND 0 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_TX16 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DAALA_TX32 0 CACHE NUMBER "AV1 experiment flag.")
......
build/cmake/aom_experiment_deps.cmake
View file @ d0d6097d
......@@ -32,12 +32,6 @@ macro (fix_experiment_configs)
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 (NOT CONFIG_LV_MAP)
change_config_and_warn(CONFIG_LV_MAP 1 CONFIG_EOB_FIRST)
......
configure
View file @ d0d6097d
......@@ -299,7 +299,6 @@ EXPERIMENT_LIST="
ref_adapt
lv_map
lv_map_multi
ctx1d
txk_sel
mv_compress
segment_globalmv
......@@ -538,7 +537,6 @@ post_process_cmdline() {
enabled lv_map_multi && soft_enable lv_map
enabled eob_first && enable_feature lv_map
enabled txk_sel && soft_enable lv_map
enabled ctx1d && soft_enable lv_map
enabled compound_round && soft_enable convolve_round
enabled ext_intra_mod && enable_feature intra_edge
enabled intra_edge && enable_feature ext_intra
......
tools/aom_entropy_optimizer.c
View file @ d0d6097d
......@@ -702,49 +702,6 @@ int main(int argc, const char **argv) {
"default_coeff_br_cdf[TX_SIZES][PLANE_TYPES][BASE_RANGE_"
"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
/* 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