Remove experimental flag of LV_MAP
This experiment has been adopted, we can simplify the code
by dropping the associated preprocessor conditionals.
Change-Id: Ic3438799335c6cd05f170302f49bd47e1f705c24
diff --git a/av1/av1.cmake b/av1/av1.cmake
index b3abdc7..70b703c 100644
--- a/av1/av1.cmake
+++ b/av1/av1.cmake
@@ -352,30 +352,28 @@
"${AOM_ROOT}/av1/encoder/blockiness.c")
endif ()
-if (CONFIG_LV_MAP)
- set(AOM_AV1_COMMON_SOURCES
- ${AOM_AV1_COMMON_SOURCES}
- "${AOM_ROOT}/av1/common/txb_common.c"
- "${AOM_ROOT}/av1/common/txb_common.h")
+set(AOM_AV1_COMMON_SOURCES
+ ${AOM_AV1_COMMON_SOURCES}
+ "${AOM_ROOT}/av1/common/txb_common.c"
+ "${AOM_ROOT}/av1/common/txb_common.h")
- set(AOM_AV1_COMMON_INTRIN_SSE2
- ${AOM_AV1_COMMON_INTRIN_SSE2}
- "${AOM_ROOT}/av1/common/x86/txb_sse2.c")
+set(AOM_AV1_COMMON_INTRIN_SSE2
+ ${AOM_AV1_COMMON_INTRIN_SSE2}
+ "${AOM_ROOT}/av1/common/x86/txb_sse2.c")
- set(AOM_AV1_DECODER_SOURCES
- ${AOM_AV1_DECODER_SOURCES}
- "${AOM_ROOT}/av1/decoder/decodetxb.c"
- "${AOM_ROOT}/av1/decoder/decodetxb.h")
+set(AOM_AV1_DECODER_SOURCES
+ ${AOM_AV1_DECODER_SOURCES}
+ "${AOM_ROOT}/av1/decoder/decodetxb.c"
+ "${AOM_ROOT}/av1/decoder/decodetxb.h")
- set(AOM_AV1_ENCODER_SOURCES
- ${AOM_AV1_ENCODER_SOURCES}
- "${AOM_ROOT}/av1/encoder/encodetxb.c"
- "${AOM_ROOT}/av1/encoder/encodetxb.h")
+set(AOM_AV1_ENCODER_SOURCES
+ ${AOM_AV1_ENCODER_SOURCES}
+ "${AOM_ROOT}/av1/encoder/encodetxb.c"
+ "${AOM_ROOT}/av1/encoder/encodetxb.h")
- set(AOM_AV1_ENCODER_INTRIN_SSE2
- ${AOM_AV1_ENCODER_INTRIN_SSE2}
- "${AOM_ROOT}/av1/encoder/x86/encodetxb_sse2.c")
-endif ()
+set(AOM_AV1_ENCODER_INTRIN_SSE2
+ ${AOM_AV1_ENCODER_INTRIN_SSE2}
+ "${AOM_ROOT}/av1/encoder/x86/encodetxb_sse2.c")
if (CONFIG_CFL)
set(AOM_AV1_COMMON_SOURCES
diff --git a/av1/common/av1_rtcd_defs.pl b/av1/common/av1_rtcd_defs.pl
index 86ca754..1fca124 100755
--- a/av1/common/av1_rtcd_defs.pl
+++ b/av1/common/av1_rtcd_defs.pl
@@ -81,7 +81,7 @@
#
# txb
#
-if (aom_config("CONFIG_LV_MAP") eq "yes") {
+{
add_proto qw/void av1_get_br_level_counts/, "const uint8_t *const levels, const int width, const int height, uint8_t *const level_counts";
specialize qw/av1_get_br_level_counts sse2/;
}
@@ -414,7 +414,7 @@
# End av1_high encoder functions
# txb
- if (aom_config("CONFIG_LV_MAP") eq "yes") {
+ {
add_proto qw/void av1_get_nz_map_contexts/, "const uint8_t *const levels, const int16_t *const scan, const uint16_t eob, const TX_SIZE tx_size, const TX_TYPE tx_type, int8_t *const coeff_contexts";
specialize qw/av1_get_nz_map_contexts sse2/;
}
diff --git a/av1/common/blockd.c b/av1/common/blockd.c
index d6cc975..5a8ed42 100644
--- a/av1/common/blockd.c
+++ b/av1/common/blockd.c
@@ -81,7 +81,6 @@
}
}
-#if CONFIG_LV_MAP
void av1_foreach_transformed_block(const MACROBLOCKD *const xd,
BLOCK_SIZE bsize, int mi_row, int mi_col,
foreach_transformed_block_visitor visit,
@@ -94,7 +93,6 @@
av1_foreach_transformed_block_in_plane(xd, bsize, plane, visit, arg);
}
}
-#endif
void av1_set_contexts(const MACROBLOCKD *xd, struct macroblockd_plane *pd,
int plane, TX_SIZE tx_size, int has_eob, int aoff,
diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 359c33a..30efed7 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -1025,12 +1025,10 @@
const MACROBLOCKD *const xd, BLOCK_SIZE bsize, int plane,
foreach_transformed_block_visitor visit, void *arg);
-#if CONFIG_LV_MAP
void av1_foreach_transformed_block(const MACROBLOCKD *const xd,
BLOCK_SIZE bsize, int mi_row, int mi_col,
foreach_transformed_block_visitor visit,
void *arg, const int num_planes);
-#endif
void av1_set_contexts(const MACROBLOCKD *xd, struct macroblockd_plane *pd,
int plane, TX_SIZE tx_size, int has_eob, int aoff,
diff --git a/av1/common/entropy.c b/av1/common/entropy.c
index b3fa2ff..4d257a4 100644
--- a/av1/common/entropy.c
+++ b/av1/common/entropy.c
@@ -18,9 +18,7 @@
#include "av1/common/onyxc_int.h"
#include "av1/common/scan.h"
#include "av1/common/token_cdfs.h"
-#if CONFIG_LV_MAP
#include "av1/common/txb_common.h"
-#endif
/* Extra bits coded from LSB to MSB */
const aom_cdf_prob av1_cat1_cdf0[CDF_SIZE(2)] = { AOM_CDF2(20352) };
@@ -563,7 +561,6 @@
#endif // CONFIG_Q_ADAPT_PROBS
void av1_default_coef_probs(AV1_COMMON *cm) {
-#if CONFIG_LV_MAP
#if CONFIG_Q_ADAPT_PROBS
const int index = get_q_ctx(cm->base_qindex);
av1_copy(cm->fc->txb_skip_cdf, av1_default_txb_skip_cdfs[index]);
@@ -595,20 +592,6 @@
av1_copy(cm->fc->eob_flag_cdf512, av1_default_eob_multi512);
av1_copy(cm->fc->eob_flag_cdf1024, av1_default_eob_multi1024);
#endif // CONFIG_Q_ADAPT_PROBS
-#else
- const int index = AOMMIN(TOKEN_CDF_Q_CTXS - 1, cm->base_qindex / 64);
- av1_copy(cm->fc->coef_head_cdfs[TX_4X4],
- (*av1_default_qctx_coef_cdfs[index])[TX_4X4]);
- av1_copy(cm->fc->coef_head_cdfs[TX_8X8],
- (*av1_default_qctx_coef_cdfs[index])[TX_8X8]);
- av1_copy(cm->fc->coef_head_cdfs[TX_16X16],
- (*av1_default_qctx_coef_cdfs[index])[TX_16X16]);
- av1_copy(cm->fc->coef_head_cdfs[TX_32X32],
- (*av1_default_qctx_coef_cdfs[index])[TX_32X32]);
- av1_copy(cm->fc->coef_head_cdfs[TX_64X64],
- (*av1_default_qctx_coef_cdfs[index])[TX_32X32]);
- av1_coef_pareto_cdfs(cm->fc);
-#endif // CONFIG_LV_MAP
}
static void av1_average_cdf(aom_cdf_prob *cdf_ptr[], aom_cdf_prob *fc_cdf_ptr,
@@ -646,7 +629,6 @@
aom_cdf_prob *fc_cdf_ptr;
assert(num_tiles == 1);
-#if CONFIG_LV_MAP
AVERAGE_TILE_CDFS(txb_skip_cdf)
AVERAGE_TILE_CDFS(eob_extra_cdf)
AVERAGE_TILE_CDFS(dc_sign_cdf)
@@ -660,10 +642,6 @@
AVERAGE_TILE_CDFS(eob_flag_cdf1024)
AVERAGE_TILE_CDFS(coeff_base_eob_cdf)
AVERAGE_TILE_CDFS(coeff_br_cdf)
-#else // CONFI_LV_MAP
- AVERAGE_TILE_CDFS(coef_head_cdfs)
- AVERAGE_TILE_CDFS(coef_tail_cdfs)
-#endif
}
void av1_average_tile_mv_cdfs(FRAME_CONTEXT *fc, FRAME_CONTEXT *ec_ctxs[],
diff --git a/av1/common/entropy.h b/av1/common/entropy.h
index 1a75957..320eb33 100644
--- a/av1/common/entropy.h
+++ b/av1/common/entropy.h
@@ -56,7 +56,6 @@
#define ENTROPY_NODES 11
-#if CONFIG_LV_MAP
#define TXB_SKIP_CONTEXTS 13
#define EOB_COEF_CONTEXTS 22
@@ -90,8 +89,6 @@
TX_CLASSES = 3,
} TX_CLASS;
-#endif
-
DECLARE_ALIGNED(16, extern const uint8_t, av1_pt_energy_class[ENTROPY_TOKENS]);
#define CAT1_MIN_VAL 5
@@ -171,9 +168,7 @@
struct AV1Common;
struct frame_contexts;
void av1_default_coef_probs(struct AV1Common *cm);
-#if CONFIG_LV_MAP
void av1_adapt_coef_probs(struct AV1Common *cm);
-#endif // CONFIG_LV_MAP
// This is the index in the scan order beyond which all coefficients for
// 8x8 transform and above are in the top band.
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index d7c547f..478d5f7 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -15,9 +15,7 @@
#include "av1/common/scan.h"
#include "av1/common/onyxc_int.h"
#include "av1/common/seg_common.h"
-#if CONFIG_LV_MAP
#include "av1/common/txb_common.h"
-#endif
static const aom_cdf_prob default_newmv_cdf[NEWMV_MODE_CONTEXTS][CDF_SIZE(2)] =
{ { AOM_CDF2(128 * 155) }, { AOM_CDF2(128 * 116) }, { AOM_CDF2(128 * 94) },
@@ -1380,9 +1378,7 @@
av1_default_coef_probs(cm);
init_mode_probs(cm->fc);
av1_init_mv_probs(cm);
-#if CONFIG_LV_MAP
av1_init_lv_map(cm);
-#endif
cm->fc->initialized = 1;
av1_setup_frame_contexts(cm);
diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h
index f28596d..2921dc2 100644
--- a/av1/common/entropymode.h
+++ b/av1/common/entropymode.h
@@ -76,7 +76,6 @@
coeff_cdf_model coef_tail_cdfs[TX_SIZES][PLANE_TYPES];
coeff_cdf_model coef_head_cdfs[TX_SIZES][PLANE_TYPES];
-#if CONFIG_LV_MAP
aom_cdf_prob txb_skip_cdf[TX_SIZES][TXB_SKIP_CONTEXTS][CDF_SIZE(2)];
aom_cdf_prob eob_extra_cdf[TX_SIZES][PLANE_TYPES][EOB_COEF_CONTEXTS]
[CDF_SIZE(2)];
@@ -94,7 +93,6 @@
[CDF_SIZE(4)];
aom_cdf_prob coeff_br_cdf[TX_SIZES][PLANE_TYPES][LEVEL_CONTEXTS]
[CDF_SIZE(BR_CDF_SIZE)];
-#endif
aom_cdf_prob newmv_cdf[NEWMV_MODE_CONTEXTS][CDF_SIZE(2)];
aom_cdf_prob zeromv_cdf[GLOBALMV_MODE_CONTEXTS][CDF_SIZE(2)];
@@ -226,7 +224,6 @@
unsigned int switchable_interp[SWITCHABLE_FILTER_CONTEXTS]
[SWITCHABLE_FILTERS];
-#if CONFIG_LV_MAP
#if CONFIG_ENTROPY_STATS
unsigned int txb_skip[TX_SIZES][TXB_SKIP_CONTEXTS][2];
unsigned int eob_extra[TX_SIZES][PLANE_TYPES][EOB_COEF_CONTEXTS][2];
@@ -248,7 +245,6 @@
[NUM_BASE_LEVELS + 2];
unsigned int coeff_base_eob_multi[TX_SIZES][PLANE_TYPES]
[SIG_COEF_CONTEXTS_EOB][NUM_BASE_LEVELS + 1];
-#endif // CONFIG_LV_MAP
unsigned int newmv_mode[NEWMV_MODE_CONTEXTS][2];
unsigned int zeromv_mode[GLOBALMV_MODE_CONTEXTS][2];
diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index ecbebcb..ace07dd 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -199,14 +199,12 @@
InternalFrameBufferList int_frame_buffers;
} BufferPool;
-#if CONFIG_LV_MAP
typedef struct {
int base_ctx_table[2 /*row*/][2 /*col*/][3 /*sig_map*/]
[BASE_CONTEXT_POSITION_NUM + 1];
} LV_MAP_CTX_TABLE;
typedef int BASE_CTX_TABLE[2 /*col*/][3 /*sig_map*/]
[BASE_CONTEXT_POSITION_NUM + 1];
-#endif
#if CONFIG_REFERENCE_BUFFER
/* Initial version of sequence header structure */
@@ -600,9 +598,7 @@
int refresh_mask;
int invalid_delta_frame_id_minus1;
#endif // CONFIG_REFERENCE_BUFFER
-#if CONFIG_LV_MAP
LV_MAP_CTX_TABLE coeff_ctx_table;
-#endif
#if CONFIG_MFMV
TPL_MV_REF *tpl_mvs;
int tpl_mvs_mem_size;
diff --git a/av1/common/scan.c b/av1/common/scan.c
index 927babe..5474fb2 100644
--- a/av1/common/scan.c
+++ b/av1/common/scan.c
@@ -14,15 +14,9 @@
#include "av1/common/common_data.h"
#include "av1/common/scan.h"
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, default_scan_4x4[16]) = {
0, 1, 4, 8, 5, 2, 3, 6, 9, 12, 13, 10, 7, 11, 14, 15
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, default_scan_4x4[16]) = {
- 0, 4, 1, 5, 8, 2, 12, 9, 3, 6, 13, 10, 7, 14, 11, 15,
-};
-#endif
DECLARE_ALIGNED(16, static const int16_t, mcol_scan_4x4[16]) = {
0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15,
@@ -40,17 +34,10 @@
0, 1, 4, 2, 5, 3, 6, 8, 9, 7, 12, 10, 13, 11, 14, 15,
};
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, default_scan_4x8[32]) = {
0, 1, 4, 2, 5, 8, 3, 6, 9, 12, 7, 10, 13, 16, 11, 14,
17, 20, 15, 18, 21, 24, 19, 22, 25, 28, 23, 26, 29, 27, 30, 31,
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, default_scan_4x8[32]) = {
- 0, 1, 4, 5, 2, 8, 6, 9, 10, 3, 12, 7, 13, 11, 14, 16,
- 17, 15, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-};
-#endif
DECLARE_ALIGNED(16, static const int16_t, mcol_scan_4x8[32]) = {
0, 4, 8, 12, 16, 20, 24, 28, 1, 5, 9, 13, 17, 21, 25, 29,
@@ -62,17 +49,10 @@
16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
};
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, default_scan_8x4[32]) = {
0, 8, 1, 16, 9, 2, 24, 17, 10, 3, 25, 18, 11, 4, 26, 19,
12, 5, 27, 20, 13, 6, 28, 21, 14, 7, 29, 22, 15, 30, 23, 31,
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, default_scan_8x4[32]) = {
- 0, 1, 8, 9, 2, 16, 10, 17, 18, 3, 24, 11, 25, 19, 26, 4,
- 12, 27, 20, 5, 28, 13, 21, 29, 6, 14, 22, 30, 7, 15, 23, 31,
-};
-#endif
DECLARE_ALIGNED(16, static const int16_t, mcol_scan_8x4[32]) = {
0, 8, 16, 24, 1, 9, 17, 25, 2, 10, 18, 26, 3, 11, 19, 27,
@@ -84,37 +64,19 @@
16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
};
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, default_scan_4x16[64]) = {
0, 1, 4, 2, 5, 8, 3, 6, 9, 12, 7, 10, 13, 16, 11, 14,
17, 20, 15, 18, 21, 24, 19, 22, 25, 28, 23, 26, 29, 32, 27, 30,
33, 36, 31, 34, 37, 40, 35, 38, 41, 44, 39, 42, 45, 48, 43, 46,
49, 52, 47, 50, 53, 56, 51, 54, 57, 60, 55, 58, 61, 59, 62, 63,
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, default_scan_4x16[64]) = {
- 0, 1, 4, 5, 2, 8, 6, 9, 10, 3, 12, 7, 13, 11, 14, 16,
- 17, 15, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-};
-#endif
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, default_scan_16x4[64]) = {
0, 16, 1, 32, 17, 2, 48, 33, 18, 3, 49, 34, 19, 4, 50, 35,
20, 5, 51, 36, 21, 6, 52, 37, 22, 7, 53, 38, 23, 8, 54, 39,
24, 9, 55, 40, 25, 10, 56, 41, 26, 11, 57, 42, 27, 12, 58, 43,
28, 13, 59, 44, 29, 14, 60, 45, 30, 15, 61, 46, 31, 62, 47, 63,
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, default_scan_16x4[64]) = {
- 0, 1, 16, 17, 2, 32, 18, 33, 34, 3, 48, 19, 49, 35, 50, 4,
- 20, 51, 36, 5, 52, 21, 37, 53, 6, 22, 38, 54, 7, 23, 39, 55,
- 8, 24, 40, 56, 9, 25, 41, 57, 10, 26, 42, 58, 11, 27, 43, 59,
- 12, 28, 44, 60, 13, 29, 45, 61, 14, 30, 46, 62, 15, 31, 47, 63,
-};
-#endif
DECLARE_ALIGNED(16, static const int16_t, mrow_scan_4x16[64]) = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
@@ -165,7 +127,6 @@
255,
};
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, default_scan_32x8[256]) = {
0, 32, 1, 64, 33, 2, 96, 65, 34, 3, 128, 97, 66, 35, 4,
160, 129, 98, 67, 36, 5, 192, 161, 130, 99, 68, 37, 6, 224, 193,
@@ -186,28 +147,6 @@
95, 251, 220, 189, 158, 127, 252, 221, 190, 159, 253, 222, 191, 254, 223,
255,
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, default_scan_32x8[256]) = {
- 0, 1, 32, 2, 33, 64, 3, 34, 65, 96, 4, 35, 66, 97, 128,
- 5, 36, 67, 98, 129, 160, 6, 37, 68, 99, 130, 161, 192, 7, 38,
- 69, 100, 131, 162, 193, 224, 8, 39, 70, 101, 132, 163, 194, 225, 9,
- 40, 71, 102, 133, 164, 195, 226, 10, 41, 72, 103, 134, 165, 196, 227,
- 11, 42, 73, 104, 135, 166, 197, 228, 12, 43, 74, 105, 136, 167, 198,
- 229, 13, 44, 75, 106, 137, 168, 199, 230, 14, 45, 76, 107, 138, 169,
- 200, 231, 15, 46, 77, 108, 139, 170, 201, 232, 16, 47, 78, 109, 140,
- 171, 202, 233, 17, 48, 79, 110, 141, 172, 203, 234, 18, 49, 80, 111,
- 142, 173, 204, 235, 19, 50, 81, 112, 143, 174, 205, 236, 20, 51, 82,
- 113, 144, 175, 206, 237, 21, 52, 83, 114, 145, 176, 207, 238, 22, 53,
- 84, 115, 146, 177, 208, 239, 23, 54, 85, 116, 147, 178, 209, 240, 24,
- 55, 86, 117, 148, 179, 210, 241, 25, 56, 87, 118, 149, 180, 211, 242,
- 26, 57, 88, 119, 150, 181, 212, 243, 27, 58, 89, 120, 151, 182, 213,
- 244, 28, 59, 90, 121, 152, 183, 214, 245, 29, 60, 91, 122, 153, 184,
- 215, 246, 30, 61, 92, 123, 154, 185, 216, 247, 31, 62, 93, 124, 155,
- 186, 217, 248, 63, 94, 125, 156, 187, 218, 249, 95, 126, 157, 188, 219,
- 250, 127, 158, 189, 220, 251, 159, 190, 221, 252, 191, 222, 253, 223, 254,
- 255,
-};
-#endif
DECLARE_ALIGNED(16, static const int16_t, mrow_scan_8x32[256]) = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
@@ -291,21 +230,12 @@
30, 62, 94, 126, 158, 190, 222, 254, 31, 63, 95, 127, 159, 191, 223, 255,
};
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, default_scan_8x8[64]) = {
0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5,
12, 19, 26, 33, 40, 48, 41, 34, 27, 20, 13, 6, 7, 14, 21, 28,
35, 42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51,
58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, default_scan_8x8[64]) = {
- 0, 8, 1, 16, 9, 2, 17, 24, 10, 3, 18, 25, 32, 11, 4, 26,
- 33, 19, 40, 12, 34, 27, 5, 41, 20, 48, 13, 35, 42, 28, 21, 6,
- 49, 56, 36, 43, 29, 7, 14, 50, 57, 44, 22, 37, 15, 51, 58, 30,
- 45, 23, 52, 59, 38, 31, 60, 53, 46, 39, 61, 54, 47, 62, 55, 63,
-};
-#endif
DECLARE_ALIGNED(16, static const int16_t, mcol_scan_8x8[64]) = {
0, 8, 16, 24, 32, 40, 48, 56, 1, 9, 17, 25, 33, 41, 49, 57,
@@ -347,7 +277,6 @@
117, 124, 111, 118, 125, 119, 126, 127,
};
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, default_scan_16x8[128]) = {
0, 16, 1, 32, 17, 2, 48, 33, 18, 3, 64, 49, 34, 19, 4, 80,
65, 50, 35, 20, 5, 96, 81, 66, 51, 36, 21, 6, 112, 97, 82, 67,
@@ -358,18 +287,6 @@
60, 45, 30, 15, 121, 106, 91, 76, 61, 46, 31, 122, 107, 92, 77, 62,
47, 123, 108, 93, 78, 63, 124, 109, 94, 79, 125, 110, 95, 126, 111, 127,
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, default_scan_16x8[128]) = {
- 0, 1, 16, 2, 17, 32, 3, 18, 33, 48, 4, 19, 34, 49, 64, 5,
- 20, 35, 50, 65, 80, 6, 21, 36, 51, 66, 81, 96, 7, 22, 37, 52,
- 67, 82, 97, 112, 8, 23, 38, 53, 68, 83, 98, 113, 9, 24, 39, 54,
- 69, 84, 99, 114, 10, 25, 40, 55, 70, 85, 100, 115, 11, 26, 41, 56,
- 71, 86, 101, 116, 12, 27, 42, 57, 72, 87, 102, 117, 13, 28, 43, 58,
- 73, 88, 103, 118, 14, 29, 44, 59, 74, 89, 104, 119, 15, 30, 45, 60,
- 75, 90, 105, 120, 31, 46, 61, 76, 91, 106, 121, 47, 62, 77, 92, 107,
- 122, 63, 78, 93, 108, 123, 79, 94, 109, 124, 95, 110, 125, 111, 126, 127,
-};
-#endif
DECLARE_ALIGNED(16, static const int16_t, mcol_scan_8x16[128]) = {
0, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 88, 96, 104, 112, 120,
@@ -455,7 +372,6 @@
510, 511,
};
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, default_scan_32x16[512]) = {
0, 32, 1, 64, 33, 2, 96, 65, 34, 3, 128, 97, 66, 35, 4,
160, 129, 98, 67, 36, 5, 192, 161, 130, 99, 68, 37, 6, 224, 193,
@@ -493,45 +409,6 @@
382, 351, 507, 476, 445, 414, 383, 508, 477, 446, 415, 509, 478, 447, 510,
479, 511,
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, default_scan_32x16[512]) = {
- 0, 1, 32, 2, 33, 64, 3, 34, 65, 96, 4, 35, 66, 97, 128,
- 5, 36, 67, 98, 129, 160, 6, 37, 68, 99, 130, 161, 192, 7, 38,
- 69, 100, 131, 162, 193, 224, 8, 39, 70, 101, 132, 163, 194, 225, 256,
- 9, 40, 71, 102, 133, 164, 195, 226, 257, 288, 10, 41, 72, 103, 134,
- 165, 196, 227, 258, 289, 320, 11, 42, 73, 104, 135, 166, 197, 228, 259,
- 290, 321, 352, 12, 43, 74, 105, 136, 167, 198, 229, 260, 291, 322, 353,
- 384, 13, 44, 75, 106, 137, 168, 199, 230, 261, 292, 323, 354, 385, 416,
- 14, 45, 76, 107, 138, 169, 200, 231, 262, 293, 324, 355, 386, 417, 448,
- 15, 46, 77, 108, 139, 170, 201, 232, 263, 294, 325, 356, 387, 418, 449,
- 480, 16, 47, 78, 109, 140, 171, 202, 233, 264, 295, 326, 357, 388, 419,
- 450, 481, 17, 48, 79, 110, 141, 172, 203, 234, 265, 296, 327, 358, 389,
- 420, 451, 482, 18, 49, 80, 111, 142, 173, 204, 235, 266, 297, 328, 359,
- 390, 421, 452, 483, 19, 50, 81, 112, 143, 174, 205, 236, 267, 298, 329,
- 360, 391, 422, 453, 484, 20, 51, 82, 113, 144, 175, 206, 237, 268, 299,
- 330, 361, 392, 423, 454, 485, 21, 52, 83, 114, 145, 176, 207, 238, 269,
- 300, 331, 362, 393, 424, 455, 486, 22, 53, 84, 115, 146, 177, 208, 239,
- 270, 301, 332, 363, 394, 425, 456, 487, 23, 54, 85, 116, 147, 178, 209,
- 240, 271, 302, 333, 364, 395, 426, 457, 488, 24, 55, 86, 117, 148, 179,
- 210, 241, 272, 303, 334, 365, 396, 427, 458, 489, 25, 56, 87, 118, 149,
- 180, 211, 242, 273, 304, 335, 366, 397, 428, 459, 490, 26, 57, 88, 119,
- 150, 181, 212, 243, 274, 305, 336, 367, 398, 429, 460, 491, 27, 58, 89,
- 120, 151, 182, 213, 244, 275, 306, 337, 368, 399, 430, 461, 492, 28, 59,
- 90, 121, 152, 183, 214, 245, 276, 307, 338, 369, 400, 431, 462, 493, 29,
- 60, 91, 122, 153, 184, 215, 246, 277, 308, 339, 370, 401, 432, 463, 494,
- 30, 61, 92, 123, 154, 185, 216, 247, 278, 309, 340, 371, 402, 433, 464,
- 495, 31, 62, 93, 124, 155, 186, 217, 248, 279, 310, 341, 372, 403, 434,
- 465, 496, 63, 94, 125, 156, 187, 218, 249, 280, 311, 342, 373, 404, 435,
- 466, 497, 95, 126, 157, 188, 219, 250, 281, 312, 343, 374, 405, 436, 467,
- 498, 127, 158, 189, 220, 251, 282, 313, 344, 375, 406, 437, 468, 499, 159,
- 190, 221, 252, 283, 314, 345, 376, 407, 438, 469, 500, 191, 222, 253, 284,
- 315, 346, 377, 408, 439, 470, 501, 223, 254, 285, 316, 347, 378, 409, 440,
- 471, 502, 255, 286, 317, 348, 379, 410, 441, 472, 503, 287, 318, 349, 380,
- 411, 442, 473, 504, 319, 350, 381, 412, 443, 474, 505, 351, 382, 413, 444,
- 475, 506, 383, 414, 445, 476, 507, 415, 446, 477, 508, 447, 478, 509, 479,
- 510, 511,
-};
-#endif
DECLARE_ALIGNED(16, static const int16_t, mcol_scan_16x32[512]) = {
0, 16, 32, 48, 64, 80, 96, 112, 128, 144, 160, 176, 192, 208, 224,
@@ -682,7 +559,6 @@
510, 511,
};
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, default_scan_16x16[256]) = {
0, 1, 16, 32, 17, 2, 3, 18, 33, 48, 64, 49, 34, 19, 4,
5, 20, 35, 50, 65, 80, 96, 81, 66, 51, 36, 21, 6, 7, 22,
@@ -703,28 +579,6 @@
250, 251, 236, 221, 206, 191, 207, 222, 237, 252, 253, 238, 223, 239, 254,
255
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, default_scan_16x16[256]) = {
- 0, 16, 1, 32, 17, 2, 48, 33, 18, 3, 64, 34, 49, 19, 65,
- 80, 50, 4, 35, 66, 20, 81, 96, 51, 5, 36, 82, 97, 67, 112,
- 21, 52, 98, 37, 83, 113, 6, 68, 128, 53, 22, 99, 114, 84, 7,
- 129, 38, 69, 100, 115, 144, 130, 85, 54, 23, 8, 145, 39, 70, 116,
- 101, 131, 160, 146, 55, 86, 24, 71, 132, 117, 161, 40, 9, 102, 147,
- 176, 162, 87, 56, 25, 133, 118, 177, 148, 72, 103, 41, 163, 10, 192,
- 178, 88, 57, 134, 149, 119, 26, 164, 73, 104, 193, 42, 179, 208, 11,
- 135, 89, 165, 120, 150, 58, 194, 180, 27, 74, 209, 105, 151, 136, 43,
- 90, 224, 166, 195, 181, 121, 210, 59, 12, 152, 106, 167, 196, 75, 137,
- 225, 211, 240, 182, 122, 91, 28, 197, 13, 226, 168, 183, 153, 44, 212,
- 138, 107, 241, 60, 29, 123, 198, 184, 227, 169, 242, 76, 213, 154, 45,
- 92, 14, 199, 139, 61, 228, 214, 170, 185, 243, 108, 77, 155, 30, 15,
- 200, 229, 124, 215, 244, 93, 46, 186, 171, 201, 109, 140, 230, 62, 216,
- 245, 31, 125, 78, 156, 231, 47, 187, 202, 217, 94, 246, 141, 63, 232,
- 172, 110, 247, 157, 79, 218, 203, 126, 233, 188, 248, 95, 173, 142, 219,
- 111, 249, 234, 158, 127, 189, 204, 250, 235, 143, 174, 220, 205, 159, 251,
- 190, 221, 175, 236, 237, 191, 206, 252, 222, 253, 207, 238, 223, 254, 239,
- 255,
-};
-#endif
DECLARE_ALIGNED(16, static const int16_t, mcol_scan_16x16[256]) = {
0, 16, 32, 48, 64, 80, 96, 112, 128, 144, 160, 176, 192, 208, 224, 240,
@@ -967,7 +821,6 @@
1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023,
};
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, default_scan_32x32[1024]) = {
0, 1, 32, 64, 33, 2, 3, 34, 65, 96, 128, 97, 66,
35, 4, 5, 36, 67, 98, 129, 160, 192, 161, 130, 99, 68,
@@ -1049,89 +902,6 @@
862, 831, 863, 894, 925, 956, 987, 1018, 1019, 988, 957, 926, 895,
927, 958, 989, 1020, 1021, 990, 959, 991, 1022, 1023
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, default_scan_32x32[1024]) = {
- 0, 32, 1, 64, 33, 2, 96, 65, 34, 128, 3, 97, 66,
- 160, 129, 35, 98, 4, 67, 130, 161, 192, 36, 99, 224, 5,
- 162, 193, 68, 131, 37, 100, 225, 194, 256, 163, 69, 132, 6,
- 226, 257, 288, 195, 101, 164, 38, 258, 7, 227, 289, 133, 320,
- 70, 196, 165, 290, 259, 228, 39, 321, 102, 352, 8, 197, 71,
- 134, 322, 291, 260, 353, 384, 229, 166, 103, 40, 354, 323, 292,
- 135, 385, 198, 261, 72, 9, 416, 167, 386, 355, 230, 324, 104,
- 293, 41, 417, 199, 136, 262, 387, 448, 325, 356, 10, 73, 418,
- 231, 168, 449, 294, 388, 105, 419, 263, 42, 200, 357, 450, 137,
- 480, 74, 326, 232, 11, 389, 169, 295, 420, 106, 451, 481, 358,
- 264, 327, 201, 43, 138, 512, 482, 390, 296, 233, 170, 421, 75,
- 452, 359, 12, 513, 265, 483, 328, 107, 202, 514, 544, 422, 391,
- 453, 139, 44, 234, 484, 297, 360, 171, 76, 515, 545, 266, 329,
- 454, 13, 423, 203, 108, 546, 485, 576, 298, 235, 140, 361, 330,
- 172, 547, 45, 455, 267, 577, 486, 77, 204, 362, 608, 14, 299,
- 578, 109, 236, 487, 609, 331, 141, 579, 46, 15, 173, 610, 363,
- 78, 205, 16, 110, 237, 611, 142, 47, 174, 79, 206, 17, 111,
- 238, 48, 143, 80, 175, 112, 207, 49, 18, 239, 81, 113, 19,
- 50, 82, 114, 51, 83, 115, 640, 516, 392, 268, 144, 20, 672,
- 641, 548, 517, 424, 393, 300, 269, 176, 145, 52, 21, 704, 673,
- 642, 580, 549, 518, 456, 425, 394, 332, 301, 270, 208, 177, 146,
- 84, 53, 22, 736, 705, 674, 643, 612, 581, 550, 519, 488, 457,
- 426, 395, 364, 333, 302, 271, 240, 209, 178, 147, 116, 85, 54,
- 23, 737, 706, 675, 613, 582, 551, 489, 458, 427, 365, 334, 303,
- 241, 210, 179, 117, 86, 55, 738, 707, 614, 583, 490, 459, 366,
- 335, 242, 211, 118, 87, 739, 615, 491, 367, 243, 119, 768, 644,
- 520, 396, 272, 148, 24, 800, 769, 676, 645, 552, 521, 428, 397,
- 304, 273, 180, 149, 56, 25, 832, 801, 770, 708, 677, 646, 584,
- 553, 522, 460, 429, 398, 336, 305, 274, 212, 181, 150, 88, 57,
- 26, 864, 833, 802, 771, 740, 709, 678, 647, 616, 585, 554, 523,
- 492, 461, 430, 399, 368, 337, 306, 275, 244, 213, 182, 151, 120,
- 89, 58, 27, 865, 834, 803, 741, 710, 679, 617, 586, 555, 493,
- 462, 431, 369, 338, 307, 245, 214, 183, 121, 90, 59, 866, 835,
- 742, 711, 618, 587, 494, 463, 370, 339, 246, 215, 122, 91, 867,
- 743, 619, 495, 371, 247, 123, 896, 772, 648, 524, 400, 276, 152,
- 28, 928, 897, 804, 773, 680, 649, 556, 525, 432, 401, 308, 277,
- 184, 153, 60, 29, 960, 929, 898, 836, 805, 774, 712, 681, 650,
- 588, 557, 526, 464, 433, 402, 340, 309, 278, 216, 185, 154, 92,
- 61, 30, 992, 961, 930, 899, 868, 837, 806, 775, 744, 713, 682,
- 651, 620, 589, 558, 527, 496, 465, 434, 403, 372, 341, 310, 279,
- 248, 217, 186, 155, 124, 93, 62, 31, 993, 962, 931, 869, 838,
- 807, 745, 714, 683, 621, 590, 559, 497, 466, 435, 373, 342, 311,
- 249, 218, 187, 125, 94, 63, 994, 963, 870, 839, 746, 715, 622,
- 591, 498, 467, 374, 343, 250, 219, 126, 95, 995, 871, 747, 623,
- 499, 375, 251, 127, 900, 776, 652, 528, 404, 280, 156, 932, 901,
- 808, 777, 684, 653, 560, 529, 436, 405, 312, 281, 188, 157, 964,
- 933, 902, 840, 809, 778, 716, 685, 654, 592, 561, 530, 468, 437,
- 406, 344, 313, 282, 220, 189, 158, 996, 965, 934, 903, 872, 841,
- 810, 779, 748, 717, 686, 655, 624, 593, 562, 531, 500, 469, 438,
- 407, 376, 345, 314, 283, 252, 221, 190, 159, 997, 966, 935, 873,
- 842, 811, 749, 718, 687, 625, 594, 563, 501, 470, 439, 377, 346,
- 315, 253, 222, 191, 998, 967, 874, 843, 750, 719, 626, 595, 502,
- 471, 378, 347, 254, 223, 999, 875, 751, 627, 503, 379, 255, 904,
- 780, 656, 532, 408, 284, 936, 905, 812, 781, 688, 657, 564, 533,
- 440, 409, 316, 285, 968, 937, 906, 844, 813, 782, 720, 689, 658,
- 596, 565, 534, 472, 441, 410, 348, 317, 286, 1000, 969, 938, 907,
- 876, 845, 814, 783, 752, 721, 690, 659, 628, 597, 566, 535, 504,
- 473, 442, 411, 380, 349, 318, 287, 1001, 970, 939, 877, 846, 815,
- 753, 722, 691, 629, 598, 567, 505, 474, 443, 381, 350, 319, 1002,
- 971, 878, 847, 754, 723, 630, 599, 506, 475, 382, 351, 1003, 879,
- 755, 631, 507, 383, 908, 784, 660, 536, 412, 940, 909, 816, 785,
- 692, 661, 568, 537, 444, 413, 972, 941, 910, 848, 817, 786, 724,
- 693, 662, 600, 569, 538, 476, 445, 414, 1004, 973, 942, 911, 880,
- 849, 818, 787, 756, 725, 694, 663, 632, 601, 570, 539, 508, 477,
- 446, 415, 1005, 974, 943, 881, 850, 819, 757, 726, 695, 633, 602,
- 571, 509, 478, 447, 1006, 975, 882, 851, 758, 727, 634, 603, 510,
- 479, 1007, 883, 759, 635, 511, 912, 788, 664, 540, 944, 913, 820,
- 789, 696, 665, 572, 541, 976, 945, 914, 852, 821, 790, 728, 697,
- 666, 604, 573, 542, 1008, 977, 946, 915, 884, 853, 822, 791, 760,
- 729, 698, 667, 636, 605, 574, 543, 1009, 978, 947, 885, 854, 823,
- 761, 730, 699, 637, 606, 575, 1010, 979, 886, 855, 762, 731, 638,
- 607, 1011, 887, 763, 639, 916, 792, 668, 948, 917, 824, 793, 700,
- 669, 980, 949, 918, 856, 825, 794, 732, 701, 670, 1012, 981, 950,
- 919, 888, 857, 826, 795, 764, 733, 702, 671, 1013, 982, 951, 889,
- 858, 827, 765, 734, 703, 1014, 983, 890, 859, 766, 735, 1015, 891,
- 767, 920, 796, 952, 921, 828, 797, 984, 953, 922, 860, 829, 798,
- 1016, 985, 954, 923, 892, 861, 830, 799, 1017, 986, 955, 893, 862,
- 831, 1018, 987, 894, 863, 1019, 895, 924, 956, 925, 988, 957, 926,
- 1020, 989, 958, 927, 1021, 990, 959, 1022, 991, 1023,
-};
-#endif
// Approximate versions, which reuse the 32x32 scan and assume rest of the
// coeffs to be zero.
@@ -1143,19 +913,11 @@
// Neighborhood 2-tuples for various scans and blocksizes,
// in {top, left} order for each position in corresponding scan order.
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t,
default_scan_4x4_neighbors[17 * MAX_NEIGHBORS]) = {
0, 0, 0, 0, 0, 0, 4, 4, 1, 4, 1, 1, 2, 2, 2, 5, 5,
8, 8, 8, 9, 12, 6, 9, 3, 6, 7, 10, 10, 13, 11, 14, 0, 0
};
-#else
-DECLARE_ALIGNED(16, static const int16_t,
- default_scan_4x4_neighbors[17 * MAX_NEIGHBORS]) = {
- 0, 0, 0, 0, 4, 0, 1, 4, 4, 5, 5, 1, 8, 8, 5, 8, 2,
- 2, 2, 5, 9, 12, 6, 9, 3, 6, 10, 13, 7, 10, 11, 14, 0, 0,
-};
-#endif
DECLARE_ALIGNED(16, static const int16_t,
mcol_scan_4x4_neighbors[17 * MAX_NEIGHBORS]) = {
@@ -1571,7 +1333,6 @@
31, 38, 53, 60, 39, 46, 46, 53, 47, 54, 54, 61, 55, 62, 0, 0,
};
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t,
default_scan_8x8_neighbors[65 * MAX_NEIGHBORS]) = {
0, 0, 0, 0, 0, 0, 8, 8, 1, 8, 1, 1, 2, 2, 2, 9, 9, 16, 16,
@@ -1582,18 +1343,6 @@
50, 50, 57, 51, 58, 44, 51, 37, 44, 30, 37, 23, 30, 31, 38, 38, 45, 45, 52,
52, 59, 53, 60, 46, 53, 39, 46, 47, 54, 54, 61, 55, 62, 0, 0
};
-#else
-DECLARE_ALIGNED(16, static const int16_t,
- default_scan_8x8_neighbors[65 * MAX_NEIGHBORS]) = {
- 0, 0, 0, 0, 8, 0, 8, 8, 1, 8, 9, 1, 9, 16, 16, 17, 2, 9, 10,
- 2, 10, 17, 17, 24, 24, 25, 3, 10, 11, 3, 18, 25, 25, 32, 11, 18, 32, 33,
- 4, 11, 26, 33, 19, 26, 12, 4, 33, 40, 12, 19, 40, 41, 5, 12, 27, 34, 34,
- 41, 20, 27, 13, 20, 13, 5, 41, 48, 48, 49, 28, 35, 35, 42, 21, 28, 6, 6,
- 6, 13, 42, 49, 49, 56, 36, 43, 14, 21, 29, 36, 7, 14, 43, 50, 50, 57, 22,
- 29, 37, 44, 15, 22, 44, 51, 51, 58, 30, 37, 23, 30, 52, 59, 45, 52, 38, 45,
- 31, 38, 53, 60, 46, 53, 39, 46, 54, 61, 47, 54, 55, 62, 0, 0,
-};
-#endif
DECLARE_ALIGNED(16, static const int16_t,
default_scan_8x16_neighbors[129 * MAX_NEIGHBORS]) = {
@@ -2319,7 +2068,6 @@
239, 254, 0, 0,
};
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t,
default_scan_16x16_neighbors[257 * MAX_NEIGHBORS]) = {
0, 0, 0, 0, 0, 0, 16, 16, 1, 16, 1, 1, 2, 2, 2,
@@ -2358,46 +2106,6 @@
221, 221, 236, 236, 251, 237, 252, 222, 237, 207, 222, 223, 238, 238, 253,
239, 254, 0, 0
};
-#else
-DECLARE_ALIGNED(16, static const int16_t,
- default_scan_16x16_neighbors[257 * MAX_NEIGHBORS]) = {
- 0, 0, 0, 0, 16, 0, 16, 16, 1, 16, 17, 1, 32, 32, 17,
- 32, 2, 17, 18, 2, 48, 48, 18, 33, 33, 48, 3, 18, 49, 64,
- 64, 65, 34, 49, 19, 3, 19, 34, 50, 65, 4, 19, 65, 80, 80,
- 81, 35, 50, 20, 4, 20, 35, 66, 81, 81, 96, 51, 66, 96, 97,
- 5, 20, 36, 51, 82, 97, 21, 36, 67, 82, 97, 112, 21, 5, 52,
- 67, 112, 113, 37, 52, 6, 21, 83, 98, 98, 113, 68, 83, 22, 6,
- 113, 128, 22, 37, 53, 68, 84, 99, 99, 114, 128, 129, 114, 129, 69,
- 84, 38, 53, 7, 22, 23, 7, 129, 144, 23, 38, 54, 69, 100, 115,
- 85, 100, 115, 130, 144, 145, 130, 145, 39, 54, 70, 85, 8, 23, 55,
- 70, 116, 131, 101, 116, 145, 160, 24, 39, 24, 8, 86, 101, 131, 146,
- 160, 161, 146, 161, 71, 86, 40, 55, 9, 24, 117, 132, 102, 117, 161,
- 176, 132, 147, 56, 71, 87, 102, 25, 40, 147, 162, 25, 9, 176, 177,
- 162, 177, 72, 87, 41, 56, 118, 133, 133, 148, 103, 118, 10, 25, 148,
- 163, 57, 72, 88, 103, 177, 192, 26, 41, 163, 178, 192, 193, 26, 10,
- 119, 134, 73, 88, 149, 164, 104, 119, 134, 149, 42, 57, 178, 193, 164,
- 179, 11, 26, 58, 73, 193, 208, 89, 104, 135, 150, 120, 135, 27, 42,
- 74, 89, 208, 209, 150, 165, 179, 194, 165, 180, 105, 120, 194, 209, 43,
- 58, 27, 11, 136, 151, 90, 105, 151, 166, 180, 195, 59, 74, 121, 136,
- 209, 224, 195, 210, 224, 225, 166, 181, 106, 121, 75, 90, 12, 27, 181,
- 196, 28, 12, 210, 225, 152, 167, 167, 182, 137, 152, 28, 43, 196, 211,
- 122, 137, 91, 106, 225, 240, 44, 59, 13, 28, 107, 122, 182, 197, 168,
- 183, 211, 226, 153, 168, 226, 241, 60, 75, 197, 212, 138, 153, 29, 44,
- 76, 91, 29, 13, 183, 198, 123, 138, 45, 60, 212, 227, 198, 213, 154,
- 169, 169, 184, 227, 242, 92, 107, 61, 76, 139, 154, 14, 29, 30, 14,
- 184, 199, 213, 228, 108, 123, 199, 214, 228, 243, 77, 92, 30, 45, 170,
- 185, 155, 170, 185, 200, 93, 108, 124, 139, 214, 229, 46, 61, 200, 215,
- 229, 244, 15, 30, 109, 124, 62, 77, 140, 155, 215, 230, 31, 46, 171,
- 186, 186, 201, 201, 216, 78, 93, 230, 245, 125, 140, 47, 62, 216, 231,
- 156, 171, 94, 109, 231, 246, 141, 156, 63, 78, 202, 217, 187, 202, 110,
- 125, 217, 232, 172, 187, 232, 247, 79, 94, 157, 172, 126, 141, 203, 218,
- 95, 110, 233, 248, 218, 233, 142, 157, 111, 126, 173, 188, 188, 203, 234,
- 249, 219, 234, 127, 142, 158, 173, 204, 219, 189, 204, 143, 158, 235, 250,
- 174, 189, 205, 220, 159, 174, 220, 235, 221, 236, 175, 190, 190, 205, 236,
- 251, 206, 221, 237, 252, 191, 206, 222, 237, 207, 222, 238, 253, 223, 238,
- 239, 254, 0, 0,
-};
-#endif
DECLARE_ALIGNED(16, static const int16_t,
mcol_scan_32x32_neighbors[1025 * MAX_NEIGHBORS]) = {
@@ -2701,7 +2409,6 @@
990, 1021, 991, 1022, 0, 0,
};
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t,
default_scan_32x32_neighbors[1025 * MAX_NEIGHBORS]) = {
0, 0, 0, 0, 0, 0, 32, 32, 1, 32, 1, 1, 2, 2,
@@ -2852,158 +2559,6 @@
926, 957, 957, 988, 988, 1019, 989, 1020, 958, 989, 927, 958, 959, 990,
990, 1021, 991, 1022, 0, 0
};
-#else
-DECLARE_ALIGNED(16, static const int16_t,
- default_scan_32x32_neighbors[1025 * MAX_NEIGHBORS]) = {
- 0, 0, 0, 0, 32, 0, 32, 32, 1, 32, 33, 1, 64, 64,
- 33, 64, 2, 33, 96, 96, 34, 2, 65, 96, 34, 65, 128, 128,
- 97, 128, 3, 34, 66, 97, 35, 3, 35, 66, 98, 129, 129, 160,
- 160, 161, 4, 35, 67, 98, 192, 192, 36, 4, 130, 161, 161, 192,
- 36, 67, 99, 130, 5, 36, 68, 99, 193, 224, 162, 193, 224, 225,
- 131, 162, 37, 68, 100, 131, 37, 5, 194, 225, 225, 256, 256, 257,
- 163, 194, 69, 100, 132, 163, 6, 37, 226, 257, 38, 6, 195, 226,
- 257, 288, 101, 132, 288, 289, 38, 69, 164, 195, 133, 164, 258, 289,
- 227, 258, 196, 227, 7, 38, 289, 320, 70, 101, 320, 321, 39, 7,
- 165, 196, 39, 70, 102, 133, 290, 321, 259, 290, 228, 259, 321, 352,
- 352, 353, 197, 228, 134, 165, 71, 102, 8, 39, 322, 353, 291, 322,
- 260, 291, 103, 134, 353, 384, 166, 197, 229, 260, 40, 71, 40, 8,
- 384, 385, 135, 166, 354, 385, 323, 354, 198, 229, 292, 323, 72, 103,
- 261, 292, 9, 40, 385, 416, 167, 198, 104, 135, 230, 261, 355, 386,
- 416, 417, 293, 324, 324, 355, 41, 9, 41, 72, 386, 417, 199, 230,
- 136, 167, 417, 448, 262, 293, 356, 387, 73, 104, 387, 418, 231, 262,
- 10, 41, 168, 199, 325, 356, 418, 449, 105, 136, 448, 449, 42, 73,
- 294, 325, 200, 231, 42, 10, 357, 388, 137, 168, 263, 294, 388, 419,
- 74, 105, 419, 450, 449, 480, 326, 357, 232, 263, 295, 326, 169, 200,
- 11, 42, 106, 137, 480, 481, 450, 481, 358, 389, 264, 295, 201, 232,
- 138, 169, 389, 420, 43, 74, 420, 451, 327, 358, 43, 11, 481, 512,
- 233, 264, 451, 482, 296, 327, 75, 106, 170, 201, 482, 513, 512, 513,
- 390, 421, 359, 390, 421, 452, 107, 138, 12, 43, 202, 233, 452, 483,
- 265, 296, 328, 359, 139, 170, 44, 75, 483, 514, 513, 544, 234, 265,
- 297, 328, 422, 453, 44, 12, 391, 422, 171, 202, 76, 107, 514, 545,
- 453, 484, 544, 545, 266, 297, 203, 234, 108, 139, 329, 360, 298, 329,
- 140, 171, 515, 546, 13, 44, 423, 454, 235, 266, 545, 576, 454, 485,
- 45, 76, 172, 203, 330, 361, 576, 577, 45, 13, 267, 298, 546, 577,
- 77, 108, 204, 235, 455, 486, 577, 608, 299, 330, 109, 140, 547, 578,
- 14, 45, 46, 14, 141, 172, 578, 609, 331, 362, 46, 77, 173, 204,
- 15, 15, 78, 109, 205, 236, 579, 610, 110, 141, 15, 46, 142, 173,
- 47, 78, 174, 205, 16, 16, 79, 110, 206, 237, 16, 47, 111, 142,
- 48, 79, 143, 174, 80, 111, 175, 206, 17, 48, 49, 17, 207, 238,
- 49, 80, 81, 112, 18, 18, 18, 49, 50, 81, 82, 113, 19, 50,
- 51, 82, 83, 114, 608, 609, 484, 515, 360, 391, 236, 267, 112, 143,
- 51, 19, 640, 640, 609, 640, 516, 547, 485, 516, 392, 423, 361, 392,
- 268, 299, 237, 268, 144, 175, 113, 144, 20, 51, 52, 20, 672, 672,
- 641, 672, 610, 641, 548, 579, 517, 548, 486, 517, 424, 455, 393, 424,
- 362, 393, 300, 331, 269, 300, 238, 269, 176, 207, 145, 176, 114, 145,
- 52, 83, 21, 52, 53, 21, 704, 704, 673, 704, 642, 673, 611, 642,
- 580, 611, 549, 580, 518, 549, 487, 518, 456, 487, 425, 456, 394, 425,
- 363, 394, 332, 363, 301, 332, 270, 301, 239, 270, 208, 239, 177, 208,
- 146, 177, 115, 146, 84, 115, 53, 84, 22, 53, 54, 22, 705, 736,
- 674, 705, 643, 674, 581, 612, 550, 581, 519, 550, 457, 488, 426, 457,
- 395, 426, 333, 364, 302, 333, 271, 302, 209, 240, 178, 209, 147, 178,
- 85, 116, 54, 85, 23, 54, 706, 737, 675, 706, 582, 613, 551, 582,
- 458, 489, 427, 458, 334, 365, 303, 334, 210, 241, 179, 210, 86, 117,
- 55, 86, 707, 738, 583, 614, 459, 490, 335, 366, 211, 242, 87, 118,
- 736, 737, 612, 643, 488, 519, 364, 395, 240, 271, 116, 147, 55, 23,
- 768, 768, 737, 768, 644, 675, 613, 644, 520, 551, 489, 520, 396, 427,
- 365, 396, 272, 303, 241, 272, 148, 179, 117, 148, 24, 55, 56, 24,
- 800, 800, 769, 800, 738, 769, 676, 707, 645, 676, 614, 645, 552, 583,
- 521, 552, 490, 521, 428, 459, 397, 428, 366, 397, 304, 335, 273, 304,
- 242, 273, 180, 211, 149, 180, 118, 149, 56, 87, 25, 56, 57, 25,
- 832, 832, 801, 832, 770, 801, 739, 770, 708, 739, 677, 708, 646, 677,
- 615, 646, 584, 615, 553, 584, 522, 553, 491, 522, 460, 491, 429, 460,
- 398, 429, 367, 398, 336, 367, 305, 336, 274, 305, 243, 274, 212, 243,
- 181, 212, 150, 181, 119, 150, 88, 119, 57, 88, 26, 57, 58, 26,
- 833, 864, 802, 833, 771, 802, 709, 740, 678, 709, 647, 678, 585, 616,
- 554, 585, 523, 554, 461, 492, 430, 461, 399, 430, 337, 368, 306, 337,
- 275, 306, 213, 244, 182, 213, 151, 182, 89, 120, 58, 89, 27, 58,
- 834, 865, 803, 834, 710, 741, 679, 710, 586, 617, 555, 586, 462, 493,
- 431, 462, 338, 369, 307, 338, 214, 245, 183, 214, 90, 121, 59, 90,
- 835, 866, 711, 742, 587, 618, 463, 494, 339, 370, 215, 246, 91, 122,
- 864, 865, 740, 771, 616, 647, 492, 523, 368, 399, 244, 275, 120, 151,
- 59, 27, 896, 896, 865, 896, 772, 803, 741, 772, 648, 679, 617, 648,
- 524, 555, 493, 524, 400, 431, 369, 400, 276, 307, 245, 276, 152, 183,
- 121, 152, 28, 59, 60, 28, 928, 928, 897, 928, 866, 897, 804, 835,
- 773, 804, 742, 773, 680, 711, 649, 680, 618, 649, 556, 587, 525, 556,
- 494, 525, 432, 463, 401, 432, 370, 401, 308, 339, 277, 308, 246, 277,
- 184, 215, 153, 184, 122, 153, 60, 91, 29, 60, 61, 29, 960, 960,
- 929, 960, 898, 929, 867, 898, 836, 867, 805, 836, 774, 805, 743, 774,
- 712, 743, 681, 712, 650, 681, 619, 650, 588, 619, 557, 588, 526, 557,
- 495, 526, 464, 495, 433, 464, 402, 433, 371, 402, 340, 371, 309, 340,
- 278, 309, 247, 278, 216, 247, 185, 216, 154, 185, 123, 154, 92, 123,
- 61, 92, 30, 61, 62, 30, 961, 992, 930, 961, 899, 930, 837, 868,
- 806, 837, 775, 806, 713, 744, 682, 713, 651, 682, 589, 620, 558, 589,
- 527, 558, 465, 496, 434, 465, 403, 434, 341, 372, 310, 341, 279, 310,
- 217, 248, 186, 217, 155, 186, 93, 124, 62, 93, 31, 62, 962, 993,
- 931, 962, 838, 869, 807, 838, 714, 745, 683, 714, 590, 621, 559, 590,
- 466, 497, 435, 466, 342, 373, 311, 342, 218, 249, 187, 218, 94, 125,
- 63, 94, 963, 994, 839, 870, 715, 746, 591, 622, 467, 498, 343, 374,
- 219, 250, 95, 126, 868, 899, 744, 775, 620, 651, 496, 527, 372, 403,
- 248, 279, 124, 155, 900, 931, 869, 900, 776, 807, 745, 776, 652, 683,
- 621, 652, 528, 559, 497, 528, 404, 435, 373, 404, 280, 311, 249, 280,
- 156, 187, 125, 156, 932, 963, 901, 932, 870, 901, 808, 839, 777, 808,
- 746, 777, 684, 715, 653, 684, 622, 653, 560, 591, 529, 560, 498, 529,
- 436, 467, 405, 436, 374, 405, 312, 343, 281, 312, 250, 281, 188, 219,
- 157, 188, 126, 157, 964, 995, 933, 964, 902, 933, 871, 902, 840, 871,
- 809, 840, 778, 809, 747, 778, 716, 747, 685, 716, 654, 685, 623, 654,
- 592, 623, 561, 592, 530, 561, 499, 530, 468, 499, 437, 468, 406, 437,
- 375, 406, 344, 375, 313, 344, 282, 313, 251, 282, 220, 251, 189, 220,
- 158, 189, 127, 158, 965, 996, 934, 965, 903, 934, 841, 872, 810, 841,
- 779, 810, 717, 748, 686, 717, 655, 686, 593, 624, 562, 593, 531, 562,
- 469, 500, 438, 469, 407, 438, 345, 376, 314, 345, 283, 314, 221, 252,
- 190, 221, 159, 190, 966, 997, 935, 966, 842, 873, 811, 842, 718, 749,
- 687, 718, 594, 625, 563, 594, 470, 501, 439, 470, 346, 377, 315, 346,
- 222, 253, 191, 222, 967, 998, 843, 874, 719, 750, 595, 626, 471, 502,
- 347, 378, 223, 254, 872, 903, 748, 779, 624, 655, 500, 531, 376, 407,
- 252, 283, 904, 935, 873, 904, 780, 811, 749, 780, 656, 687, 625, 656,
- 532, 563, 501, 532, 408, 439, 377, 408, 284, 315, 253, 284, 936, 967,
- 905, 936, 874, 905, 812, 843, 781, 812, 750, 781, 688, 719, 657, 688,
- 626, 657, 564, 595, 533, 564, 502, 533, 440, 471, 409, 440, 378, 409,
- 316, 347, 285, 316, 254, 285, 968, 999, 937, 968, 906, 937, 875, 906,
- 844, 875, 813, 844, 782, 813, 751, 782, 720, 751, 689, 720, 658, 689,
- 627, 658, 596, 627, 565, 596, 534, 565, 503, 534, 472, 503, 441, 472,
- 410, 441, 379, 410, 348, 379, 317, 348, 286, 317, 255, 286, 969, 1000,
- 938, 969, 907, 938, 845, 876, 814, 845, 783, 814, 721, 752, 690, 721,
- 659, 690, 597, 628, 566, 597, 535, 566, 473, 504, 442, 473, 411, 442,
- 349, 380, 318, 349, 287, 318, 970, 1001, 939, 970, 846, 877, 815, 846,
- 722, 753, 691, 722, 598, 629, 567, 598, 474, 505, 443, 474, 350, 381,
- 319, 350, 971, 1002, 847, 878, 723, 754, 599, 630, 475, 506, 351, 382,
- 876, 907, 752, 783, 628, 659, 504, 535, 380, 411, 908, 939, 877, 908,
- 784, 815, 753, 784, 660, 691, 629, 660, 536, 567, 505, 536, 412, 443,
- 381, 412, 940, 971, 909, 940, 878, 909, 816, 847, 785, 816, 754, 785,
- 692, 723, 661, 692, 630, 661, 568, 599, 537, 568, 506, 537, 444, 475,
- 413, 444, 382, 413, 972, 1003, 941, 972, 910, 941, 879, 910, 848, 879,
- 817, 848, 786, 817, 755, 786, 724, 755, 693, 724, 662, 693, 631, 662,
- 600, 631, 569, 600, 538, 569, 507, 538, 476, 507, 445, 476, 414, 445,
- 383, 414, 973, 1004, 942, 973, 911, 942, 849, 880, 818, 849, 787, 818,
- 725, 756, 694, 725, 663, 694, 601, 632, 570, 601, 539, 570, 477, 508,
- 446, 477, 415, 446, 974, 1005, 943, 974, 850, 881, 819, 850, 726, 757,
- 695, 726, 602, 633, 571, 602, 478, 509, 447, 478, 975, 1006, 851, 882,
- 727, 758, 603, 634, 479, 510, 880, 911, 756, 787, 632, 663, 508, 539,
- 912, 943, 881, 912, 788, 819, 757, 788, 664, 695, 633, 664, 540, 571,
- 509, 540, 944, 975, 913, 944, 882, 913, 820, 851, 789, 820, 758, 789,
- 696, 727, 665, 696, 634, 665, 572, 603, 541, 572, 510, 541, 976, 1007,
- 945, 976, 914, 945, 883, 914, 852, 883, 821, 852, 790, 821, 759, 790,
- 728, 759, 697, 728, 666, 697, 635, 666, 604, 635, 573, 604, 542, 573,
- 511, 542, 977, 1008, 946, 977, 915, 946, 853, 884, 822, 853, 791, 822,
- 729, 760, 698, 729, 667, 698, 605, 636, 574, 605, 543, 574, 978, 1009,
- 947, 978, 854, 885, 823, 854, 730, 761, 699, 730, 606, 637, 575, 606,
- 979, 1010, 855, 886, 731, 762, 607, 638, 884, 915, 760, 791, 636, 667,
- 916, 947, 885, 916, 792, 823, 761, 792, 668, 699, 637, 668, 948, 979,
- 917, 948, 886, 917, 824, 855, 793, 824, 762, 793, 700, 731, 669, 700,
- 638, 669, 980, 1011, 949, 980, 918, 949, 887, 918, 856, 887, 825, 856,
- 794, 825, 763, 794, 732, 763, 701, 732, 670, 701, 639, 670, 981, 1012,
- 950, 981, 919, 950, 857, 888, 826, 857, 795, 826, 733, 764, 702, 733,
- 671, 702, 982, 1013, 951, 982, 858, 889, 827, 858, 734, 765, 703, 734,
- 983, 1014, 859, 890, 735, 766, 888, 919, 764, 795, 920, 951, 889, 920,
- 796, 827, 765, 796, 952, 983, 921, 952, 890, 921, 828, 859, 797, 828,
- 766, 797, 984, 1015, 953, 984, 922, 953, 891, 922, 860, 891, 829, 860,
- 798, 829, 767, 798, 985, 1016, 954, 985, 923, 954, 861, 892, 830, 861,
- 799, 830, 986, 1017, 955, 986, 862, 893, 831, 862, 987, 1018, 863, 894,
- 892, 923, 924, 955, 893, 924, 956, 987, 925, 956, 894, 925, 988, 1019,
- 957, 988, 926, 957, 895, 926, 989, 1020, 958, 989, 927, 958, 990, 1021,
- 959, 990, 991, 1022, 0, 0,
-};
-#endif
#define default_scan_32x64_neighbors default_scan_32x32_neighbors
#define default_scan_64x32_neighbors default_scan_32x32_neighbors
@@ -3011,15 +2566,9 @@
#define default_scan_16x64_neighbors default_scan_16x32_neighbors
#define default_scan_64x16_neighbors default_scan_32x16_neighbors
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_4x4[16]) = {
0, 1, 5, 6, 2, 4, 7, 12, 3, 8, 11, 13, 9, 10, 14, 15
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_4x4[16]) = {
- 0, 2, 5, 8, 1, 3, 9, 12, 4, 7, 11, 14, 6, 10, 13, 15,
-};
-#endif
DECLARE_ALIGNED(16, static const int16_t, av1_mcol_iscan_4x4[16]) = {
0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15,
@@ -3037,17 +2586,10 @@
0, 1, 3, 5, 2, 4, 6, 9, 7, 8, 11, 13, 10, 12, 14, 15,
};
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_4x8[32]) = {
0, 1, 3, 6, 2, 4, 7, 10, 5, 8, 11, 14, 9, 12, 15, 18,
13, 16, 19, 22, 17, 20, 23, 26, 21, 24, 27, 29, 25, 28, 30, 31,
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_4x8[32]) = {
- 0, 1, 4, 9, 2, 3, 6, 11, 5, 7, 8, 13, 10, 12, 14, 17,
- 15, 16, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-};
-#endif
DECLARE_ALIGNED(16, static const int16_t, av1_mcol_iscan_4x8[32]) = {
0, 8, 16, 24, 1, 9, 17, 25, 2, 10, 18, 26, 3, 11, 19, 27,
@@ -3059,17 +2601,10 @@
16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
};
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_8x4[32]) = {
0, 2, 5, 9, 13, 17, 21, 25, 1, 4, 8, 12, 16, 20, 24, 28,
3, 7, 11, 15, 19, 23, 27, 30, 6, 10, 14, 18, 22, 26, 29, 31,
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_8x4[32]) = {
- 0, 1, 4, 9, 15, 19, 24, 28, 2, 3, 6, 11, 16, 21, 25, 29,
- 5, 7, 8, 13, 18, 22, 26, 30, 10, 12, 14, 17, 20, 23, 27, 31,
-};
-#endif
DECLARE_ALIGNED(16, static const int16_t, av1_mcol_iscan_8x4[32]) = {
0, 4, 8, 12, 16, 20, 24, 28, 1, 5, 9, 13, 17, 21, 25, 29,
@@ -3081,37 +2616,19 @@
16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
};
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_4x16[64]) = {
0, 1, 3, 6, 2, 4, 7, 10, 5, 8, 11, 14, 9, 12, 15, 18,
13, 16, 19, 22, 17, 20, 23, 26, 21, 24, 27, 30, 25, 28, 31, 34,
29, 32, 35, 38, 33, 36, 39, 42, 37, 40, 43, 46, 41, 44, 47, 50,
45, 48, 51, 54, 49, 52, 55, 58, 53, 56, 59, 61, 57, 60, 62, 63,
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_4x16[64]) = {
- 0, 1, 4, 9, 2, 3, 6, 11, 5, 7, 8, 13, 10, 12, 14, 17,
- 15, 16, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-};
-#endif
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_16x4[64]) = {
0, 2, 5, 9, 13, 17, 21, 25, 29, 33, 37, 41, 45, 49, 53, 57,
1, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 60,
3, 7, 11, 15, 19, 23, 27, 31, 35, 39, 43, 47, 51, 55, 59, 62,
6, 10, 14, 18, 22, 26, 30, 34, 38, 42, 46, 50, 54, 58, 61, 63,
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_16x4[64]) = {
- 0, 1, 4, 9, 15, 19, 24, 28, 32, 36, 40, 44, 48, 52, 56, 60,
- 2, 3, 6, 11, 16, 21, 25, 29, 33, 37, 41, 45, 49, 53, 57, 61,
- 5, 7, 8, 13, 18, 22, 26, 30, 34, 38, 42, 46, 50, 54, 58, 62,
- 10, 12, 14, 17, 20, 23, 27, 31, 35, 39, 43, 47, 51, 55, 59, 63,
-};
-#endif
DECLARE_ALIGNED(16, static const int16_t, av1_mrow_iscan_4x16[64]) = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
@@ -3162,7 +2679,6 @@
255,
};
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_32x8[256]) = {
0, 2, 5, 9, 14, 20, 27, 35, 43, 51, 59, 67, 75, 83, 91,
99, 107, 115, 123, 131, 139, 147, 155, 163, 171, 179, 187, 195, 203, 211,
@@ -3183,28 +2699,6 @@
156, 164, 172, 180, 188, 196, 204, 212, 220, 228, 235, 241, 246, 250, 253,
255,
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_32x8[256]) = {
- 0, 1, 3, 6, 10, 15, 21, 28, 36, 44, 52, 60, 68, 76, 84,
- 92, 100, 108, 116, 124, 132, 140, 148, 156, 164, 172, 180, 188, 196, 204,
- 212, 220, 2, 4, 7, 11, 16, 22, 29, 37, 45, 53, 61, 69, 77,
- 85, 93, 101, 109, 117, 125, 133, 141, 149, 157, 165, 173, 181, 189, 197,
- 205, 213, 221, 228, 5, 8, 12, 17, 23, 30, 38, 46, 54, 62, 70,
- 78, 86, 94, 102, 110, 118, 126, 134, 142, 150, 158, 166, 174, 182, 190,
- 198, 206, 214, 222, 229, 235, 9, 13, 18, 24, 31, 39, 47, 55, 63,
- 71, 79, 87, 95, 103, 111, 119, 127, 135, 143, 151, 159, 167, 175, 183,
- 191, 199, 207, 215, 223, 230, 236, 241, 14, 19, 25, 32, 40, 48, 56,
- 64, 72, 80, 88, 96, 104, 112, 120, 128, 136, 144, 152, 160, 168, 176,
- 184, 192, 200, 208, 216, 224, 231, 237, 242, 246, 20, 26, 33, 41, 49,
- 57, 65, 73, 81, 89, 97, 105, 113, 121, 129, 137, 145, 153, 161, 169,
- 177, 185, 193, 201, 209, 217, 225, 232, 238, 243, 247, 250, 27, 34, 42,
- 50, 58, 66, 74, 82, 90, 98, 106, 114, 122, 130, 138, 146, 154, 162,
- 170, 178, 186, 194, 202, 210, 218, 226, 233, 239, 244, 248, 251, 253, 35,
- 43, 51, 59, 67, 75, 83, 91, 99, 107, 115, 123, 131, 139, 147, 155,
- 163, 171, 179, 187, 195, 203, 211, 219, 227, 234, 240, 245, 249, 252, 254,
- 255,
-};
-#endif
DECLARE_ALIGNED(16, static const int16_t, av1_mrow_iscan_8x32[256]) = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
@@ -3316,21 +2810,12 @@
32, 36, 42, 47, 51, 54, 60, 61, 40, 45, 48, 53, 56, 58, 62, 63,
};
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_8x8[64]) = {
0, 1, 5, 6, 14, 15, 27, 28, 2, 4, 7, 13, 16, 26, 29, 42,
3, 8, 12, 17, 25, 30, 41, 43, 9, 11, 18, 24, 31, 40, 44, 53,
10, 19, 23, 32, 39, 45, 52, 54, 20, 22, 33, 38, 46, 51, 55, 60,
21, 34, 37, 47, 50, 56, 59, 61, 35, 36, 48, 49, 57, 58, 62, 63
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_8x8[64]) = {
- 0, 2, 5, 9, 14, 22, 31, 37, 1, 4, 8, 13, 19, 26, 38, 44,
- 3, 6, 10, 17, 24, 30, 42, 49, 7, 11, 15, 21, 29, 36, 47, 53,
- 12, 16, 20, 27, 34, 43, 52, 57, 18, 23, 28, 35, 41, 48, 56, 60,
- 25, 32, 39, 45, 50, 55, 59, 62, 33, 40, 46, 51, 54, 58, 61, 63,
-};
-#endif
DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_8x16[128]) = {
0, 1, 3, 6, 10, 15, 21, 28, 2, 4, 7, 11, 16, 22, 29, 36,
@@ -3343,7 +2828,6 @@
91, 98, 105, 111, 116, 120, 123, 125, 99, 106, 112, 117, 121, 124, 126, 127,
};
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_16x8[128]) = {
0, 2, 5, 9, 14, 20, 27, 35, 43, 51, 59, 67, 75, 83, 91, 99,
1, 4, 8, 13, 19, 26, 34, 42, 50, 58, 66, 74, 82, 90, 98, 106,
@@ -3354,18 +2838,6 @@
21, 29, 37, 45, 53, 61, 69, 77, 85, 93, 101, 108, 114, 119, 123, 126,
28, 36, 44, 52, 60, 68, 76, 84, 92, 100, 107, 113, 118, 122, 125, 127,
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_16x8[128]) = {
- 0, 1, 3, 6, 10, 15, 21, 28, 36, 44, 52, 60, 68, 76, 84, 92,
- 2, 4, 7, 11, 16, 22, 29, 37, 45, 53, 61, 69, 77, 85, 93, 100,
- 5, 8, 12, 17, 23, 30, 38, 46, 54, 62, 70, 78, 86, 94, 101, 107,
- 9, 13, 18, 24, 31, 39, 47, 55, 63, 71, 79, 87, 95, 102, 108, 113,
- 14, 19, 25, 32, 40, 48, 56, 64, 72, 80, 88, 96, 103, 109, 114, 118,
- 20, 26, 33, 41, 49, 57, 65, 73, 81, 89, 97, 104, 110, 115, 119, 122,
- 27, 34, 42, 50, 58, 66, 74, 82, 90, 98, 105, 111, 116, 120, 123, 125,
- 35, 43, 51, 59, 67, 75, 83, 91, 99, 106, 112, 117, 121, 124, 126, 127,
-};
-#endif
DECLARE_ALIGNED(16, static const int16_t, av1_mcol_iscan_8x16[128]) = {
0, 16, 32, 48, 64, 80, 96, 112, 1, 17, 33, 49, 65, 81, 97, 113,
@@ -3451,7 +2923,6 @@
510, 511,
};
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_32x16[512]) = {
0, 2, 5, 9, 14, 20, 27, 35, 44, 54, 65, 77, 90, 104, 119,
135, 151, 167, 183, 199, 215, 231, 247, 263, 279, 295, 311, 327, 343, 359,
@@ -3489,45 +2960,6 @@
360, 376, 392, 407, 421, 434, 446, 457, 467, 476, 484, 491, 497, 502, 506,
509, 511,
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_32x16[512]) = {
- 0, 1, 3, 6, 10, 15, 21, 28, 36, 45, 55, 66, 78, 91, 105,
- 120, 136, 152, 168, 184, 200, 216, 232, 248, 264, 280, 296, 312, 328, 344,
- 360, 376, 2, 4, 7, 11, 16, 22, 29, 37, 46, 56, 67, 79, 92,
- 106, 121, 137, 153, 169, 185, 201, 217, 233, 249, 265, 281, 297, 313, 329,
- 345, 361, 377, 392, 5, 8, 12, 17, 23, 30, 38, 47, 57, 68, 80,
- 93, 107, 122, 138, 154, 170, 186, 202, 218, 234, 250, 266, 282, 298, 314,
- 330, 346, 362, 378, 393, 407, 9, 13, 18, 24, 31, 39, 48, 58, 69,
- 81, 94, 108, 123, 139, 155, 171, 187, 203, 219, 235, 251, 267, 283, 299,
- 315, 331, 347, 363, 379, 394, 408, 421, 14, 19, 25, 32, 40, 49, 59,
- 70, 82, 95, 109, 124, 140, 156, 172, 188, 204, 220, 236, 252, 268, 284,
- 300, 316, 332, 348, 364, 380, 395, 409, 422, 434, 20, 26, 33, 41, 50,
- 60, 71, 83, 96, 110, 125, 141, 157, 173, 189, 205, 221, 237, 253, 269,
- 285, 301, 317, 333, 349, 365, 381, 396, 410, 423, 435, 446, 27, 34, 42,
- 51, 61, 72, 84, 97, 111, 126, 142, 158, 174, 190, 206, 222, 238, 254,
- 270, 286, 302, 318, 334, 350, 366, 382, 397, 411, 424, 436, 447, 457, 35,
- 43, 52, 62, 73, 85, 98, 112, 127, 143, 159, 175, 191, 207, 223, 239,
- 255, 271, 287, 303, 319, 335, 351, 367, 383, 398, 412, 425, 437, 448, 458,
- 467, 44, 53, 63, 74, 86, 99, 113, 128, 144, 160, 176, 192, 208, 224,
- 240, 256, 272, 288, 304, 320, 336, 352, 368, 384, 399, 413, 426, 438, 449,
- 459, 468, 476, 54, 64, 75, 87, 100, 114, 129, 145, 161, 177, 193, 209,
- 225, 241, 257, 273, 289, 305, 321, 337, 353, 369, 385, 400, 414, 427, 439,
- 450, 460, 469, 477, 484, 65, 76, 88, 101, 115, 130, 146, 162, 178, 194,
- 210, 226, 242, 258, 274, 290, 306, 322, 338, 354, 370, 386, 401, 415, 428,
- 440, 451, 461, 470, 478, 485, 491, 77, 89, 102, 116, 131, 147, 163, 179,
- 195, 211, 227, 243, 259, 275, 291, 307, 323, 339, 355, 371, 387, 402, 416,
- 429, 441, 452, 462, 471, 479, 486, 492, 497, 90, 103, 117, 132, 148, 164,
- 180, 196, 212, 228, 244, 260, 276, 292, 308, 324, 340, 356, 372, 388, 403,
- 417, 430, 442, 453, 463, 472, 480, 487, 493, 498, 502, 104, 118, 133, 149,
- 165, 181, 197, 213, 229, 245, 261, 277, 293, 309, 325, 341, 357, 373, 389,
- 404, 418, 431, 443, 454, 464, 473, 481, 488, 494, 499, 503, 506, 119, 134,
- 150, 166, 182, 198, 214, 230, 246, 262, 278, 294, 310, 326, 342, 358, 374,
- 390, 405, 419, 432, 444, 455, 465, 474, 482, 489, 495, 500, 504, 507, 509,
- 135, 151, 167, 183, 199, 215, 231, 247, 263, 279, 295, 311, 327, 343, 359,
- 375, 391, 406, 420, 433, 445, 456, 466, 475, 483, 490, 496, 501, 505, 508,
- 510, 511,
-};
-#endif
DECLARE_ALIGNED(16, static const int16_t, av1_mcol_iscan_16x32[512]) = {
0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 480,
@@ -3758,7 +3190,6 @@
255,
};
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_16x16[256]) = {
0, 1, 5, 6, 14, 15, 27, 28, 44, 45, 65, 66, 90, 91, 119,
120, 2, 4, 7, 13, 16, 26, 29, 43, 46, 64, 67, 89, 92, 118,
@@ -3779,28 +3210,6 @@
135, 136, 164, 165, 189, 190, 210, 211, 227, 228, 240, 241, 249, 250, 254,
255
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_16x16[256]) = {
- 0, 2, 5, 9, 17, 24, 36, 44, 55, 72, 88, 104, 128, 143, 166,
- 179, 1, 4, 8, 13, 20, 30, 40, 54, 66, 79, 96, 113, 141, 154,
- 178, 196, 3, 7, 11, 18, 25, 33, 46, 57, 71, 86, 101, 119, 148,
- 164, 186, 201, 6, 12, 16, 23, 31, 39, 53, 64, 78, 92, 110, 127,
- 153, 169, 193, 208, 10, 14, 19, 28, 37, 47, 58, 67, 84, 98, 114,
- 133, 161, 176, 198, 214, 15, 21, 26, 34, 43, 52, 65, 77, 91, 106,
- 120, 140, 165, 185, 205, 221, 22, 27, 32, 41, 48, 60, 73, 85, 99,
- 116, 130, 151, 175, 190, 211, 225, 29, 35, 42, 49, 59, 69, 81, 95,
- 108, 125, 139, 155, 182, 197, 217, 229, 38, 45, 51, 61, 68, 80, 93,
- 105, 118, 134, 150, 168, 191, 207, 223, 234, 50, 56, 63, 74, 83, 94,
- 109, 117, 129, 147, 163, 177, 199, 213, 228, 238, 62, 70, 76, 87, 97,
- 107, 122, 131, 145, 159, 172, 188, 210, 222, 235, 242, 75, 82, 90, 102,
- 112, 124, 138, 146, 157, 173, 187, 202, 219, 230, 240, 245, 89, 100, 111,
- 123, 132, 142, 156, 167, 180, 189, 203, 216, 231, 237, 246, 250, 103, 115,
- 126, 136, 149, 162, 171, 183, 194, 204, 215, 224, 236, 241, 248, 252, 121,
- 135, 144, 158, 170, 181, 192, 200, 209, 218, 227, 233, 243, 244, 251, 254,
- 137, 152, 160, 174, 184, 195, 206, 212, 220, 226, 232, 239, 247, 249, 253,
- 255,
-};
-#endif
DECLARE_ALIGNED(16, static const int16_t, av1_mcol_iscan_32x32[1024]) = {
0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416,
@@ -3961,7 +3370,6 @@
1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023,
};
-#if CONFIG_LV_MAP
DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_32x32[1024]) = {
0, 1, 5, 6, 14, 15, 27, 28, 44, 45, 65, 66, 90,
91, 119, 120, 152, 153, 189, 190, 230, 231, 275, 276, 324, 325,
@@ -4043,89 +3451,6 @@
748, 792, 793, 833, 834, 870, 871, 903, 904, 932, 933, 957, 958,
978, 979, 995, 996, 1008, 1009, 1017, 1018, 1022, 1023
};
-#else
-DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_32x32[1024]) = {
- 0, 2, 5, 10, 17, 25, 38, 47, 62, 83, 101, 121, 145,
- 170, 193, 204, 210, 219, 229, 233, 245, 257, 275, 299, 342, 356,
- 377, 405, 455, 471, 495, 527, 1, 4, 8, 15, 22, 30, 45,
- 58, 74, 92, 112, 133, 158, 184, 203, 215, 222, 228, 234, 237,
- 256, 274, 298, 317, 355, 376, 404, 426, 470, 494, 526, 551, 3,
- 7, 12, 18, 28, 36, 52, 64, 82, 102, 118, 142, 164, 189,
- 208, 217, 224, 231, 235, 238, 273, 297, 316, 329, 375, 403, 425,
- 440, 493, 525, 550, 567, 6, 11, 16, 23, 31, 43, 60, 73,
- 90, 109, 126, 150, 173, 196, 211, 220, 226, 232, 236, 239, 296,
- 315, 328, 335, 402, 424, 439, 447, 524, 549, 566, 575, 9, 14,
- 19, 29, 37, 50, 65, 78, 95, 116, 134, 157, 179, 201, 214,
- 223, 244, 255, 272, 295, 341, 354, 374, 401, 454, 469, 492, 523,
- 582, 596, 617, 645, 13, 20, 26, 35, 44, 54, 72, 85, 105,
- 123, 140, 163, 182, 205, 216, 225, 254, 271, 294, 314, 353, 373,
- 400, 423, 468, 491, 522, 548, 595, 616, 644, 666, 21, 27, 33,
- 42, 53, 63, 80, 94, 113, 132, 151, 172, 190, 209, 218, 227,
- 270, 293, 313, 327, 372, 399, 422, 438, 490, 521, 547, 565, 615,
- 643, 665, 680, 24, 32, 39, 48, 57, 71, 88, 104, 120, 139,
- 159, 178, 197, 212, 221, 230, 292, 312, 326, 334, 398, 421, 437,
- 446, 520, 546, 564, 574, 642, 664, 679, 687, 34, 40, 46, 56,
- 68, 81, 96, 111, 130, 147, 167, 186, 243, 253, 269, 291, 340,
- 352, 371, 397, 453, 467, 489, 519, 581, 594, 614, 641, 693, 705,
- 723, 747, 41, 49, 55, 67, 77, 91, 107, 124, 138, 161, 177,
- 194, 252, 268, 290, 311, 351, 370, 396, 420, 466, 488, 518, 545,
- 593, 613, 640, 663, 704, 722, 746, 765, 51, 59, 66, 76, 89,
- 99, 119, 131, 149, 168, 181, 200, 267, 289, 310, 325, 369, 395,
- 419, 436, 487, 517, 544, 563, 612, 639, 662, 678, 721, 745, 764,
- 777, 61, 69, 75, 87, 100, 114, 129, 144, 162, 180, 191, 207,
- 288, 309, 324, 333, 394, 418, 435, 445, 516, 543, 562, 573, 638,
- 661, 677, 686, 744, 763, 776, 783, 70, 79, 86, 97, 108, 122,
- 137, 155, 242, 251, 266, 287, 339, 350, 368, 393, 452, 465, 486,
- 515, 580, 592, 611, 637, 692, 703, 720, 743, 788, 798, 813, 833,
- 84, 93, 103, 110, 125, 141, 154, 171, 250, 265, 286, 308, 349,
- 367, 392, 417, 464, 485, 514, 542, 591, 610, 636, 660, 702, 719,
- 742, 762, 797, 812, 832, 848, 98, 106, 115, 127, 143, 156, 169,
- 185, 264, 285, 307, 323, 366, 391, 416, 434, 484, 513, 541, 561,
- 609, 635, 659, 676, 718, 741, 761, 775, 811, 831, 847, 858, 117,
- 128, 136, 148, 160, 175, 188, 198, 284, 306, 322, 332, 390, 415,
- 433, 444, 512, 540, 560, 572, 634, 658, 675, 685, 740, 760, 774,
- 782, 830, 846, 857, 863, 135, 146, 152, 165, 241, 249, 263, 283,
- 338, 348, 365, 389, 451, 463, 483, 511, 579, 590, 608, 633, 691,
- 701, 717, 739, 787, 796, 810, 829, 867, 875, 887, 903, 153, 166,
- 174, 183, 248, 262, 282, 305, 347, 364, 388, 414, 462, 482, 510,
- 539, 589, 607, 632, 657, 700, 716, 738, 759, 795, 809, 828, 845,
- 874, 886, 902, 915, 176, 187, 195, 202, 261, 281, 304, 321, 363,
- 387, 413, 432, 481, 509, 538, 559, 606, 631, 656, 674, 715, 737,
- 758, 773, 808, 827, 844, 856, 885, 901, 914, 923, 192, 199, 206,
- 213, 280, 303, 320, 331, 386, 412, 431, 443, 508, 537, 558, 571,
- 630, 655, 673, 684, 736, 757, 772, 781, 826, 843, 855, 862, 900,
- 913, 922, 927, 240, 247, 260, 279, 337, 346, 362, 385, 450, 461,
- 480, 507, 578, 588, 605, 629, 690, 699, 714, 735, 786, 794, 807,
- 825, 866, 873, 884, 899, 930, 936, 945, 957, 246, 259, 278, 302,
- 345, 361, 384, 411, 460, 479, 506, 536, 587, 604, 628, 654, 698,
- 713, 734, 756, 793, 806, 824, 842, 872, 883, 898, 912, 935, 944,
- 956, 966, 258, 277, 301, 319, 360, 383, 410, 430, 478, 505, 535,
- 557, 603, 627, 653, 672, 712, 733, 755, 771, 805, 823, 841, 854,
- 882, 897, 911, 921, 943, 955, 965, 972, 276, 300, 318, 330, 382,
- 409, 429, 442, 504, 534, 556, 570, 626, 652, 671, 683, 732, 754,
- 770, 780, 822, 840, 853, 861, 896, 910, 920, 926, 954, 964, 971,
- 975, 336, 344, 359, 381, 449, 459, 477, 503, 577, 586, 602, 625,
- 689, 697, 711, 731, 785, 792, 804, 821, 865, 871, 881, 895, 929,
- 934, 942, 953, 977, 981, 987, 995, 343, 358, 380, 408, 458, 476,
- 502, 533, 585, 601, 624, 651, 696, 710, 730, 753, 791, 803, 820,
- 839, 870, 880, 894, 909, 933, 941, 952, 963, 980, 986, 994, 1001,
- 357, 379, 407, 428, 475, 501, 532, 555, 600, 623, 650, 670, 709,
- 729, 752, 769, 802, 819, 838, 852, 879, 893, 908, 919, 940, 951,
- 962, 970, 985, 993, 1000, 1005, 378, 406, 427, 441, 500, 531, 554,
- 569, 622, 649, 669, 682, 728, 751, 768, 779, 818, 837, 851, 860,
- 892, 907, 918, 925, 950, 961, 969, 974, 992, 999, 1004, 1007, 448,
- 457, 474, 499, 576, 584, 599, 621, 688, 695, 708, 727, 784, 790,
- 801, 817, 864, 869, 878, 891, 928, 932, 939, 949, 976, 979, 984,
- 991, 1008, 1010, 1013, 1017, 456, 473, 498, 530, 583, 598, 620, 648,
- 694, 707, 726, 750, 789, 800, 816, 836, 868, 877, 890, 906, 931,
- 938, 948, 960, 978, 983, 990, 998, 1009, 1012, 1016, 1020, 472, 497,
- 529, 553, 597, 619, 647, 668, 706, 725, 749, 767, 799, 815, 835,
- 850, 876, 889, 905, 917, 937, 947, 959, 968, 982, 989, 997, 1003,
- 1011, 1015, 1019, 1022, 496, 528, 552, 568, 618, 646, 667, 681, 724,
- 748, 766, 778, 814, 834, 849, 859, 888, 904, 916, 924, 946, 958,
- 967, 973, 988, 996, 1002, 1006, 1014, 1018, 1021, 1023,
-};
-#endif
#define av1_default_iscan_32x64 av1_default_iscan_32x32
#define av1_default_iscan_64x32 av1_default_iscan_32x32
@@ -4661,13 +3986,8 @@
{
// TX_4X4
{ default_scan_4x4, av1_default_iscan_4x4, default_scan_4x4_neighbors },
-#if CONFIG_LV_MAP
{ default_scan_4x4, av1_default_iscan_4x4, default_scan_4x4_neighbors },
{ default_scan_4x4, av1_default_iscan_4x4, default_scan_4x4_neighbors },
-#else
- { row_scan_4x4, av1_row_iscan_4x4, row_scan_4x4_neighbors },
- { col_scan_4x4, av1_col_iscan_4x4, col_scan_4x4_neighbors },
-#endif
{ default_scan_4x4, av1_default_iscan_4x4, default_scan_4x4_neighbors },
{ default_scan_4x4, av1_default_iscan_4x4, default_scan_4x4_neighbors },
{ default_scan_4x4, av1_default_iscan_4x4, default_scan_4x4_neighbors },
@@ -4685,13 +4005,8 @@
{
// TX_8X8
{ default_scan_8x8, av1_default_iscan_8x8, default_scan_8x8_neighbors },
-#if CONFIG_LV_MAP
{ default_scan_8x8, av1_default_iscan_8x8, default_scan_8x8_neighbors },
{ default_scan_8x8, av1_default_iscan_8x8, default_scan_8x8_neighbors },
-#else
- { row_scan_8x8, av1_row_iscan_8x8, row_scan_8x8_neighbors },
- { col_scan_8x8, av1_col_iscan_8x8, col_scan_8x8_neighbors },
-#endif
{ default_scan_8x8, av1_default_iscan_8x8, default_scan_8x8_neighbors },
{ default_scan_8x8, av1_default_iscan_8x8, default_scan_8x8_neighbors },
{ default_scan_8x8, av1_default_iscan_8x8, default_scan_8x8_neighbors },
@@ -4710,15 +4025,10 @@
// TX_16X16
{ default_scan_16x16, av1_default_iscan_16x16,
default_scan_16x16_neighbors },
-#if CONFIG_LV_MAP
{ default_scan_16x16, av1_default_iscan_16x16,
default_scan_16x16_neighbors },
{ default_scan_16x16, av1_default_iscan_16x16,
default_scan_16x16_neighbors },
-#else
- { row_scan_16x16, av1_row_iscan_16x16, row_scan_16x16_neighbors },
- { col_scan_16x16, av1_col_iscan_16x16, col_scan_16x16_neighbors },
-#endif
{ default_scan_16x16, av1_default_iscan_16x16,
default_scan_16x16_neighbors },
{ default_scan_16x16, av1_default_iscan_16x16,
@@ -5026,15 +4336,10 @@
// TX_4X16
{ default_scan_4x16, av1_default_iscan_4x16,
default_scan_4x16_neighbors },
-#if CONFIG_LV_MAP
{ default_scan_4x16, av1_default_iscan_4x16,
default_scan_4x16_neighbors },
{ default_scan_4x16, av1_default_iscan_4x16,
default_scan_4x16_neighbors },
-#else
- { mrow_scan_4x16, av1_mrow_iscan_4x16, mrow_scan_4x16_neighbors },
- { mcol_scan_4x16, av1_mcol_iscan_4x16, mcol_scan_4x16_neighbors },
-#endif
{ default_scan_4x16, av1_default_iscan_4x16,
default_scan_4x16_neighbors },
{ default_scan_4x16, av1_default_iscan_4x16,
@@ -5059,15 +4364,10 @@
// TX_16X4
{ default_scan_16x4, av1_default_iscan_16x4,
default_scan_16x4_neighbors },
-#if CONFIG_LV_MAP
{ default_scan_16x4, av1_default_iscan_16x4,
default_scan_16x4_neighbors },
{ default_scan_16x4, av1_default_iscan_16x4,
default_scan_16x4_neighbors },
-#else
- { mrow_scan_16x4, av1_mrow_iscan_16x4, mrow_scan_16x4_neighbors },
- { mcol_scan_16x4, av1_mcol_iscan_16x4, mcol_scan_16x4_neighbors },
-#endif
{ default_scan_16x4, av1_default_iscan_16x4,
default_scan_16x4_neighbors },
{ default_scan_16x4, av1_default_iscan_16x4,
@@ -5092,15 +4392,10 @@
// TX_8X32
{ default_scan_8x32, av1_default_iscan_8x32,
default_scan_8x32_neighbors },
-#if CONFIG_LV_MAP
{ default_scan_8x32, av1_default_iscan_8x32,
default_scan_8x32_neighbors },
{ default_scan_8x32, av1_default_iscan_8x32,
default_scan_8x32_neighbors },
-#else
- { mrow_scan_8x32, av1_mrow_iscan_8x32, mrow_scan_8x32_neighbors },
- { mcol_scan_8x32, av1_mcol_iscan_8x32, mcol_scan_8x32_neighbors },
-#endif
{ default_scan_8x32, av1_default_iscan_8x32,
default_scan_8x32_neighbors },
{ default_scan_8x32, av1_default_iscan_8x32,
@@ -5125,15 +4420,10 @@
// TX_32X8
{ default_scan_32x8, av1_default_iscan_32x8,
default_scan_32x8_neighbors },
-#if CONFIG_LV_MAP
{ default_scan_32x8, av1_default_iscan_32x8,
default_scan_32x8_neighbors },
{ default_scan_32x8, av1_default_iscan_32x8,
default_scan_32x8_neighbors },
-#else
- { mrow_scan_32x8, av1_mrow_iscan_32x8, mrow_scan_32x8_neighbors },
- { mcol_scan_32x8, av1_mcol_iscan_32x8, mcol_scan_32x8_neighbors },
-#endif
{ default_scan_32x8, av1_default_iscan_32x8,
default_scan_32x8_neighbors },
{ default_scan_32x8, av1_default_iscan_32x8,
diff --git a/av1/common/scan.h b/av1/common/scan.h
index 146732f..f06a7ee 100644
--- a/av1/common/scan.h
+++ b/av1/common/scan.h
@@ -50,13 +50,8 @@
static INLINE const SCAN_ORDER *get_default_scan(TX_SIZE tx_size,
TX_TYPE tx_type,
int is_inter) {
-#if CONFIG_LV_MAP
(void)is_inter;
return &av1_inter_scan_orders[tx_size][tx_type];
-#else
- return is_inter ? &av1_inter_scan_orders[tx_size][tx_type]
- : &av1_intra_scan_orders[tx_size][tx_type];
-#endif
}
static INLINE const SCAN_ORDER *get_scan(const AV1_COMMON *cm, TX_SIZE tx_size,
diff --git a/av1/common/token_cdfs.h b/av1/common/token_cdfs.h
index 8ae5673..465669f 100644
--- a/av1/common/token_cdfs.h
+++ b/av1/common/token_cdfs.h
@@ -12,7 +12,6 @@
#include "./aom_config.h"
#include "av1/common/entropy.h"
-#if CONFIG_LV_MAP
#if CONFIG_Q_ADAPT_PROBS
static const aom_cdf_prob
av1_default_txb_skip_cdfs[TOKEN_CDF_Q_CTXS][TX_SIZES][TXB_SKIP_CONTEXTS]
@@ -4329,3132 +4328,3 @@
{ AOM_CDF4(8192, 16384, 24576) } } }
};
#endif // CONFIG_Q_ADAPT_PROBS
-#else
-/* clang-format off */
-static const coeff_cdf_model
-av1_default_coef_head_cdfs_q0[TX_SIZES][PLANE_TYPES] = {
- { // TX 4X4
- { // Y plane
- { // Intra
- { // Band 0
- { AOM_CDF6(21029,21848,26326,29423,30610) },
- { AOM_CDF6(10066,12716,18523,23277,24780) },
- { AOM_CDF6(1655,4793,6429,11430,12206) },
- },
- { // Band 1
- { AOM_CDF5(10364,14773,25084,25599) },
- { AOM_CDF5(10060,14834,24695,25188) },
- { AOM_CDF5(8279,11106,21159,21671) },
- { AOM_CDF5(5914,6961,15824,16314) },
- { AOM_CDF5(3542,3935,10073,10456) },
- { AOM_CDF5(1492,1808,4428,4747) },
- },
- { // Band 2
- { AOM_CDF5(15783,19657,28753,29248) },
- { AOM_CDF5(12047,15766,26989,27464) },
- { AOM_CDF5(8412,9971,21538,22026) },
- { AOM_CDF5(5438,6039,15108,15570) },
- { AOM_CDF5(3247,3593,9495,9859) },
- { AOM_CDF5(1428,1742,4322,4638) },
- },
- { // Band 3
- { AOM_CDF5(18469,21675,30172,30563) },
- { AOM_CDF5(12582,16559,27995,28423) },
- { AOM_CDF5(8183,9915,21836,22336) },
- { AOM_CDF5(5255,5845,15137,15593) },
- { AOM_CDF5(3140,3478,9376,9739) },
- { AOM_CDF5(1549,1864,4660,4984) },
- },
- { // Band 4
- { AOM_CDF5(18319,23757,30989,31399) },
- { AOM_CDF5(12864,18051,28729,29218) },
- { AOM_CDF5(8090,10047,22011,22680) },
- { AOM_CDF5(5061,5688,14783,15379) },
- { AOM_CDF5(3425,3784,9565,9998) },
- { AOM_CDF5(1564,1884,4703,5054) },
- },
- { // Band 5
- { AOM_CDF5(8329,23625,30376,31182) },
- { AOM_CDF5(7265,19981,27965,29333) },
- { AOM_CDF5(5797,12014,21143,23728) },
- { AOM_CDF5(4525,7029,14661,17493) },
- { AOM_CDF5(3200,4082,9679,11816) },
- { AOM_CDF5(1930,2344,5504,6684) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(12366,20513,22133,29810,30422) },
- { AOM_CDF6(7182,16662,18633,27443,28120) },
- { AOM_CDF6(1791,10613,11616,21520,22191) },
- },
- { // Band 1
- { AOM_CDF5(18943,19755,30340,30674) },
- { AOM_CDF5(15702,17160,28778,29115) },
- { AOM_CDF5(9337,10054,22492,22845) },
- { AOM_CDF5(6550,7019,17068,17420) },
- { AOM_CDF5(4169,4566,11849,12185) },
- { AOM_CDF5(2495,2839,6895,7221) },
- },
- { // Band 2
- { AOM_CDF5(20241,21593,31083,31425) },
- { AOM_CDF5(15276,16626,28787,29136) },
- { AOM_CDF5(7656,8102,20347,20700) },
- { AOM_CDF5(4527,4880,13482,13819) },
- { AOM_CDF5(2538,2860,7975,8298) },
- { AOM_CDF5(1394,1707,3770,4086) },
- },
- { // Band 3
- { AOM_CDF5(19968,21872,30812,31172) },
- { AOM_CDF5(15081,16805,28957,29326) },
- { AOM_CDF5(8196,8748,21434,21825) },
- { AOM_CDF5(5297,5675,15007,15385) },
- { AOM_CDF5(3102,3429,9255,9607) },
- { AOM_CDF5(1502,1815,4662,4983) },
- },
- { // Band 4
- { AOM_CDF5(19362,22537,31260,31624) },
- { AOM_CDF5(14450,17789,29362,29788) },
- { AOM_CDF5(7957,8982,21542,22120) },
- { AOM_CDF5(4819,5280,14199,14724) },
- { AOM_CDF5(2831,3180,8511,8950) },
- { AOM_CDF5(1385,1700,4300,4633) },
- },
- { // Band 5
- { AOM_CDF5(14134,22252,31119,31577) },
- { AOM_CDF5(11383,19847,29451,30205) },
- { AOM_CDF5(7338,11314,22338,24028) },
- { AOM_CDF5(5071,6634,15379,17178) },
- { AOM_CDF5(2969,3703,9896,11246) },
- { AOM_CDF5(1809,2173,5573,6229) },
- },
- },
- },
- { // UV plane
- { // Intra
- { // Band 0
- { AOM_CDF6(25213,26007,29751,31199,31688) },
- { AOM_CDF6(13781,16489,23298,27505,28405) },
- { AOM_CDF6(4621,9194,12764,19842,20708) },
- },
- { // Band 1
- { AOM_CDF5(12686,19031,28910,29358) },
- { AOM_CDF5(12732,18729,28346,28824) },
- { AOM_CDF5(9753,12954,24344,24920) },
- { AOM_CDF5(6853,7851,18601,19110) },
- { AOM_CDF5(3697,4071,11373,11743) },
- { AOM_CDF5(1738,2057,5307,5627) },
- },
- { // Band 2
- { AOM_CDF5(18299,24455,30930,31398) },
- { AOM_CDF5(14316,19083,29266,29766) },
- { AOM_CDF5(9584,11344,23898,24407) },
- { AOM_CDF5(6076,6645,16805,17237) },
- { AOM_CDF5(3535,3885,10393,10746) },
- { AOM_CDF5(1909,2222,5010,5328) },
- },
- { // Band 3
- { AOM_CDF5(21106,25258,31172,31576) },
- { AOM_CDF5(14944,20229,29903,30361) },
- { AOM_CDF5(10454,13063,25548,26138) },
- { AOM_CDF5(7667,8529,20025,20588) },
- { AOM_CDF5(4813,5176,13672,14085) },
- { AOM_CDF5(2450,2763,7515,7873) },
- },
- { // Band 4
- { AOM_CDF5(18297,25980,31547,31946) },
- { AOM_CDF5(13370,21048,30193,30703) },
- { AOM_CDF5(9326,13020,25206,26074) },
- { AOM_CDF5(6117,7480,18243,19130) },
- { AOM_CDF5(6408,6819,13596,14098) },
- { AOM_CDF5(2179,2485,7393,7768) },
- },
- { // Band 5
- { AOM_CDF5(11255,26931,31505,32033) },
- { AOM_CDF5(9120,23148,30070,31091) },
- { AOM_CDF5(7927,15909,25162,27329) },
- { AOM_CDF5(6416,10706,19959,22732) },
- { AOM_CDF5(4232,5545,13107,15118) },
- { AOM_CDF5(2626,2941,8665,9872) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(27618,28976,30940,31993,32336) },
- { AOM_CDF6(16119,21691,26334,30705,31244) },
- { AOM_CDF6(5114,14755,17865,27048,27895) },
- },
- { // Band 1
- { AOM_CDF5(19468,23767,31339,31674) },
- { AOM_CDF5(16878,20966,30654,31007) },
- { AOM_CDF5(12213,14415,26909,27338) },
- { AOM_CDF5(9404,10670,22239,22719) },
- { AOM_CDF5(6856,7784,17127,17609) },
- { AOM_CDF5(5034,5529,13229,13634) },
- },
- { // Band 2
- { AOM_CDF5(21214,25570,31656,31994) },
- { AOM_CDF5(17012,20535,30403,30787) },
- { AOM_CDF5(10855,12147,25451,25874) },
- { AOM_CDF5(7055,7837,19116,19553) },
- { AOM_CDF5(4141,4531,11911,12296) },
- { AOM_CDF5(1706,2041,5622,5957) },
- },
- { // Band 3
- { AOM_CDF5(22092,26330,31642,32015) },
- { AOM_CDF5(16433,20889,30263,30704) },
- { AOM_CDF5(11015,13045,26253,26743) },
- { AOM_CDF5(9188,9924,21991,22551) },
- { AOM_CDF5(5259,5634,14131,14627) },
- { AOM_CDF5(1916,2218,6453,6780) },
- },
- { // Band 4
- { AOM_CDF5(20331,26854,31896,32255) },
- { AOM_CDF5(15738,22741,31108,31557) },
- { AOM_CDF5(11693,15508,27435,28103) },
- { AOM_CDF5(8066,9281,20855,21631) },
- { AOM_CDF5(4427,4860,12951,13543) },
- { AOM_CDF5(1928,2372,5634,6672) },
- },
- { // Band 5
- { AOM_CDF5(15605,27749,31907,32303) },
- { AOM_CDF5(11920,24653,31013,31675) },
- { AOM_CDF5(8007,14898,25377,27353) },
- { AOM_CDF5(6010,8920,18956,21554) },
- { AOM_CDF5(4573,5611,13522,15795) },
- { AOM_CDF5(4274,6411,11398,14247) },
- },
- },
- },
- },
- { // TX 8X8
- { // Y plane
- { // Intra
- { // Band 0
- { AOM_CDF6(22195,22830,25684,28569,30557) },
- { AOM_CDF6(9973,12001,15354,20353,23020) },
- { AOM_CDF6(1514,3998,4873,9182,9967) },
- },
- { // Band 1
- { AOM_CDF5(11609,14013,24609,25092) },
- { AOM_CDF5(10302,15208,24145,24658) },
- { AOM_CDF5(7991,10895,20438,21146) },
- { AOM_CDF5(5831,7006,15716,16394) },
- { AOM_CDF5(3536,3969,10117,10569) },
- { AOM_CDF5(1369,1686,4062,4385) },
- },
- { // Band 2
- { AOM_CDF5(17334,19416,28420,28798) },
- { AOM_CDF5(13512,15917,26736,27122) },
- { AOM_CDF5(9322,10491,21892,22281) },
- { AOM_CDF5(6187,6682,15992,16351) },
- { AOM_CDF5(3733,4073,10406,10735) },
- { AOM_CDF5(1606,1920,4715,5028) },
- },
- { // Band 3
- { AOM_CDF5(20589,22106,30065,30422) },
- { AOM_CDF5(14731,16342,27701,28059) },
- { AOM_CDF5(8554,9080,20831,21182) },
- { AOM_CDF5(5011,5354,13968,14296) },
- { AOM_CDF5(2867,3184,8524,8840) },
- { AOM_CDF5(1174,1486,3643,3955) },
- },
- { // Band 4
- { AOM_CDF5(23439,24729,31199,31537) },
- { AOM_CDF5(15716,17015,28650,28989) },
- { AOM_CDF5(8381,8812,21032,21369) },
- { AOM_CDF5(4868,5197,13740,14065) },
- { AOM_CDF5(2744,3058,8333,8648) },
- { AOM_CDF5(1185,1497,3656,3968) },
- },
- { // Band 5
- { AOM_CDF5(23980,26041,31566,31904) },
- { AOM_CDF5(16060,18243,29508,29868) },
- { AOM_CDF5(8844,9414,22119,22496) },
- { AOM_CDF5(5265,5612,14599,14944) },
- { AOM_CDF5(3058,3375,9028,9351) },
- { AOM_CDF5(1414,1726,4249,4563) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(9994,19506,21744,29408,30809) },
- { AOM_CDF6(3771,14862,16756,26385,27927) },
- { AOM_CDF6(964,10643,11416,21060,22316) },
- },
- { // Band 1
- { AOM_CDF5(23263,23761,31250,31580) },
- { AOM_CDF5(19631,21067,30262,30596) },
- { AOM_CDF5(12419,13646,25959,26329) },
- { AOM_CDF5(9274,10229,21588,21981) },
- { AOM_CDF5(6778,7496,17069,17469) },
- { AOM_CDF5(4655,5089,12206,12574) },
- },
- { // Band 2
- { AOM_CDF5(24055,24771,31529,31851) },
- { AOM_CDF5(18300,19177,29983,30310) },
- { AOM_CDF5(9684,10239,23130,23465) },
- { AOM_CDF5(6112,6511,16539,16874) },
- { AOM_CDF5(3508,3841,10475,10798) },
- { AOM_CDF5(1647,1963,5379,5693) },
- },
- { // Band 3
- { AOM_CDF5(24875,25551,31757,32078) },
- { AOM_CDF5(18585,19328,30217,30542) },
- { AOM_CDF5(8948,9350,22251,22577) },
- { AOM_CDF5(5148,5481,14806,15127) },
- { AOM_CDF5(2852,3169,8930,9249) },
- { AOM_CDF5(1298,1609,4289,4600) },
- },
- { // Band 4
- { AOM_CDF5(25149,25840,31833,32153) },
- { AOM_CDF5(19051,19689,30461,30785) },
- { AOM_CDF5(8956,9308,22406,22729) },
- { AOM_CDF5(5001,5325,14586,14906) },
- { AOM_CDF5(2875,3189,8639,8955) },
- { AOM_CDF5(1311,1623,4261,4572) },
- },
- { // Band 5
- { AOM_CDF5(25212,26544,31879,32209) },
- { AOM_CDF5(18967,20523,30778,31126) },
- { AOM_CDF5(9672,10140,23740,24117) },
- { AOM_CDF5(5732,6079,16067,16423) },
- { AOM_CDF5(3370,3687,10101,10429) },
- { AOM_CDF5(1696,2007,5320,5648) },
- },
- },
- },
- { // UV plane
- { // Intra
- { // Band 0
- { AOM_CDF6(26296,26903,30027,31098,31851) },
- { AOM_CDF6(13982,16223,22840,26540,28301) },
- { AOM_CDF6(5643,9834,13670,20220,21734) },
- },
- { // Band 1
- { AOM_CDF5(14291,20303,29319,29879) },
- { AOM_CDF5(13407,20905,29052,29644) },
- { AOM_CDF5(10860,15525,25872,26766) },
- { AOM_CDF5(7801,9554,20530,21309) },
- { AOM_CDF5(4523,4994,12583,13069) },
- { AOM_CDF5(1784,2110,5198,5511) },
- },
- { // Band 2
- { AOM_CDF5(20153,24114,30802,31195) },
- { AOM_CDF5(16079,19936,29580,29992) },
- { AOM_CDF5(10977,12993,25245,25687) },
- { AOM_CDF5(7386,8212,19223,19683) },
- { AOM_CDF5(4797,5164,12928,13288) },
- { AOM_CDF5(2188,2498,6396,6706) },
- },
- { // Band 3
- { AOM_CDF5(24221,26746,31634,31980) },
- { AOM_CDF5(17492,20348,30067,30432) },
- { AOM_CDF5(10522,11531,24642,25031) },
- { AOM_CDF5(6567,7006,17688,18036) },
- { AOM_CDF5(4123,4447,11775,12095) },
- { AOM_CDF5(1770,2065,6491,6786) },
- },
- { // Band 4
- { AOM_CDF5(25862,27744,31611,31969) },
- { AOM_CDF5(17752,20079,30169,30530) },
- { AOM_CDF5(10588,11308,24834,25180) },
- { AOM_CDF5(7459,7820,17949,18281) },
- { AOM_CDF5(3984,4294,11863,12173) },
- { AOM_CDF5(2689,2969,11371,11651) },
- },
- { // Band 5
- { AOM_CDF5(27703,29662,31910,32262) },
- { AOM_CDF5(17904,21878,30510,30969) },
- { AOM_CDF5(10660,12299,24907,25524) },
- { AOM_CDF5(6972,7545,18660,19251) },
- { AOM_CDF5(5359,5768,14022,14397) },
- { AOM_CDF5(5030,5487,10364,10973) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(27980,28880,31045,31931,32370) },
- { AOM_CDF6(15958,19891,25963,29601,30931) },
- { AOM_CDF6(3897,12331,15935,24489,26773) },
- },
- { // Band 1
- { AOM_CDF5(21443,24237,31473,31808) },
- { AOM_CDF5(18617,22378,30958,31301) },
- { AOM_CDF5(14626,17725,28852,29246) },
- { AOM_CDF5(12155,14598,26000,26506) },
- { AOM_CDF5(10111,12149,23415,24002) },
- { AOM_CDF5(11352,12864,22589,23010) },
- },
- { // Band 2
- { AOM_CDF5(22855,25401,31675,31999) },
- { AOM_CDF5(19086,21008,30886,31214) },
- { AOM_CDF5(13477,14473,28104,28450) },
- { AOM_CDF5(9553,10401,23815,24225) },
- { AOM_CDF5(5795,6172,18068,18445) },
- { AOM_CDF5(4297,5909,10206,11818) },
- },
- { // Band 3
- { AOM_CDF5(24424,26344,31912,32231) },
- { AOM_CDF5(20229,21775,31283,31610) },
- { AOM_CDF5(14224,14882,28673,29012) },
- { AOM_CDF5(10881,11494,23829,24238) },
- { AOM_CDF5(6367,6988,15685,16306) },
- { AOM_CDF5(7447,11916,17873,22342) },
- },
- { // Band 4
- { AOM_CDF5(25536,27216,31570,31916) },
- { AOM_CDF5(19600,21062,30095,30444) },
- { AOM_CDF5(11491,12044,26170,26497) },
- { AOM_CDF5(9629,9963,23790,24112) },
- { AOM_CDF5(8073,8359,22212,22498) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(27425,29611,32005,32347) },
- { AOM_CDF5(20590,24265,31252,31658) },
- { AOM_CDF5(14072,15705,28945,29389) },
- { AOM_CDF5(11295,11926,26485,26872) },
- { AOM_CDF5(10627,11292,22141,22805) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- },
- },
- { // TX 16X16
- { // Y plane
- { // Intra
- { // Band 0
- { AOM_CDF6(9850,11321,13211,18246,21613) },
- { AOM_CDF6(4128,6155,7367,11928,14060) },
- { AOM_CDF6(932,2794,3234,6647,7340) },
- },
- { // Band 1
- { AOM_CDF5(9101,10823,21291,22109) },
- { AOM_CDF5(8086,13032,21855,22748) },
- { AOM_CDF5(6563,10137,18484,20069) },
- { AOM_CDF5(4987,6567,14425,15700) },
- { AOM_CDF5(3399,3947,9950,10738) },
- { AOM_CDF5(1474,1793,4347,4690) },
- },
- { // Band 2
- { AOM_CDF5(17035,18650,27401,27793) },
- { AOM_CDF5(13213,16039,26044,26448) },
- { AOM_CDF5(9916,11812,22497,22945) },
- { AOM_CDF5(7227,8059,17399,17817) },
- { AOM_CDF5(5144,5572,12546,12892) },
- { AOM_CDF5(2364,2678,6057,6372) },
- },
- { // Band 3
- { AOM_CDF5(19805,21667,29302,29680) },
- { AOM_CDF5(14232,16314,27120,27515) },
- { AOM_CDF5(8796,9578,21112,21479) },
- { AOM_CDF5(5203,5552,14231,14563) },
- { AOM_CDF5(2943,3257,8676,8994) },
- { AOM_CDF5(1363,1675,4064,4376) },
- },
- { // Band 4
- { AOM_CDF5(24214,25083,30916,31249) },
- { AOM_CDF5(15904,17001,28199,28532) },
- { AOM_CDF5(8324,8717,20480,20808) },
- { AOM_CDF5(4752,5070,13245,13565) },
- { AOM_CDF5(2729,3042,8218,8530) },
- { AOM_CDF5(1385,1697,4196,4508) },
- },
- { // Band 5
- { AOM_CDF5(26956,27719,31679,32005) },
- { AOM_CDF5(16913,17759,29092,29422) },
- { AOM_CDF5(8166,8510,20577,20901) },
- { AOM_CDF5(4804,5119,13537,13853) },
- { AOM_CDF5(2951,3263,8766,9079) },
- { AOM_CDF5(1498,1810,4515,4827) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(7335,13463,14286,24588,29117) },
- { AOM_CDF6(3212,9869,10336,20172,25029) },
- { AOM_CDF6(917,6904,7251,15225,18595) },
- },
- { // Band 1
- { AOM_CDF5(23988,24467,31033,31407) },
- { AOM_CDF5(20390,23805,30556,30920) },
- { AOM_CDF5(13566,16666,27478,27995) },
- { AOM_CDF5(10353,12637,23789,24437) },
- { AOM_CDF5(7956,9364,19994,20621) },
- { AOM_CDF5(6036,6495,15543,16033) },
- },
- { // Band 2
- { AOM_CDF5(25643,26692,31634,31957) },
- { AOM_CDF5(18721,20381,30130,30466) },
- { AOM_CDF5(10914,12337,24817,25177) },
- { AOM_CDF5(7843,8667,19826,20212) },
- { AOM_CDF5(5080,5484,14225,14587) },
- { AOM_CDF5(2880,3192,7916,8236) },
- },
- { // Band 3
- { AOM_CDF5(26447,27233,31779,32097) },
- { AOM_CDF5(19042,20153,30217,30540) },
- { AOM_CDF5(9858,10440,23424,23753) },
- { AOM_CDF5(6276,6657,17158,17489) },
- { AOM_CDF5(3725,4039,10981,11303) },
- { AOM_CDF5(2041,2345,6069,6373) },
- },
- { // Band 4
- { AOM_CDF5(27189,27737,31897,32213) },
- { AOM_CDF5(19763,20443,30288,30607) },
- { AOM_CDF5(9033,9393,22097,22415) },
- { AOM_CDF5(5417,5747,15230,15545) },
- { AOM_CDF5(3397,3709,10342,10655) },
- { AOM_CDF5(2805,3108,6119,6422) },
- },
- { // Band 5
- { AOM_CDF5(27874,28490,31981,32301) },
- { AOM_CDF5(20112,20724,30607,30935) },
- { AOM_CDF5(9188,9549,22544,22875) },
- { AOM_CDF5(5590,5918,15550,15878) },
- { AOM_CDF5(3567,4015,10658,10988) },
- { AOM_CDF5(1950,2388,6246,6681) },
- },
- },
- },
- { // UV plane
- { // Intra
- { // Band 0
- { AOM_CDF6(25724,26337,28579,29957,30927) },
- { AOM_CDF6(9657,12074,16790,21738,23899) },
- { AOM_CDF6(4158,7646,10690,16969,18800) },
- },
- { // Band 1
- { AOM_CDF5(14330,19826,28364,29154) },
- { AOM_CDF5(13503,21352,28714,29534) },
- { AOM_CDF5(11754,16853,25931,27325) },
- { AOM_CDF5(8311,10581,21258,22633) },
- { AOM_CDF5(5297,5819,14162,14892) },
- { AOM_CDF5(2887,3208,7455,7768) },
- },
- { // Band 2
- { AOM_CDF5(22005,24480,30925,31309) },
- { AOM_CDF5(17332,20557,29696,30096) },
- { AOM_CDF5(11930,14337,25931,26358) },
- { AOM_CDF5(8888,10020,20964,21352) },
- { AOM_CDF5(5694,6135,14997,15376) },
- { AOM_CDF5(2521,2842,7765,8069) },
- },
- { // Band 3
- { AOM_CDF5(23993,25546,31427,31762) },
- { AOM_CDF5(18134,20327,29992,30386) },
- { AOM_CDF5(10997,12057,24719,25141) },
- { AOM_CDF5(5719,6153,16654,17032) },
- { AOM_CDF5(3637,3953,11392,11696) },
- { AOM_CDF5(1837,2127,5703,5993) },
- },
- { // Band 4
- { AOM_CDF5(26095,26989,31766,32091) },
- { AOM_CDF5(19524,20820,30413,30738) },
- { AOM_CDF5(9962,10551,22667,23010) },
- { AOM_CDF5(5773,6093,15402,15748) },
- { AOM_CDF5(3546,3850,9983,10287) },
- { AOM_CDF5(2387,2668,5711,5992) },
- },
- { // Band 5
- { AOM_CDF5(29071,29675,31761,32087) },
- { AOM_CDF5(18709,19761,29374,29730) },
- { AOM_CDF5(9336,10048,22625,22988) },
- { AOM_CDF5(6446,6793,16834,17172) },
- { AOM_CDF5(4227,4539,11587,11909) },
- { AOM_CDF5(2624,2929,7139,7444) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(25114,25872,29577,31173,32008) },
- { AOM_CDF6(11286,14376,22156,26266,29278) },
- { AOM_CDF6(2680,11055,14683,23068,26651) },
- },
- { // Band 1
- { AOM_CDF5(22838,24926,31689,32019) },
- { AOM_CDF5(19245,24299,31481,31852) },
- { AOM_CDF5(15429,21159,30176,30732) },
- { AOM_CDF5(12373,17092,26912,27758) },
- { AOM_CDF5(10899,13395,23604,24329) },
- { AOM_CDF5(12767,13096,21644,22083) },
- },
- { // Band 2
- { AOM_CDF5(24527,26101,31912,32226) },
- { AOM_CDF5(20576,22265,31439,31762) },
- { AOM_CDF5(13792,15369,28531,28942) },
- { AOM_CDF5(9392,11153,23790,24274) },
- { AOM_CDF5(5587,6191,19027,19480) },
- { AOM_CDF5(5174,10348,17246,22420) },
- },
- { // Band 3
- { AOM_CDF5(24737,25605,31953,32268) },
- { AOM_CDF5(20933,21817,31546,31861) },
- { AOM_CDF5(13887,14656,28490,28817) },
- { AOM_CDF5(10018,11047,23593,23967) },
- { AOM_CDF5(3855,6746,15420,18312) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(25861,26475,32028,32343) },
- { AOM_CDF5(22221,22755,31735,32050) },
- { AOM_CDF5(15517,15928,29558,29870) },
- { AOM_CDF5(7719,8507,20165,20638) },
- { AOM_CDF5(5783,11565,19275,25058) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(28675,29326,31767,32092) },
- { AOM_CDF5(21491,22422,29827,30197) },
- { AOM_CDF5(10080,11350,23883,24321) },
- { AOM_CDF5(8383,8793,21382,21739) },
- { AOM_CDF5(6835,7137,20646,20947) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- },
- },
- { // TX 32X32
- { // Y plane
- { // Intra
- { // Band 0
- { AOM_CDF6(15501,16574,17941,20080,21984) },
- { AOM_CDF6(1676,3221,3952,6916,7628) },
- { AOM_CDF6(468,1825,2211,4504,4877) },
- },
- { // Band 1
- { AOM_CDF5(5597,9461,16777,17896) },
- { AOM_CDF5(5231,9185,16569,17688) },
- { AOM_CDF5(4128,6983,13860,15674) },
- { AOM_CDF5(2908,4209,9762,11321) },
- { AOM_CDF5(2269,2797,7063,7999) },
- { AOM_CDF5(1270,1588,3710,4051) },
- },
- { // Band 2
- { AOM_CDF5(14862,16903,25712,26189) },
- { AOM_CDF5(12778,15420,25395,25836) },
- { AOM_CDF5(10402,12279,22858,23302) },
- { AOM_CDF5(8026,8897,18866,19290) },
- { AOM_CDF5(6610,7121,15967,16322) },
- { AOM_CDF5(3980,4296,10443,10757) },
- },
- { // Band 3
- { AOM_CDF5(19177,21516,28474,28892) },
- { AOM_CDF5(14901,17006,27100,27500) },
- { AOM_CDF5(10655,11487,23288,23664) },
- { AOM_CDF5(6980,7408,17955,18288) },
- { AOM_CDF5(3891,4206,11255,11570) },
- { AOM_CDF5(1532,1844,4593,4905) },
- },
- { // Band 4
- { AOM_CDF5(24338,25864,30962,31346) },
- { AOM_CDF5(16430,18166,28700,29068) },
- { AOM_CDF5(9726,10244,22575,22934) },
- { AOM_CDF5(5539,5868,15030,15363) },
- { AOM_CDF5(3305,3620,9405,9720) },
- { AOM_CDF5(1482,1794,4429,4741) },
- },
- { // Band 5
- { AOM_CDF5(29843,30312,31922,32242) },
- { AOM_CDF5(17390,18061,28932,29258) },
- { AOM_CDF5(7968,8308,20128,20447) },
- { AOM_CDF5(4523,4838,12959,13274) },
- { AOM_CDF5(2765,3077,8284,8596) },
- { AOM_CDF5(1422,1733,4244,4556) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(19066,20217,21504,24559,26831) },
- { AOM_CDF6(5708,7393,8108,11986,17424) },
- { AOM_CDF6(1144,2709,3111,6009,10882) },
- },
- { // Band 1
- { AOM_CDF5(17586,17895,27561,28179) },
- { AOM_CDF5(16442,19113,27944,28764) },
- { AOM_CDF5(12438,17724,26435,27714) },
- { AOM_CDF5(9439,12708,22594,24060) },
- { AOM_CDF5(7762,9639,19669,20614) },
- { AOM_CDF5(5324,5894,14504,15100) },
- },
- { // Band 2
- { AOM_CDF5(23414,25239,31300,31670) },
- { AOM_CDF5(18089,22136,30318,30720) },
- { AOM_CDF5(12081,15216,27074,27531) },
- { AOM_CDF5(9327,10783,22927,23384) },
- { AOM_CDF5(6381,6914,17070,17506) },
- { AOM_CDF5(3854,4164,10355,10665) },
- },
- { // Band 3
- { AOM_CDF5(24366,25993,31678,32001) },
- { AOM_CDF5(18041,21047,30693,31031) },
- { AOM_CDF5(11271,12970,26794,27180) },
- { AOM_CDF5(8173,8758,21941,22340) },
- { AOM_CDF5(5248,5568,15646,15994) },
- { AOM_CDF5(2689,3193,6722,7226) },
- },
- { // Band 4
- { AOM_CDF5(27565,28694,31993,32314) },
- { AOM_CDF5(20591,22532,31143,31473) },
- { AOM_CDF5(11268,12113,25966,26331) },
- { AOM_CDF5(7268,7674,19409,19747) },
- { AOM_CDF5(4404,4686,13213,13495) },
- { AOM_CDF5(2637,3766,7533,8663) },
- },
- { // Band 5
- { AOM_CDF5(29847,30306,32081,32397) },
- { AOM_CDF5(22752,23329,31334,31658) },
- { AOM_CDF5(10305,10672,24328,24657) },
- { AOM_CDF5(5712,6031,16694,17018) },
- { AOM_CDF5(3979,4278,10985,11284) },
- { AOM_CDF5(2465,2900,6815,7250) },
- },
- },
- },
- { // UV plane
- { // Intra
- { // Band 0
- { AOM_CDF6(21609,22111,24624,26045,27916) },
- { AOM_CDF6(5498,7300,12100,15851,18370) },
- { AOM_CDF6(1268,3284,6295,10711,12999) },
- },
- { // Band 1
- { AOM_CDF5(9621,16733,26354,27609) },
- { AOM_CDF5(9619,18339,27578,28547) },
- { AOM_CDF5(9575,18177,24044,25625) },
- { AOM_CDF5(5999,11578,20125,22544) },
- { AOM_CDF5(4842,6220,12898,14944) },
- { AOM_CDF5(948,1247,3292,3791) },
- },
- { // Band 2
- { AOM_CDF5(21002,25135,31208,31629) },
- { AOM_CDF5(18106,22116,29422,30013) },
- { AOM_CDF5(14580,15855,26171,26535) },
- { AOM_CDF5(9965,10971,23043,23378) },
- { AOM_CDF5(7123,7395,16893,17232) },
- { AOM_CDF5(3187,3432,7600,7845) },
- },
- { // Band 3
- { AOM_CDF5(26393,27823,31691,32028) },
- { AOM_CDF5(18449,20915,30092,30531) },
- { AOM_CDF5(11710,12263,26838,27139) },
- { AOM_CDF5(7737,8192,21299,21572) },
- { AOM_CDF5(3572,4038,13822,14287) },
- { AOM_CDF5(1689,2703,3716,4729) },
- },
- { // Band 4
- { AOM_CDF5(28371,29507,31986,32314) },
- { AOM_CDF5(19411,21758,30225,30579) },
- { AOM_CDF5(11995,12434,26661,27026) },
- { AOM_CDF5(9175,9721,22173,22501) },
- { AOM_CDF5(9078,9742,13063,13727) },
- { AOM_CDF5(3192,3830,6809,7447) },
- },
- { // Band 5
- { AOM_CDF5(31351,31682,32124,32438) },
- { AOM_CDF5(20883,22618,30828,31173) },
- { AOM_CDF5(11388,12381,24266,24700) },
- { AOM_CDF5(6987,7380,18401,18795) },
- { AOM_CDF5(2016,2773,7814,8570) },
- { AOM_CDF5(2849,4986,8548,10685) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(19461,21728,26601,29082,30105) },
- { AOM_CDF6(2845,10798,14316,23118,24609) },
- { AOM_CDF6(705,10138,12123,21473,23327) },
- },
- { // Band 1
- { AOM_CDF5(24780,25836,31623,31938) },
- { AOM_CDF5(22703,24390,31353,31797) },
- { AOM_CDF5(18218,20834,29429,30327) },
- { AOM_CDF5(12517,15626,26000,27281) },
- { AOM_CDF5(9988,12791,24073,25295) },
- { AOM_CDF5(8529,9202,18853,19751) },
- },
- { // Band 2
- { AOM_CDF5(26497,27282,32016,32333) },
- { AOM_CDF5(22767,24548,31680,32007) },
- { AOM_CDF5(10455,13458,26448,26995) },
- { AOM_CDF5(3684,4847,20940,21522) },
- { AOM_CDF5(9063,11155,17430,19521) },
- { AOM_CDF5(6554,11469,16384,21299) },
- },
- { // Band 3
- { AOM_CDF5(26212,26755,32090,32400) },
- { AOM_CDF5(22239,23123,31406,31725) },
- { AOM_CDF5(7220,7609,22715,22993) },
- { AOM_CDF5(5554,6387,11941,12774) },
- { AOM_CDF5(4915,9830,19661,24576) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(28796,29237,32134,32446) },
- { AOM_CDF5(25912,26456,32010,32321) },
- { AOM_CDF5(14399,14668,26039,26309) },
- { AOM_CDF5(2341,4096,11703,13458) },
- { AOM_CDF5(6144,12288,20480,26624) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(30253,30635,32016,32330) },
- { AOM_CDF5(23066,23485,30571,30897) },
- { AOM_CDF5(11664,12092,22146,22496) },
- { AOM_CDF5(5932,6387,17131,17470) },
- { AOM_CDF5(5501,5846,15763,16097) },
- { AOM_CDF5(4946,6801,14838,16693) },
- },
- },
- },
- },
-};
-
-static const coeff_cdf_model
-av1_default_coef_head_cdfs_q1[TX_SIZES][PLANE_TYPES] = {
- { // TX 4X4
- { // Y plane
- { // Intra
- { // Band 0
- { AOM_CDF6(21480,22344,27339,29181,29765) },
- { AOM_CDF6(9705,12374,20269,24109,25071) },
- { AOM_CDF6(2883,6716,10461,16169,17355) },
- },
- { // Band 1
- { AOM_CDF5(8632,15472,26027,26596) },
- { AOM_CDF5(8543,14383,25665,26207) },
- { AOM_CDF5(8561,12583,22962,23529) },
- { AOM_CDF5(6538,8023,18106,18672) },
- { AOM_CDF5(4363,4797,12512,12937) },
- { AOM_CDF5(2471,2791,7274,7605) },
- },
- { // Band 2
- { AOM_CDF5(14783,18891,29122,29700) },
- { AOM_CDF5(11829,16696,28114,28591) },
- { AOM_CDF5(8965,11076,23514,24031) },
- { AOM_CDF5(6257,7011,17779,18315) },
- { AOM_CDF5(4329,4704,12448,12839) },
- { AOM_CDF5(2542,2860,7886,8207) },
- },
- { // Band 3
- { AOM_CDF5(19181,22038,30697,31106) },
- { AOM_CDF5(12174,17208,28897,29328) },
- { AOM_CDF5(8420,10706,23788,24321) },
- { AOM_CDF5(6153,6850,17983,18530) },
- { AOM_CDF5(4168,4524,12547,12983) },
- { AOM_CDF5(3136,3480,9221,9659) },
- },
- { // Band 4
- { AOM_CDF5(18701,23907,31282,31695) },
- { AOM_CDF5(12655,19258,29824,30279) },
- { AOM_CDF5(8699,11467,24763,25450) },
- { AOM_CDF5(6268,7027,18397,19102) },
- { AOM_CDF5(5613,6020,14084,14637) },
- { AOM_CDF5(2443,2919,8222,8639) },
- },
- { // Band 5
- { AOM_CDF5(6156,23586,30739,31476) },
- { AOM_CDF5(6056,21852,29323,30442) },
- { AOM_CDF5(6113,14408,24331,26899) },
- { AOM_CDF5(5825,9328,18946,22143) },
- { AOM_CDF5(5023,6340,14812,17429) },
- { AOM_CDF5(5140,6104,11565,14135) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(12606,20577,21354,29249,29714) },
- { AOM_CDF6(8630,17728,19353,27722,28219) },
- { AOM_CDF6(3040,12616,14286,23918,24539) },
- },
- { // Band 1
- { AOM_CDF5(20824,21610,31110,31445) },
- { AOM_CDF5(15597,17692,29670,30015) },
- { AOM_CDF5(8954,10007,23515,23902) },
- { AOM_CDF5(6693,7282,18144,18537) },
- { AOM_CDF5(4048,4451,12255,12626) },
- { AOM_CDF5(2619,2960,7084,7429) },
- },
- { // Band 2
- { AOM_CDF5(21628,22786,31520,31865) },
- { AOM_CDF5(15854,17925,29872,30228) },
- { AOM_CDF5(8120,8815,22575,22964) },
- { AOM_CDF5(5006,5427,15724,16101) },
- { AOM_CDF5(2967,3311,9553,9913) },
- { AOM_CDF5(2878,3188,5418,5825) },
- },
- { // Band 3
- { AOM_CDF5(21594,23721,31496,31872) },
- { AOM_CDF5(15704,18452,30207,30585) },
- { AOM_CDF5(8637,9546,23803,24254) },
- { AOM_CDF5(5991,6479,17619,18099) },
- { AOM_CDF5(3856,4220,11623,12111) },
- { AOM_CDF5(3501,3825,6760,7246) },
- },
- { // Band 4
- { AOM_CDF5(19929,23849,31581,31956) },
- { AOM_CDF5(14239,19461,30323,30761) },
- { AOM_CDF5(8094,9844,23595,24338) },
- { AOM_CDF5(5204,5848,16396,17121) },
- { AOM_CDF5(3568,3961,10658,11301) },
- { AOM_CDF5(1594,1913,5552,6040) },
- },
- { // Band 5
- { AOM_CDF5(13512,24112,31648,32057) },
- { AOM_CDF5(10595,22378,30592,31236) },
- { AOM_CDF5(7571,13305,24936,26656) },
- { AOM_CDF5(6163,8207,18688,20500) },
- { AOM_CDF5(3185,4449,13298,14707) },
- { AOM_CDF5(1890,2731,7562,8192) },
- },
- },
- },
- { // UV plane
- { // Intra
- { // Band 0
- { AOM_CDF6(26689,27259,30590,31538,31930) },
- { AOM_CDF6(17843,19709,27299,29813,30435) },
- { AOM_CDF6(9138,13232,20487,25798,26794) },
- },
- { // Band 1
- { AOM_CDF5(13264,22970,30914,31354) },
- { AOM_CDF5(11647,20651,30191,30692) },
- { AOM_CDF5(10449,15871,27240,27909) },
- { AOM_CDF5(7759,9400,22161,22812) },
- { AOM_CDF5(4095,4544,13856,14309) },
- { AOM_CDF5(3199,3509,8639,8964) },
- },
- { // Band 2
- { AOM_CDF5(18180,25717,31446,31899) },
- { AOM_CDF5(14593,22211,30845,31282) },
- { AOM_CDF5(10443,13816,27239,27789) },
- { AOM_CDF5(6760,7698,19648,20234) },
- { AOM_CDF5(3896,4253,12678,13056) },
- { AOM_CDF5(5461,6722,13443,14704) },
- },
- { // Band 3
- { AOM_CDF5(22145,27566,31813,32212) },
- { AOM_CDF5(15241,23215,31215,31658) },
- { AOM_CDF5(11148,15527,28336,28891) },
- { AOM_CDF5(8864,10402,24069,24811) },
- { AOM_CDF5(6919,7527,19607,20260) },
- { AOM_CDF5(5174,10348,18971,25869) },
- },
- { // Band 4
- { AOM_CDF5(18795,27901,31907,32272) },
- { AOM_CDF5(13177,24166,31395,31820) },
- { AOM_CDF5(9217,15410,28101,28868) },
- { AOM_CDF5(6328,8749,21695,22954) },
- { AOM_CDF5(15672,17809,22795,24932) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(9431,28094,31965,32338) },
- { AOM_CDF5(8107,26038,31393,32024) },
- { AOM_CDF5(9347,19880,28342,29759) },
- { AOM_CDF5(7092,13694,25432,28366) },
- { AOM_CDF5(7802,12483,21845,26526) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(29212,29998,31256,32035,32360) },
- { AOM_CDF6(19150,23189,28117,31168,31611) },
- { AOM_CDF6(9324,18178,23556,29422,30204) },
- },
- { // Band 1
- { AOM_CDF5(20406,26462,31971,32298) },
- { AOM_CDF5(15834,22647,31547,31902) },
- { AOM_CDF5(11047,15431,27825,28393) },
- { AOM_CDF5(8665,11083,22493,23423) },
- { AOM_CDF5(6191,7733,16624,17708) },
- { AOM_CDF5(3210,3875,10937,11867) },
- },
- { // Band 2
- { AOM_CDF5(21520,27152,31994,32324) },
- { AOM_CDF5(17519,23609,31670,32022) },
- { AOM_CDF5(10647,14610,28389,28873) },
- { AOM_CDF5(7660,10704,22849,23680) },
- { AOM_CDF5(5535,6454,17275,17753) },
- { AOM_CDF5(4096,6144,13653,15701) },
- },
- { // Band 3
- { AOM_CDF5(22487,27996,32020,32381) },
- { AOM_CDF5(17371,24453,31777,32152) },
- { AOM_CDF5(11366,16072,29193,29761) },
- { AOM_CDF5(12545,13869,24642,25603) },
- { AOM_CDF5(4119,5056,16103,17601) },
- { AOM_CDF5(6144,12288,18432,24576) },
- },
- { // Band 4
- { AOM_CDF5(19350,28517,32050,32401) },
- { AOM_CDF5(14752,25831,31897,32261) },
- { AOM_CDF5(11157,20816,29821,30635) },
- { AOM_CDF5(8157,9691,22868,23705) },
- { AOM_CDF5(8192,10650,17203,19661) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(15557,29043,32047,32424) },
- { AOM_CDF5(10253,27948,31922,32329) },
- { AOM_CDF5(7797,18860,28870,30661) },
- { AOM_CDF5(5617,11235,27151,29959) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- },
- },
- { // TX 8X8
- { // Y plane
- { // Intra
- { // Band 0
- { AOM_CDF6(20585,21554,27179,28995,30170) },
- { AOM_CDF6(6316,8987,15571,19766,21417) },
- { AOM_CDF6(1426,4693,6721,11940,12874) },
- },
- { // Band 1
- { AOM_CDF5(10177,14297,24926,25396) },
- { AOM_CDF5(8812,13381,24128,24649) },
- { AOM_CDF5(8090,11314,21329,21906) },
- { AOM_CDF5(6324,7511,17212,17717) },
- { AOM_CDF5(4272,4718,12016,12415) },
- { AOM_CDF5(2129,2445,6433,6755) },
- },
- { // Band 2
- { AOM_CDF5(15709,18339,28174,28566) },
- { AOM_CDF5(12592,15866,27071,27475) },
- { AOM_CDF5(9361,10768,22752,23166) },
- { AOM_CDF5(6525,7048,17478,17863) },
- { AOM_CDF5(4314,4656,12242,12579) },
- { AOM_CDF5(2419,2735,7387,7707) },
- },
- { // Band 3
- { AOM_CDF5(20453,22253,29963,30329) },
- { AOM_CDF5(14090,16483,27992,28355) },
- { AOM_CDF5(8737,9396,22134,22499) },
- { AOM_CDF5(5543,5904,15783,16122) },
- { AOM_CDF5(3358,3677,10362,10680) },
- { AOM_CDF5(1875,2187,5982,6294) },
- },
- { // Band 4
- { AOM_CDF5(23693,25306,31174,31516) },
- { AOM_CDF5(14804,16843,28713,29058) },
- { AOM_CDF5(8442,8976,22003,22353) },
- { AOM_CDF5(5397,5741,15529,15867) },
- { AOM_CDF5(3322,3639,10248,10570) },
- { AOM_CDF5(1852,2161,5980,6290) },
- },
- { // Band 5
- { AOM_CDF5(24219,26214,31501,31844) },
- { AOM_CDF5(15202,17709,29450,29807) },
- { AOM_CDF5(9044,9603,23134,23506) },
- { AOM_CDF5(5849,6187,16695,17032) },
- { AOM_CDF5(3734,4050,11408,11727) },
- { AOM_CDF5(1898,2201,6126,6430) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(10195,21186,23530,29551,30281) },
- { AOM_CDF6(3950,15607,18726,26764,27758) },
- { AOM_CDF6(942,11209,12954,22126,23296) },
- },
- { // Band 1
- { AOM_CDF5(24110,24717,31199,31532) },
- { AOM_CDF5(16869,18762,29600,29951) },
- { AOM_CDF5(10702,12122,25122,25503) },
- { AOM_CDF5(8221,9053,20816,21206) },
- { AOM_CDF5(5635,6244,15801,16186) },
- { AOM_CDF5(3776,4210,10380,10766) },
- },
- { // Band 2
- { AOM_CDF5(24719,25439,31522,31849) },
- { AOM_CDF5(16693,18162,29698,30036) },
- { AOM_CDF5(9340,10024,23513,23867) },
- { AOM_CDF5(6269,6709,17711,18060) },
- { AOM_CDF5(3841,4185,11892,12230) },
- { AOM_CDF5(1944,2259,6437,6776) },
- },
- { // Band 3
- { AOM_CDF5(25795,26524,31784,32108) },
- { AOM_CDF5(17514,18812,30221,30557) },
- { AOM_CDF5(9099,9576,23502,23843) },
- { AOM_CDF5(5738,6097,16847,17182) },
- { AOM_CDF5(3411,3730,10729,11057) },
- { AOM_CDF5(1282,1591,4705,5013) },
- },
- { // Band 4
- { AOM_CDF5(26360,27205,31918,32240) },
- { AOM_CDF5(18465,19729,30758,31089) },
- { AOM_CDF5(9488,9915,24339,24678) },
- { AOM_CDF5(5812,6156,17325,17661) },
- { AOM_CDF5(3739,4065,10932,11265) },
- { AOM_CDF5(1391,1700,4764,5073) },
- },
- { // Band 5
- { AOM_CDF5(27036,28212,31970,32305) },
- { AOM_CDF5(18634,21073,31116,31477) },
- { AOM_CDF5(9822,10441,24990,25437) },
- { AOM_CDF5(6130,6530,17790,18269) },
- { AOM_CDF5(3725,4044,11127,11602) },
- { AOM_CDF5(1298,1573,4642,5075) },
- },
- },
- },
- { // UV plane
- { // Intra
- { // Band 0
- { AOM_CDF6(23042,23702,30487,31370,31898) },
- { AOM_CDF6(15512,17357,27018,29404,30377) },
- { AOM_CDF6(8935,12713,20545,25580,26931) },
- },
- { // Band 1
- { AOM_CDF5(15021,24086,30796,31272) },
- { AOM_CDF5(13040,21866,30054,30686) },
- { AOM_CDF5(10915,16852,27467,28235) },
- { AOM_CDF5(8096,10403,22531,23355) },
- { AOM_CDF5(4485,5020,13360,13816) },
- { AOM_CDF5(1728,2067,5998,6337) },
- },
- { // Band 2
- { AOM_CDF5(20845,25929,31278,31670) },
- { AOM_CDF5(15553,21602,30338,30745) },
- { AOM_CDF5(10953,13829,26398,26854) },
- { AOM_CDF5(7900,8858,20869,21378) },
- { AOM_CDF5(5225,5579,13764,14087) },
- { AOM_CDF5(1881,2352,6742,7212) },
- },
- { // Band 3
- { AOM_CDF5(25402,28169,31825,32169) },
- { AOM_CDF5(17086,21375,30582,30951) },
- { AOM_CDF5(11057,12358,25930,26346) },
- { AOM_CDF5(6989,7448,18814,19143) },
- { AOM_CDF5(4476,4752,16025,16301) },
- { AOM_CDF5(2185,4369,12379,14564) },
- },
- { // Band 4
- { AOM_CDF5(26444,28656,31864,32231) },
- { AOM_CDF5(17642,20848,30615,30967) },
- { AOM_CDF5(10973,11732,25256,25612) },
- { AOM_CDF5(8325,8726,19826,20146) },
- { AOM_CDF5(5294,5568,14056,14330) },
- { AOM_CDF5(5461,10923,18204,23666) },
- },
- { // Band 5
- { AOM_CDF5(27760,29748,31934,32299) },
- { AOM_CDF5(17133,21599,30800,31243) },
- { AOM_CDF5(12224,13907,26992,27546) },
- { AOM_CDF5(9221,9617,21845,22162) },
- { AOM_CDF5(5401,6482,18004,19085) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(29286,29932,31576,32075,32408) },
- { AOM_CDF6(17969,21693,28937,30945,31682) },
- { AOM_CDF6(6607,16160,23280,27595,30027) },
- },
- { // Band 1
- { AOM_CDF5(24724,28333,32022,32346) },
- { AOM_CDF5(18803,24728,31661,32022) },
- { AOM_CDF5(14179,20757,30098,30633) },
- { AOM_CDF5(12564,17179,27133,28080) },
- { AOM_CDF5(10543,13479,23725,25031) },
- { AOM_CDF5(11377,12741,21923,22888) },
- },
- { // Band 2
- { AOM_CDF5(26071,28609,32053,32374) },
- { AOM_CDF5(20389,24820,31690,32027) },
- { AOM_CDF5(12977,16892,29053,29445) },
- { AOM_CDF5(8745,12303,24164,25209) },
- { AOM_CDF5(4042,5052,18333,18910) },
- { AOM_CDF5(5461,9557,13653,17749) },
- },
- { // Band 3
- { AOM_CDF5(27936,29582,32107,32422) },
- { AOM_CDF5(22472,25761,31858,32177) },
- { AOM_CDF5(14107,16587,29250,29692) },
- { AOM_CDF5(10726,11739,23985,24576) },
- { AOM_CDF5(5825,8010,18204,20389) },
- { AOM_CDF5(8192,14336,20480,26624) },
- },
- { // Band 4
- { AOM_CDF5(27066,29025,31972,32338) },
- { AOM_CDF5(20639,23330,31616,31985) },
- { AOM_CDF5(13468,15091,29902,30243) },
- { AOM_CDF5(14473,15019,24030,24439) },
- { AOM_CDF5(7864,11796,19661,23593) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(28741,30503,32039,32388) },
- { AOM_CDF5(19712,25328,31621,32049) },
- { AOM_CDF5(13461,17167,29712,30308) },
- { AOM_CDF5(10285,11242,27267,28224) },
- { AOM_CDF5(5174,10348,17246,22420) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- },
- },
- { // TX 16X16
- { // Y plane
- { // Intra
- { // Band 0
- { AOM_CDF6(4353,7056,15884,20594,24026) },
- { AOM_CDF6(2397,5417,9610,14451,16689) },
- { AOM_CDF6(841,3543,4598,9149,9950) },
- },
- { // Band 1
- { AOM_CDF5(8763,11845,22684,23211) },
- { AOM_CDF5(8074,12129,22232,22924) },
- { AOM_CDF5(7453,10017,19822,20662) },
- { AOM_CDF5(5825,6998,16346,16952) },
- { AOM_CDF5(4059,4481,11444,11852) },
- { AOM_CDF5(1973,2289,5827,6149) },
- },
- { // Band 2
- { AOM_CDF5(15272,17017,26959,27346) },
- { AOM_CDF5(12476,14916,26163,26575) },
- { AOM_CDF5(9485,10720,22557,22973) },
- { AOM_CDF5(6821,7342,17484,17858) },
- { AOM_CDF5(4370,4714,12030,12366) },
- { AOM_CDF5(2375,2688,6850,7162) },
- },
- { // Band 3
- { AOM_CDF5(19929,21244,29489,29829) },
- { AOM_CDF5(14005,16066,27595,27947) },
- { AOM_CDF5(8918,9550,22126,22488) },
- { AOM_CDF5(5741,6095,16004,16340) },
- { AOM_CDF5(3558,3873,10340,10657) },
- { AOM_CDF5(1822,2134,5530,5843) },
- },
- { // Band 4
- { AOM_CDF5(23568,24663,30915,31245) },
- { AOM_CDF5(15139,16577,28661,28997) },
- { AOM_CDF5(8850,9259,22366,22700) },
- { AOM_CDF5(5454,5781,15617,15937) },
- { AOM_CDF5(3315,3629,10044,10359) },
- { AOM_CDF5(1736,2047,5698,6009) },
- },
- { // Band 5
- { AOM_CDF5(27011,27875,31721,32046) },
- { AOM_CDF5(16855,18018,29676,30005) },
- { AOM_CDF5(8916,9282,22431,22760) },
- { AOM_CDF5(5391,5710,15343,15662) },
- { AOM_CDF5(3316,3629,10223,10537) },
- { AOM_CDF5(1891,2202,6076,6387) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(5744,15508,23294,28653,30781) },
- { AOM_CDF6(2130,11786,17337,24444,27499) },
- { AOM_CDF6(615,8230,10191,18291,21029) },
- },
- { // Band 1
- { AOM_CDF5(25149,25880,31110,31453) },
- { AOM_CDF5(17454,20460,29560,29929) },
- { AOM_CDF5(11724,14294,25947,26377) },
- { AOM_CDF5(9198,10981,22357,22857) },
- { AOM_CDF5(7164,8069,18345,18857) },
- { AOM_CDF5(5833,6316,14661,15073) },
- },
- { // Band 2
- { AOM_CDF5(26117,26928,31526,31850) },
- { AOM_CDF5(16540,18394,29402,29740) },
- { AOM_CDF5(9908,10886,23865,24223) },
- { AOM_CDF5(6805,7383,18402,18777) },
- { AOM_CDF5(4259,4638,12791,13136) },
- { AOM_CDF5(2274,2584,7391,7713) },
- },
- { // Band 3
- { AOM_CDF5(27129,27797,31745,32063) },
- { AOM_CDF5(17255,18663,29815,30145) },
- { AOM_CDF5(9538,10091,23590,23931) },
- { AOM_CDF5(6366,6732,17467,17800) },
- { AOM_CDF5(3701,4018,11326,11652) },
- { AOM_CDF5(1976,2284,6325,6633) },
- },
- { // Band 4
- { AOM_CDF5(27944,28479,31894,32211) },
- { AOM_CDF5(18032,18997,30130,30452) },
- { AOM_CDF5(9467,9842,23729,24051) },
- { AOM_CDF5(5900,6226,16797,17116) },
- { AOM_CDF5(3282,3595,10418,10730) },
- { AOM_CDF5(2289,2601,6048,6360) },
- },
- { // Band 5
- { AOM_CDF5(29278,29837,32038,32360) },
- { AOM_CDF5(19805,20846,31007,31343) },
- { AOM_CDF5(9976,10433,24483,24848) },
- { AOM_CDF5(5971,6354,17184,17539) },
- { AOM_CDF5(3497,4693,11940,12291) },
- { AOM_CDF5(1776,2357,6260,6918) },
- },
- },
- },
- { // UV plane
- { // Intra
- { // Band 0
- { AOM_CDF6(23166,23821,30269,31075,31847) },
- { AOM_CDF6(14510,16494,25635,28335,29759) },
- { AOM_CDF6(7730,12354,18089,24005,25442) },
- },
- { // Band 1
- { AOM_CDF5(17908,24824,30533,31042) },
- { AOM_CDF5(13950,22899,29969,30646) },
- { AOM_CDF5(11728,17834,27214,28218) },
- { AOM_CDF5(9581,12074,23689,24616) },
- { AOM_CDF5(6193,6855,16430,16955) },
- { AOM_CDF5(3393,3712,8802,9226) },
- },
- { // Band 2
- { AOM_CDF5(23368,26826,31183,31579) },
- { AOM_CDF5(16523,21603,30044,30503) },
- { AOM_CDF5(11171,14152,27009,27644) },
- { AOM_CDF5(8523,9348,21021,21595) },
- { AOM_CDF5(4780,5196,13440,13786) },
- { AOM_CDF5(4328,5255,10820,11747) },
- },
- { // Band 3
- { AOM_CDF5(27020,28644,31643,31990) },
- { AOM_CDF5(18016,21678,30346,30712) },
- { AOM_CDF5(10497,11555,24827,25156) },
- { AOM_CDF5(6370,6703,18612,18903) },
- { AOM_CDF5(5355,5738,14790,15173) },
- { AOM_CDF5(3486,5578,11155,13247) },
- },
- { // Band 4
- { AOM_CDF5(28933,29746,31882,32203) },
- { AOM_CDF5(18171,20286,29713,30052) },
- { AOM_CDF5(9732,10163,23952,24275) },
- { AOM_CDF5(6084,6480,17459,17771) },
- { AOM_CDF5(3250,3656,10291,10697) },
- { AOM_CDF5(4681,8192,15214,18725) },
- },
- { // Band 5
- { AOM_CDF5(29940,30510,31933,32260) },
- { AOM_CDF5(17688,19258,29757,30125) },
- { AOM_CDF5(9668,10798,24231,24605) },
- { AOM_CDF5(7580,7942,19364,19692) },
- { AOM_CDF5(6043,6446,15578,15981) },
- { AOM_CDF5(5783,11565,21203,26985) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(28553,29151,31521,32038,32413) },
- { AOM_CDF6(15138,19554,27559,29750,31321) },
- { AOM_CDF6(3406,18680,23310,27259,30430) },
- },
- { // Band 1
- { AOM_CDF5(29000,30219,32098,32414) },
- { AOM_CDF5(21324,25278,31789,32126) },
- { AOM_CDF5(14011,21190,30288,30900) },
- { AOM_CDF5(12762,18476,27140,28461) },
- { AOM_CDF5(11498,14867,24806,25613) },
- { AOM_CDF5(15872,16512,24192,25088) },
- },
- { // Band 2
- { AOM_CDF5(29308,30286,32095,32410) },
- { AOM_CDF5(21819,24215,31771,32103) },
- { AOM_CDF5(14853,18028,29729,30160) },
- { AOM_CDF5(10598,13400,26555,27043) },
- { AOM_CDF5(10426,12660,21597,23831) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 3
- { AOM_CDF5(29866,30588,32131,32445) },
- { AOM_CDF5(23473,25323,31960,32280) },
- { AOM_CDF5(17529,19173,30278,30577) },
- { AOM_CDF5(9830,11469,23484,25122) },
- { AOM_CDF5(6144,12288,20480,26624) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(30405,31032,32139,32451) },
- { AOM_CDF5(25453,27199,32040,32361) },
- { AOM_CDF5(15663,16432,30654,31038) },
- { AOM_CDF5(6780,10169,18079,21469) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(29785,30368,31904,32245) },
- { AOM_CDF5(18173,21111,30105,30575) },
- { AOM_CDF5(8476,13666,28420,28896) },
- { AOM_CDF5(11427,12066,26197,26691) },
- { AOM_CDF5(6827,10923,21845,25941) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- },
- },
- { // TX 32X32
- { // Y plane
- { // Intra
- { // Band 0
- { AOM_CDF6(7848,9841,13623,19351,23196) },
- { AOM_CDF6(3229,5641,7103,13195,15046) },
- { AOM_CDF6(810,3129,3687,8373,8971) },
- },
- { // Band 1
- { AOM_CDF5(8165,12626,22213,23403) },
- { AOM_CDF5(7602,15378,23248,24331) },
- { AOM_CDF5(5607,10197,18657,20616) },
- { AOM_CDF5(4498,6539,14461,16104) },
- { AOM_CDF5(3387,4098,10245,11322) },
- { AOM_CDF5(1793,2111,5262,5646) },
- },
- { // Band 2
- { AOM_CDF5(16815,19141,27640,28110) },
- { AOM_CDF5(13156,15592,26089,26592) },
- { AOM_CDF5(9841,11588,22858,23403) },
- { AOM_CDF5(7765,8871,19127,19526) },
- { AOM_CDF5(5550,6013,14338,14677) },
- { AOM_CDF5(2658,2969,7230,7541) },
- },
- { // Band 3
- { AOM_CDF5(22765,24278,30194,30535) },
- { AOM_CDF5(15310,17292,27870,28248) },
- { AOM_CDF5(10047,10839,23345,23710) },
- { AOM_CDF5(6594,6959,17456,17796) },
- { AOM_CDF5(3784,4109,10984,11297) },
- { AOM_CDF5(1569,1875,4586,4892) },
- },
- { // Band 4
- { AOM_CDF5(25747,26817,31236,31577) },
- { AOM_CDF5(16018,17720,28833,29219) },
- { AOM_CDF5(9348,10015,22943,23323) },
- { AOM_CDF5(5841,6167,15774,16107) },
- { AOM_CDF5(3385,3703,9664,9975) },
- { AOM_CDF5(1460,1768,4704,5011) },
- },
- { // Band 5
- { AOM_CDF5(29634,30134,31898,32218) },
- { AOM_CDF5(16976,17856,29258,29584) },
- { AOM_CDF5(8521,8858,21252,21574) },
- { AOM_CDF5(4894,5208,13957,14271) },
- { AOM_CDF5(3140,3452,9099,9411) },
- { AOM_CDF5(1770,2080,5241,5551) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(22253,23279,24319,27691,30884) },
- { AOM_CDF6(6281,8348,9473,15740,24879) },
- { AOM_CDF6(1265,3893,4482,9694,18376) },
- },
- { // Band 1
- { AOM_CDF5(17243,18993,28515,29242) },
- { AOM_CDF5(15645,23632,29905,30416) },
- { AOM_CDF5(11203,18441,27037,27930) },
- { AOM_CDF5(9306,13788,23647,24669) },
- { AOM_CDF5(8076,10237,20500,21437) },
- { AOM_CDF5(7214,8133,17608,18202) },
- },
- { // Band 2
- { AOM_CDF5(23555,26147,31229,31581) },
- { AOM_CDF5(16046,20455,29711,30107) },
- { AOM_CDF5(10810,14014,25967,26499) },
- { AOM_CDF5(8267,9930,21704,22244) },
- { AOM_CDF5(5637,6282,15954,16508) },
- { AOM_CDF5(4090,4363,11771,12044) },
- },
- { // Band 3
- { AOM_CDF5(26146,27425,31658,31983) },
- { AOM_CDF5(17486,20295,30279,30621) },
- { AOM_CDF5(10812,12230,26095,26460) },
- { AOM_CDF5(7510,8042,21058,21425) },
- { AOM_CDF5(4566,4916,13594,13891) },
- { AOM_CDF5(1956,2445,5380,5869) },
- },
- { // Band 4
- { AOM_CDF5(28423,29253,31959,32277) },
- { AOM_CDF5(18711,20638,30445,30777) },
- { AOM_CDF5(10301,10903,24702,25060) },
- { AOM_CDF5(6531,6885,18215,18535) },
- { AOM_CDF5(3965,4265,11701,12023) },
- { AOM_CDF5(3255,3906,8897,9548) },
- },
- { // Band 5
- { AOM_CDF5(29905,30382,32053,32369) },
- { AOM_CDF5(19724,20376,30778,31101) },
- { AOM_CDF5(10430,10786,24620,24943) },
- { AOM_CDF5(6151,6475,17188,17504) },
- { AOM_CDF5(3728,4034,11352,11658) },
- { AOM_CDF5(1456,1748,5024,5316) },
- },
- },
- },
- { // UV plane
- { // Intra
- { // Band 0
- { AOM_CDF6(24883,25616,27995,29251,31055) },
- { AOM_CDF6(9802,11841,18691,22179,26383) },
- { AOM_CDF6(4096,7928,14072,21042,23453) },
- },
- { // Band 1
- { AOM_CDF5(10363,20924,29116,29906) },
- { AOM_CDF5(10682,22326,29093,29642) },
- { AOM_CDF5(10304,21073,26843,28904) },
- { AOM_CDF5(6138,13221,22475,25119) },
- { AOM_CDF5(3788,4356,10607,12690) },
- { AOM_CDF5(1950,4291,10923,12873) },
- },
- { // Band 2
- { AOM_CDF5(21958,27093,30741,31349) },
- { AOM_CDF5(18725,23406,30541,31268) },
- { AOM_CDF5(15634,17134,26450,27092) },
- { AOM_CDF5(10012,11287,24758,25304) },
- { AOM_CDF5(6242,7802,19895,21065) },
- { AOM_CDF5(4096,8192,16384,20480) },
- },
- { // Band 3
- { AOM_CDF5(26587,27934,31817,32094) },
- { AOM_CDF5(20234,22651,30576,30857) },
- { AOM_CDF5(13405,14708,26624,27183) },
- { AOM_CDF5(9132,11281,19876,21487) },
- { AOM_CDF5(5174,10348,15522,20696) },
- { AOM_CDF5(5783,11565,19275,25058) },
- },
- { // Band 4
- { AOM_CDF5(28277,29312,32101,32400) },
- { AOM_CDF5(18946,23037,31186,31565) },
- { AOM_CDF5(14043,14980,29491,30193) },
- { AOM_CDF5(9638,12529,21203,24094) },
- { AOM_CDF5(6554,11469,18022,22938) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(31039,31404,32048,32372) },
- { AOM_CDF5(20567,21869,28724,29256) },
- { AOM_CDF5(10000,11250,22768,23393) },
- { AOM_CDF5(6291,7078,20447,21234) },
- { AOM_CDF5(3072,6144,18432,21504) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(23448,25882,29692,31272,32065) },
- { AOM_CDF6(4276,17832,22156,28463,30374) },
- { AOM_CDF6(842,20937,22447,28559,30333) },
- },
- { // Band 1
- { AOM_CDF5(30469,30991,32114,32435) },
- { AOM_CDF5(27295,29153,31917,32269) },
- { AOM_CDF5(16309,22060,29937,30686) },
- { AOM_CDF5(11440,16853,26633,27427) },
- { AOM_CDF5(13069,15405,27401,28033) },
- { AOM_CDF5(9084,10058,23197,23684) },
- },
- { // Band 2
- { AOM_CDF5(30728,31202,32138,32450) },
- { AOM_CDF5(23421,26186,31939,32278) },
- { AOM_CDF5(12249,15027,28348,28854) },
- { AOM_CDF5(5667,6899,22174,23652) },
- { AOM_CDF5(8192,10650,17203,20480) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 3
- { AOM_CDF5(30721,31093,32141,32453) },
- { AOM_CDF5(24052,25175,31923,32231) },
- { AOM_CDF5(8145,9281,27654,28412) },
- { AOM_CDF5(7373,9830,21299,23757) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(31284,31621,32143,32455) },
- { AOM_CDF5(27783,28563,32045,32361) },
- { AOM_CDF5(10149,12179,28128,28998) },
- { AOM_CDF5(5650,9039,19209,22599) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(31038,31383,32035,32357) },
- { AOM_CDF5(20689,22001,28880,29479) },
- { AOM_CDF5(7827,10613,24141,24735) },
- { AOM_CDF5(8021,8585,22014,22383) },
- { AOM_CDF5(6047,6350,19918,20220) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- },
- },
-};
-
-static const coeff_cdf_model
-av1_default_coef_head_cdfs_q2[TX_SIZES][PLANE_TYPES] = {
- { // TX 4X4
- { // Y plane
- { // Intra
- { // Band 0
- { AOM_CDF6(23035,23799,27745,29607,30130) },
- { AOM_CDF6(12409,14763,22883,26775,27649) },
- { AOM_CDF6(5237,9433,15597,21779,23224) },
- },
- { // Band 1
- { AOM_CDF5(10424,17678,28850,29349) },
- { AOM_CDF5(10376,16902,28779,29265) },
- { AOM_CDF5(10166,14387,26253,26807) },
- { AOM_CDF5(8474,9927,22092,22697) },
- { AOM_CDF5(6415,6911,17155,17579) },
- { AOM_CDF5(4611,4928,12174,12497) },
- },
- { // Band 2
- { AOM_CDF5(16984,21802,30901,31373) },
- { AOM_CDF5(14003,19369,30193,30615) },
- { AOM_CDF5(10729,13233,26938,27455) },
- { AOM_CDF5(8604,9526,22436,22989) },
- { AOM_CDF5(6828,7236,18056,18456) },
- { AOM_CDF5(4302,4555,12209,12462) },
- },
- { // Band 3
- { AOM_CDF5(20261,24381,31612,31989) },
- { AOM_CDF5(13775,20449,30685,31111) },
- { AOM_CDF5(10459,13768,27504,28114) },
- { AOM_CDF5(7994,8989,22906,23636) },
- { AOM_CDF5(5928,6460,16884,17720) },
- { AOM_CDF5(4520,7910,12429,16949) },
- },
- { // Band 4
- { AOM_CDF5(17822,26021,31751,32150) },
- { AOM_CDF5(13484,23372,31305,31747) },
- { AOM_CDF5(11009,15469,28452,29132) },
- { AOM_CDF5(8358,9357,22412,23385) },
- { AOM_CDF5(9392,10018,18158,19202) },
- { AOM_CDF5(6144,12288,20480,26624) },
- },
- { // Band 5
- { AOM_CDF5(5236,26529,31709,32201) },
- { AOM_CDF5(5710,25925,31254,31967) },
- { AOM_CDF5(7645,19427,28170,29920) },
- { AOM_CDF5(7427,13350,23253,25438) },
- { AOM_CDF5(4681,6687,15381,18725) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(11176,18297,19062,28984,29496) },
- { AOM_CDF6(9778,17798,19934,28434,28921) },
- { AOM_CDF6(4806,14260,17259,26368,26942) },
- },
- { // Band 1
- { AOM_CDF5(21802,22916,31657,31989) },
- { AOM_CDF5(16874,20345,31048,31389) },
- { AOM_CDF5(10717,12576,26899,27294) },
- { AOM_CDF5(8468,9404,21928,22358) },
- { AOM_CDF5(5992,6521,16309,16729) },
- { AOM_CDF5(5134,5452,11491,11865) },
- },
- { // Band 2
- { AOM_CDF5(22003,24147,31841,32177) },
- { AOM_CDF5(17179,20593,31041,31394) },
- { AOM_CDF5(9282,10544,25698,26133) },
- { AOM_CDF5(6301,7013,19066,19557) },
- { AOM_CDF5(3845,4316,12209,12812) },
- { AOM_CDF5(4819,6746,11565,13011) },
- },
- { // Band 3
- { AOM_CDF5(22820,26023,31888,32236) },
- { AOM_CDF5(17130,21510,31268,31632) },
- { AOM_CDF5(10062,11898,26787,27281) },
- { AOM_CDF5(7681,8590,21264,22034) },
- { AOM_CDF5(4413,5143,13605,14712) },
- { AOM_CDF5(5461,10923,16384,21845) },
- },
- { // Band 4
- { AOM_CDF5(20237,25695,31868,32222) },
- { AOM_CDF5(15551,22658,31236,31659) },
- { AOM_CDF5(9584,12389,26347,27242) },
- { AOM_CDF5(6067,7231,19625,20707) },
- { AOM_CDF5(3724,4312,11269,12425) },
- { AOM_CDF5(4096,6554,9830,12288) },
- },
- { // Band 5
- { AOM_CDF5(11726,26639,31977,32340) },
- { AOM_CDF5(10754,25823,31568,32060) },
- { AOM_CDF5(8761,16650,27884,29394) },
- { AOM_CDF5(7387,9941,21377,23333) },
- { AOM_CDF5(2374,3799,16147,19471) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- },
- { // UV plane
- { // Intra
- { // Band 0
- { AOM_CDF6(29271,29645,31447,31951,32313) },
- { AOM_CDF6(22174,23288,29633,31096,31701) },
- { AOM_CDF6(13601,16603,25296,28966,30043) },
- },
- { // Band 1
- { AOM_CDF5(13850,26266,31653,32083) },
- { AOM_CDF5(11979,24610,31369,31810) },
- { AOM_CDF5(11325,18989,29109,29770) },
- { AOM_CDF5(9338,11892,25324,26115) },
- { AOM_CDF5(5725,6243,18483,18919) },
- { AOM_CDF5(6554,9830,16384,19661) },
- },
- { // Band 2
- { AOM_CDF5(18097,27765,31891,32286) },
- { AOM_CDF5(14735,24632,31577,31970) },
- { AOM_CDF5(11031,15675,29109,29716) },
- { AOM_CDF5(8859,9891,23909,24940) },
- { AOM_CDF5(7864,11796,20972,24904) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 3
- { AOM_CDF5(21057,29116,32033,32367) },
- { AOM_CDF5(15287,25704,31791,32151) },
- { AOM_CDF5(12927,18993,30815,31329) },
- { AOM_CDF5(13227,16234,27657,28860) },
- { AOM_CDF5(6899,12072,18971,25869) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(17688,28768,32140,32435) },
- { AOM_CDF5(13473,26360,31944,32307) },
- { AOM_CDF5(12653,18817,28875,30497) },
- { AOM_CDF5(5461,10923,20025,25486) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(6820,28765,31878,32323) },
- { AOM_CDF5(7737,28672,31972,32313) },
- { AOM_CDF5(11796,18350,24904,28836) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(30079,30525,31559,32085,32407) },
- { AOM_CDF6(22148,24035,29557,31423,31881) },
- { AOM_CDF6(13266,17717,26069,29825,30780) },
- },
- { // Band 1
- { AOM_CDF5(18219,27530,32048,32373) },
- { AOM_CDF5(14664,25532,31886,32244) },
- { AOM_CDF5(11683,19554,30330,30870) },
- { AOM_CDF5(9410,14238,25794,27268) },
- { AOM_CDF5(6629,9580,20186,22187) },
- { AOM_CDF5(2891,4337,11083,13493) },
- },
- { // Band 2
- { AOM_CDF5(20016,28471,32074,32401) },
- { AOM_CDF5(16915,26047,31965,32300) },
- { AOM_CDF5(10725,18206,30056,30606) },
- { AOM_CDF5(6883,13990,26334,27531) },
- { AOM_CDF5(11529,15170,22452,24879) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 3
- { AOM_CDF5(23488,29744,32117,32442) },
- { AOM_CDF5(17520,27259,32056,32389) },
- { AOM_CDF5(13107,20597,31416,32092) },
- { AOM_CDF5(20165,22686,26887,29407) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(17711,29963,32137,32452) },
- { AOM_CDF5(14078,28336,32026,32391) },
- { AOM_CDF5(11129,28749,30295,31222) },
- { AOM_CDF5(7447,13405,22342,26810) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(14413,30309,32090,32471) },
- { AOM_CDF5(11814,30354,32251,32509) },
- { AOM_CDF5(7282,12743,21845,27307) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- },
- },
- { // TX 8X8
- { // Y plane
- { // Intra
- { // Band 0
- { AOM_CDF6(16945,18241,25718,28152,29383) },
- { AOM_CDF6(7095,10051,18830,23174,24906) },
- { AOM_CDF6(2585,6677,10951,17411,18916) },
- },
- { // Band 1
- { AOM_CDF5(12894,17897,28218,28651) },
- { AOM_CDF5(11333,16802,27676,28153) },
- { AOM_CDF5(10166,13829,25072,25646) },
- { AOM_CDF5(8356,9772,21358,21912) },
- { AOM_CDF5(5988,6506,16203,16647) },
- { AOM_CDF5(3684,4012,10039,10367) },
- },
- { // Band 2
- { AOM_CDF5(18192,21044,30229,30597) },
- { AOM_CDF5(14976,18218,29191,29564) },
- { AOM_CDF5(10914,12508,25451,25857) },
- { AOM_CDF5(7970,8605,20619,21011) },
- { AOM_CDF5(5555,5926,15730,16091) },
- { AOM_CDF5(3522,3847,10567,10892) },
- },
- { // Band 3
- { AOM_CDF5(21896,23866,31136,31486) },
- { AOM_CDF5(15913,18331,29670,30019) },
- { AOM_CDF5(10158,10878,24664,25024) },
- { AOM_CDF5(6692,7070,18934,19267) },
- { AOM_CDF5(4603,4914,13724,14041) },
- { AOM_CDF5(2378,3171,7663,8456) },
- },
- { // Band 4
- { AOM_CDF5(24113,25740,31668,32000) },
- { AOM_CDF5(16618,18583,30173,30511) },
- { AOM_CDF5(10122,10666,24877,25222) },
- { AOM_CDF5(6721,7062,19250,19588) },
- { AOM_CDF5(4641,4957,13698,14021) },
- { AOM_CDF5(3324,4749,9498,10923) },
- },
- { // Band 5
- { AOM_CDF5(24933,27294,31876,32207) },
- { AOM_CDF5(17505,20214,30842,31189) },
- { AOM_CDF5(10756,11345,25989,26362) },
- { AOM_CDF5(7374,7763,19820,20160) },
- { AOM_CDF5(5003,5328,15420,15723) },
- { AOM_CDF5(4915,9830,18022,22938) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(7874,17174,19119,28514,29361) },
- { AOM_CDF6(3407,13628,16836,26723,27681) },
- { AOM_CDF6(1062,11514,14002,24081,25232) },
- },
- { // Band 1
- { AOM_CDF5(23614,24717,31593,31927) },
- { AOM_CDF5(18177,21581,30890,31234) },
- { AOM_CDF5(12535,14549,27749,28134) },
- { AOM_CDF5(9687,10712,23848,24271) },
- { AOM_CDF5(6461,7119,17940,18368) },
- { AOM_CDF5(3863,4245,10904,11278) },
- },
- { // Band 2
- { AOM_CDF5(24334,25912,31795,32120) },
- { AOM_CDF5(17964,20229,30726,31064) },
- { AOM_CDF5(10463,11527,25898,26256) },
- { AOM_CDF5(7431,8071,20542,20928) },
- { AOM_CDF5(4561,4995,13977,14347) },
- { AOM_CDF5(2427,2687,8149,8409) },
- },
- { // Band 3
- { AOM_CDF5(25888,27308,31957,32279) },
- { AOM_CDF5(18868,20992,31092,31424) },
- { AOM_CDF5(10480,11191,25801,26149) },
- { AOM_CDF5(6878,7326,19397,19762) },
- { AOM_CDF5(4235,4601,13182,13587) },
- { AOM_CDF5(3584,5120,11264,13312) },
- },
- { // Band 4
- { AOM_CDF5(26802,28181,32031,32349) },
- { AOM_CDF5(19661,21746,31360,31688) },
- { AOM_CDF5(10680,11361,26261,26610) },
- { AOM_CDF5(6811,7274,19689,20075) },
- { AOM_CDF5(4881,5230,11882,12324) },
- { AOM_CDF5(4096,6144,9557,11605) },
- },
- { // Band 5
- { AOM_CDF5(27511,29045,32051,32376) },
- { AOM_CDF5(19712,22596,31464,31813) },
- { AOM_CDF5(11035,11852,26626,27082) },
- { AOM_CDF5(7190,7674,20245,20794) },
- { AOM_CDF5(5114,5407,12895,13443) },
- { AOM_CDF5(5174,10348,15522,20696) },
- },
- },
- },
- { // UV plane
- { // Intra
- { // Band 0
- { AOM_CDF6(26201,26641,31158,31755,32200) },
- { AOM_CDF6(19651,20883,28935,30581,31426) },
- { AOM_CDF6(12456,15868,23727,27839,29216) },
- },
- { // Band 1
- { AOM_CDF5(16708,25600,31550,31927) },
- { AOM_CDF5(14533,24134,31151,31670) },
- { AOM_CDF5(12771,19041,29256,29926) },
- { AOM_CDF5(9497,12011,24856,25648) },
- { AOM_CDF5(6059,6512,17765,18218) },
- { AOM_CDF5(4498,6425,13493,15420) },
- },
- { // Band 2
- { AOM_CDF5(21314,26763,31645,32043) },
- { AOM_CDF5(16898,23241,31276,31667) },
- { AOM_CDF5(12339,16091,28493,28851) },
- { AOM_CDF5(8583,10033,23721,24359) },
- { AOM_CDF5(6801,7728,18857,19784) },
- { AOM_CDF5(6144,12288,18432,24576) },
- },
- { // Band 3
- { AOM_CDF5(25155,28551,31936,32273) },
- { AOM_CDF5(18054,22818,31343,31736) },
- { AOM_CDF5(12381,14088,27865,28300) },
- { AOM_CDF5(7853,8666,21665,22477) },
- { AOM_CDF5(6242,10923,15604,20285) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(26649,29334,32001,32345) },
- { AOM_CDF5(18410,22788,31465,31842) },
- { AOM_CDF5(12504,13480,28600,28955) },
- { AOM_CDF5(9175,10486,21845,23156) },
- { AOM_CDF5(7710,13493,21203,26985) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(27622,30399,32070,32399) },
- { AOM_CDF5(18214,24797,31688,32070) },
- { AOM_CDF5(14564,16894,28981,29564) },
- { AOM_CDF5(7802,12483,17164,21845) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(30040,30464,31682,32091,32421) },
- { AOM_CDF6(20770,22635,29889,31156,31909) },
- { AOM_CDF6(9112,13841,23864,27288,30322) },
- },
- { // Band 1
- { AOM_CDF5(23477,28240,32035,32360) },
- { AOM_CDF5(18183,26268,31861,32205) },
- { AOM_CDF5(14392,23052,30811,31315) },
- { AOM_CDF5(12579,20081,28411,29467) },
- { AOM_CDF5(9882,14796,25492,27040) },
- { AOM_CDF5(11141,13107,21627,23593) },
- },
- { // Band 2
- { AOM_CDF5(24700,28735,32055,32379) },
- { AOM_CDF5(19703,25203,31809,32142) },
- { AOM_CDF5(12756,18882,30716,31103) },
- { AOM_CDF5(9508,13922,25977,26826) },
- { AOM_CDF5(5243,9175,19661,23593) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 3
- { AOM_CDF5(26792,29367,32090,32407) },
- { AOM_CDF5(21899,25640,31870,32192) },
- { AOM_CDF5(14205,16907,30415,30764) },
- { AOM_CDF5(10570,13741,23255,26426) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(27743,29950,32116,32430) },
- { AOM_CDF5(21595,24944,31927,32259) },
- { AOM_CDF5(15227,16673,30744,31130) },
- { AOM_CDF5(13797,16384,25007,27594) },
- { AOM_CDF5(8192,14336,20480,26624) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(28888,30883,32127,32447) },
- { AOM_CDF5(20978,26121,32090,32406) },
- { AOM_CDF5(16644,18725,30427,31468) },
- { AOM_CDF5(6554,11469,22938,27853) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- },
- },
- { // TX 16X16
- { // Y plane
- { // Intra
- { // Band 0
- { AOM_CDF6(2791,5929,15783,21305,24756) },
- { AOM_CDF6(2492,5974,11999,17892,20328) },
- { AOM_CDF6(1232,4784,7266,13409,14638) },
- },
- { // Band 1
- { AOM_CDF5(10984,15590,26386,26860) },
- { AOM_CDF5(10300,15555,26075,26661) },
- { AOM_CDF5(9016,12368,23292,24037) },
- { AOM_CDF5(7432,9010,19640,20245) },
- { AOM_CDF5(5340,5830,14605,15017) },
- { AOM_CDF5(3041,3357,8664,8983) },
- },
- { // Band 2
- { AOM_CDF5(17487,19944,29422,29785) },
- { AOM_CDF5(14365,17572,28369,28763) },
- { AOM_CDF5(10944,12562,24945,25372) },
- { AOM_CDF5(8061,8670,20179,20570) },
- { AOM_CDF5(5386,5759,14881,15238) },
- { AOM_CDF5(3124,3450,9578,9895) },
- },
- { // Band 3
- { AOM_CDF5(21610,23212,30674,31007) },
- { AOM_CDF5(15516,17922,29225,29573) },
- { AOM_CDF5(10431,11308,24594,24955) },
- { AOM_CDF5(6949,7331,18758,19089) },
- { AOM_CDF5(4564,4898,12730,13048) },
- { AOM_CDF5(2435,2739,7406,7710) },
- },
- { // Band 4
- { AOM_CDF5(24469,25838,31499,31824) },
- { AOM_CDF5(17238,18899,30066,30395) },
- { AOM_CDF5(10423,10890,24655,24992) },
- { AOM_CDF5(6612,6939,18149,18467) },
- { AOM_CDF5(4122,4431,12556,12874) },
- { AOM_CDF5(1910,2211,7840,8142) },
- },
- { // Band 5
- { AOM_CDF5(27205,28145,31900,32218) },
- { AOM_CDF5(18503,19729,30590,30916) },
- { AOM_CDF5(10343,10734,24636,24963) },
- { AOM_CDF5(6629,6955,18492,18810) },
- { AOM_CDF5(4131,4437,13086,13392) },
- { AOM_CDF5(4005,5097,9102,10194) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(1286,10273,21021,28617,29729) },
- { AOM_CDF6(941,10009,17718,25847,27712) },
- { AOM_CDF6(508,9488,12907,21634,23969) },
- },
- { // Band 1
- { AOM_CDF5(23900,25135,31528,31861) },
- { AOM_CDF5(18613,22015,30774,31124) },
- { AOM_CDF5(13064,16135,28060,28484) },
- { AOM_CDF5(10563,12428,24847,25281) },
- { AOM_CDF5(7960,9069,20548,21017) },
- { AOM_CDF5(6944,7491,16595,17007) },
- },
- { // Band 2
- { AOM_CDF5(24972,26434,31771,32097) },
- { AOM_CDF5(18362,20757,30733,31070) },
- { AOM_CDF5(11226,12487,26292,26651) },
- { AOM_CDF5(7823,8448,20940,21314) },
- { AOM_CDF5(4964,5365,14104,14457) },
- { AOM_CDF5(2435,2712,8247,8524) },
- },
- { // Band 3
- { AOM_CDF5(26551,27694,31943,32261) },
- { AOM_CDF5(19519,21452,31120,31446) },
- { AOM_CDF5(11272,11965,26389,26736) },
- { AOM_CDF5(7109,7485,19585,19920) },
- { AOM_CDF5(4033,4370,12546,12865) },
- { AOM_CDF5(1570,2158,7456,8045) },
- },
- { // Band 4
- { AOM_CDF5(27654,28637,32030,32345) },
- { AOM_CDF5(20795,22232,31351,31672) },
- { AOM_CDF5(10841,11329,25676,26002) },
- { AOM_CDF5(6589,6943,18084,18412) },
- { AOM_CDF5(3970,4279,12009,12318) },
- { AOM_CDF5(3449,3967,7761,8278) },
- },
- { // Band 5
- { AOM_CDF5(29545,30314,32084,32404) },
- { AOM_CDF5(21229,22783,31470,31800) },
- { AOM_CDF5(10409,11031,25267,25669) },
- { AOM_CDF5(6456,6909,18270,18674) },
- { AOM_CDF5(4253,5017,13288,13706) },
- { AOM_CDF5(1627,2324,8831,9528) },
- },
- },
- },
- { // UV plane
- { // Intra
- { // Band 0
- { AOM_CDF6(24627,25102,30943,31607,32215) },
- { AOM_CDF6(17408,18757,28256,30111,31225) },
- { AOM_CDF6(10984,14293,22894,27503,28853) },
- },
- { // Band 1
- { AOM_CDF5(16390,25826,31293,31726) },
- { AOM_CDF5(14074,25147,31045,31638) },
- { AOM_CDF5(13598,20524,28818,29894) },
- { AOM_CDF5(10035,13322,25086,26332) },
- { AOM_CDF5(7156,8035,18456,19334) },
- { AOM_CDF5(8192,10923,19115,21845) },
- },
- { // Band 2
- { AOM_CDF5(22787,27489,31676,32026) },
- { AOM_CDF5(17518,23800,31204,31578) },
- { AOM_CDF5(10686,15226,28087,28560) },
- { AOM_CDF5(9612,11942,22574,23010) },
- { AOM_CDF5(6437,8192,18139,19895) },
- { AOM_CDF5(6144,12288,18432,24576) },
- },
- { // Band 3
- { AOM_CDF5(26773,28429,31782,32120) },
- { AOM_CDF5(18449,22329,30991,31329) },
- { AOM_CDF5(12861,14182,27130,27395) },
- { AOM_CDF5(4681,6554,22469,23874) },
- { AOM_CDF5(8623,13797,22420,27594) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(28378,29466,31934,32245) },
- { AOM_CDF5(19880,21733,31206,31550) },
- { AOM_CDF5(12173,13245,27638,27945) },
- { AOM_CDF5(6215,7910,19774,21469) },
- { AOM_CDF5(5783,11565,21203,26985) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(30333,31015,32078,32401) },
- { AOM_CDF5(19277,21376,31072,31407) },
- { AOM_CDF5(12978,13724,28144,28442) },
- { AOM_CDF5(10031,12037,25412,27418) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(29777,30229,31726,32104,32440) },
- { AOM_CDF6(18551,20755,29778,30685,31935) },
- { AOM_CDF6(6236,13170,24037,25823,30798) },
- },
- { // Band 1
- { AOM_CDF5(28890,30863,32128,32440) },
- { AOM_CDF5(17311,27082,31871,32209) },
- { AOM_CDF5(13447,25217,31158,31793) },
- { AOM_CDF5(11906,20177,29976,30713) },
- { AOM_CDF5(14883,17134,27140,28266) },
- { AOM_CDF5(14959,17096,22795,25645) },
- },
- { // Band 2
- { AOM_CDF5(29494,30807,32086,32404) },
- { AOM_CDF5(19860,25179,31857,32190) },
- { AOM_CDF5(13936,19209,30508,31073) },
- { AOM_CDF5(7168,10240,24576,27648) },
- { AOM_CDF5(5783,11565,19275,25058) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 3
- { AOM_CDF5(30496,31243,32121,32433) },
- { AOM_CDF5(21369,24262,31827,32158) },
- { AOM_CDF5(18971,21127,29319,30612) },
- { AOM_CDF5(7710,13493,21203,26985) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(30922,31459,32136,32449) },
- { AOM_CDF5(22640,24782,31768,32076) },
- { AOM_CDF5(12955,14860,28958,30101) },
- { AOM_CDF5(7282,12743,21845,27307) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(30469,31279,32115,32446) },
- { AOM_CDF5(19748,24367,31900,32257) },
- { AOM_CDF5(12684,16120,30125,30918) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- },
- },
- { // TX 32X32
- { // Y plane
- { // Intra
- { // Band 0
- { AOM_CDF6(8402,9860,23425,26798,28753) },
- { AOM_CDF6(4503,7478,14541,19455,21058) },
- { AOM_CDF6(1404,4914,7456,13239,14005) },
- },
- { // Band 1
- { AOM_CDF5(11786,17804,26686,27285) },
- { AOM_CDF5(10456,16685,26272,27135) },
- { AOM_CDF5(8297,12591,23088,24288) },
- { AOM_CDF5(6320,8297,18902,20112) },
- { AOM_CDF5(4385,4892,12779,13476) },
- { AOM_CDF5(2151,2470,6432,6758) },
- },
- { // Band 2
- { AOM_CDF5(17988,21025,29658,30075) },
- { AOM_CDF5(14641,18188,28759,29202) },
- { AOM_CDF5(10951,12924,25087,25515) },
- { AOM_CDF5(8192,9165,20302,20696) },
- { AOM_CDF5(5213,5567,14740,15114) },
- { AOM_CDF5(2785,3096,8153,8465) },
- },
- { // Band 3
- { AOM_CDF5(22839,24625,31013,31343) },
- { AOM_CDF5(16111,18689,29552,29896) },
- { AOM_CDF5(10736,11502,24493,24827) },
- { AOM_CDF5(7153,7570,18744,19067) },
- { AOM_CDF5(4285,4591,11651,11957) },
- { AOM_CDF5(2064,2322,6321,6579) },
- },
- { // Band 4
- { AOM_CDF5(24955,26499,31625,31948) },
- { AOM_CDF5(17242,19354,30096,30432) },
- { AOM_CDF5(10470,11049,24405,24742) },
- { AOM_CDF5(6717,7038,17553,17870) },
- { AOM_CDF5(4030,4342,11280,11592) },
- { AOM_CDF5(2060,2355,6966,7260) },
- },
- { // Band 5
- { AOM_CDF5(29697,30286,32009,32325) },
- { AOM_CDF5(18629,19720,30251,30574) },
- { AOM_CDF5(9459,9826,22948,23264) },
- { AOM_CDF5(5742,6057,16269,16580) },
- { AOM_CDF5(3696,4006,11276,11586) },
- { AOM_CDF5(2359,2614,5801,6056) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(14224,15827,27984,30263,31458) },
- { AOM_CDF6(4253,7150,20729,24629,28621) },
- { AOM_CDF6(1405,5159,12422,17006,24088) },
- },
- { // Band 1
- { AOM_CDF5(20029,23525,30941,31369) },
- { AOM_CDF5(15691,22792,30520,30960) },
- { AOM_CDF5(12036,18829,28256,29025) },
- { AOM_CDF5(10881,14586,25416,26318) },
- { AOM_CDF5(11249,13311,23713,24498) },
- { AOM_CDF5(9444,10609,20170,21025) },
- },
- { // Band 2
- { AOM_CDF5(23805,26370,31579,31927) },
- { AOM_CDF5(16685,21243,30526,30890) },
- { AOM_CDF5(11661,14143,26804,27193) },
- { AOM_CDF5(8321,9593,21814,22228) },
- { AOM_CDF5(6243,6820,16151,16506) },
- { AOM_CDF5(3612,4386,9547,10321) },
- },
- { // Band 3
- { AOM_CDF5(26022,27534,31845,32167) },
- { AOM_CDF5(18692,21351,30871,31203) },
- { AOM_CDF5(11493,12410,26280,26619) },
- { AOM_CDF5(7099,7581,19315,19619) },
- { AOM_CDF5(3329,3623,10868,11162) },
- { AOM_CDF5(3104,4139,10003,11038) },
- },
- { // Band 4
- { AOM_CDF5(28126,29216,32027,32345) },
- { AOM_CDF5(19828,22063,31140,31465) },
- { AOM_CDF5(11206,11832,25718,26041) },
- { AOM_CDF5(6496,6825,18069,18408) },
- { AOM_CDF5(4600,4904,12431,12735) },
- { AOM_CDF5(2016,3529,8066,9578) },
- },
- { // Band 5
- { AOM_CDF5(30246,30814,32096,32411) },
- { AOM_CDF5(21165,22238,31122,31445) },
- { AOM_CDF5(10123,10519,24102,24419) },
- { AOM_CDF5(5968,6277,17606,17924) },
- { AOM_CDF5(4312,4620,12131,12439) },
- { AOM_CDF5(4608,6144,9216,10752) },
- },
- },
- },
- { // UV plane
- { // Intra
- { // Band 0
- { AOM_CDF6(22808,23508,29956,30649,31698) },
- { AOM_CDF6(11001,12792,25018,27680,29623) },
- { AOM_CDF6(6919,10026,19635,24728,26490) },
- },
- { // Band 1
- { AOM_CDF5(12861,25068,30802,31375) },
- { AOM_CDF5(11298,21545,29953,30816) },
- { AOM_CDF5(13053,24270,28485,29845) },
- { AOM_CDF5(7710,15059,26383,28431) },
- { AOM_CDF5(8856,10332,18008,19779) },
- { AOM_CDF5(3855,7710,19275,22167) },
- },
- { // Band 2
- { AOM_CDF5(19458,25796,31754,32007) },
- { AOM_CDF5(16458,23827,31294,31638) },
- { AOM_CDF5(16274,18913,28150,29029) },
- { AOM_CDF5(12429,15254,24858,26553) },
- { AOM_CDF5(7399,11627,21141,24312) },
- { AOM_CDF5(5783,11565,17348,23130) },
- },
- { // Band 3
- { AOM_CDF5(25493,28975,31960,32271) },
- { AOM_CDF5(16904,21759,31381,31728) },
- { AOM_CDF5(9709,11529,24879,26700) },
- { AOM_CDF5(6554,13107,22938,27853) },
- { AOM_CDF5(5461,10923,20025,25486) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(26127,28926,31725,32274) },
- { AOM_CDF5(17673,25036,31940,32216) },
- { AOM_CDF5(14824,17164,26526,28867) },
- { AOM_CDF5(7282,16384,21845,27307) },
- { AOM_CDF5(8192,14336,20480,26624) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(30683,31149,32155,32449) },
- { AOM_CDF5(17896,22055,31508,31886) },
- { AOM_CDF5(8548,12822,24220,28494) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(27393,28900,31555,31971,32368) },
- { AOM_CDF6(8379,19364,27675,28688,31114) },
- { AOM_CDF6(1955,19256,24580,25370,30257) },
- },
- { // Band 1
- { AOM_CDF5(31085,31718,32129,32443) },
- { AOM_CDF5(14336,26852,31370,31760) },
- { AOM_CDF5(11751,23544,28851,29567) },
- { AOM_CDF5(14670,21251,28381,29752) },
- { AOM_CDF5(14832,19316,27134,28974) },
- { AOM_CDF5(13312,15360,25600,27648) },
- },
- { // Band 2
- { AOM_CDF5(31302,31746,32144,32455) },
- { AOM_CDF5(18343,26723,32018,32434) },
- { AOM_CDF5(10570,16913,29068,30125) },
- { AOM_CDF5(5174,13797,24145,26732) },
- { AOM_CDF5(5783,11565,21203,26985) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 3
- { AOM_CDF5(31420,31795,32144,32455) },
- { AOM_CDF5(21510,28245,32064,32366) },
- { AOM_CDF5(6342,11627,25369,28540) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(31470,31806,32143,32455) },
- { AOM_CDF5(19571,25722,31538,31985) },
- { AOM_CDF5(5461,8738,25122,28399) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(31292,31637,32104,32431) },
- { AOM_CDF5(12774,16652,30002,30986) },
- { AOM_CDF5(4652,11442,30231,30593) },
- { AOM_CDF5(7022,10031,28087,29090) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- },
- },
-};
-
-static const coeff_cdf_model
-av1_default_coef_head_cdfs_q3[TX_SIZES][PLANE_TYPES] = {
- { // TX 4X4
- { // Y plane
- { // Intra
- { // Band 0
- { AOM_CDF6(25117,25655,28371,30246,30939) },
- { AOM_CDF6(15083,16850,26029,29031,30115) },
- { AOM_CDF6(8774,12118,22041,26730,28574) },
- },
- { // Band 1
- { AOM_CDF5(13690,23135,31469,31868) },
- { AOM_CDF5(13306,22730,31466,31860) },
- { AOM_CDF5(13503,19892,30528,31005) },
- { AOM_CDF5(13150,16108,28345,28869) },
- { AOM_CDF5(12014,12842,25693,26145) },
- { AOM_CDF5(8937,13405,23831,28300) },
- },
- { // Band 2
- { AOM_CDF5(18707,26260,31853,32238) },
- { AOM_CDF5(15985,24804,31717,32115) },
- { AOM_CDF5(14012,18913,30497,31005) },
- { AOM_CDF5(12300,14741,28386,28958) },
- { AOM_CDF5(12483,15084,24966,26526) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 3
- { AOM_CDF5(19934,28117,32022,32378) },
- { AOM_CDF5(14925,26201,31828,32262) },
- { AOM_CDF5(13132,18927,30269,31173) },
- { AOM_CDF5(13926,19251,28262,29901) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(16626,28981,32074,32413) },
- { AOM_CDF5(12895,27583,31974,32332) },
- { AOM_CDF5(14150,22094,31030,31775) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(5279,29309,32149,32477) },
- { AOM_CDF5(5880,29657,32086,32385) },
- { AOM_CDF5(11469,18022,22938,27853) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(8302,14024,16072,27926,28871) },
- { AOM_CDF6(9359,15522,20581,28595,29250) },
- { AOM_CDF6(5318,12803,19679,27719,28609) },
- },
- { // Band 1
- { AOM_CDF5(22745,25806,31997,32327) },
- { AOM_CDF5(18803,25473,31960,32293) },
- { AOM_CDF5(15553,19553,31039,31407) },
- { AOM_CDF5(13037,15169,28589,29060) },
- { AOM_CDF5(10871,11694,24941,25360) },
- { AOM_CDF5(6242,10923,18725,23406) },
- },
- { // Band 2
- { AOM_CDF5(22276,27316,32078,32402) },
- { AOM_CDF5(19227,25420,31954,32293) },
- { AOM_CDF5(12383,16969,30280,30766) },
- { AOM_CDF5(11282,13725,26516,27379) },
- { AOM_CDF5(5120,9216,15360,20480) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 3
- { AOM_CDF5(22814,28656,32097,32425) },
- { AOM_CDF5(19349,26355,32000,32341) },
- { AOM_CDF5(13824,17830,30780,31142) },
- { AOM_CDF5(6746,13493,25058,27949) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(19746,28536,32088,32411) },
- { AOM_CDF5(17457,27155,32024,32376) },
- { AOM_CDF5(10949,16662,29118,30229) },
- { AOM_CDF5(6096,12955,21337,27434) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(10114,29713,32140,32448) },
- { AOM_CDF5(11455,29324,32094,32419) },
- { AOM_CDF5(6554,14418,23593,27525) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- },
- { // UV plane
- { // Intra
- { // Band 0
- { AOM_CDF6(30309,30623,31738,32084,32428) },
- { AOM_CDF6(25732,26211,31079,31737,32269) },
- { AOM_CDF6(19676,21061,29564,31011,31879) },
- },
- { // Band 1
- { AOM_CDF5(12328,28270,32125,32447) },
- { AOM_CDF5(11177,28585,32076,32401) },
- { AOM_CDF5(13232,25364,31558,32072) },
- { AOM_CDF5(11997,18443,30261,31873) },
- { AOM_CDF5(7399,11627,24312,27483) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 2
- { AOM_CDF5(16893,29817,32005,32463) },
- { AOM_CDF5(14911,27935,32179,32473) },
- { AOM_CDF5(9973,19946,24220,28494) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 3
- { AOM_CDF5(18859,29232,31354,32061) },
- { AOM_CDF5(11281,26322,29545,31156) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(8937,19363,23831,28300) },
- { AOM_CDF5(6144,14336,20480,26624) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(30586,30911,31771,32121,32443) },
- { AOM_CDF6(23875,24492,30970,31684,32217) },
- { AOM_CDF6(15874,17477,29172,30703,32023) },
- },
- { // Band 1
- { AOM_CDF5(17059,30027,32152,32450) },
- { AOM_CDF5(13931,29387,32103,32414) },
- { AOM_CDF5(12903,25742,31906,32289) },
- { AOM_CDF5(13493,23130,29614,30840) },
- { AOM_CDF5(6554,14746,26214,28672) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 2
- { AOM_CDF5(18660,30626,32150,32459) },
- { AOM_CDF5(17338,29279,32168,32495) },
- { AOM_CDF5(11916,17873,26810,29789) },
- { AOM_CDF5(7282,14564,21845,27307) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 3
- { AOM_CDF5(23269,31374,32245,32507) },
- { AOM_CDF5(15741,27628,30840,31804) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(15464,29454,30559,31663) },
- { AOM_CDF5(6827,20480,24576,28672) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- },
- },
- { // TX 8X8
- { // Y plane
- { // Intra
- { // Band 0
- { AOM_CDF6(18128,19079,27400,29265,30385) },
- { AOM_CDF6(10290,12446,23496,26905,28729) },
- { AOM_CDF6(5877,9423,18374,23871,26028) },
- },
- { // Band 1
- { AOM_CDF5(16010,22388,30990,31378) },
- { AOM_CDF5(14579,21619,30755,31177) },
- { AOM_CDF5(13859,18660,29381,29904) },
- { AOM_CDF5(12288,14656,27505,28077) },
- { AOM_CDF5(10009,10812,23591,24068) },
- { AOM_CDF5(8663,9981,19962,20904) },
- },
- { // Band 2
- { AOM_CDF5(20773,24941,31701,32046) },
- { AOM_CDF5(17537,22279,31257,31629) },
- { AOM_CDF5(13337,15972,29181,29575) },
- { AOM_CDF5(11120,12128,26440,26874) },
- { AOM_CDF5(10061,10800,23999,24276) },
- { AOM_CDF5(6144,12288,18432,24576) },
- },
- { // Band 3
- { AOM_CDF5(24073,27227,31920,32246) },
- { AOM_CDF5(18916,22611,31508,31853) },
- { AOM_CDF5(13371,14495,28662,29093) },
- { AOM_CDF5(9283,9840,24228,24506) },
- { AOM_CDF5(4681,9362,20285,24966) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(25180,28079,32048,32365) },
- { AOM_CDF5(19790,23090,31675,32001) },
- { AOM_CDF5(12634,13382,28384,28718) },
- { AOM_CDF5(11264,12083,28672,29286) },
- { AOM_CDF5(7710,13493,21203,26985) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(26180,29109,32085,32408) },
- { AOM_CDF5(19990,23991,31806,32152) },
- { AOM_CDF5(13735,14612,29022,29326) },
- { AOM_CDF5(8192,10240,25259,27307) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(5084,13063,15732,27628,28823) },
- { AOM_CDF6(3233,11850,16878,26809,27973) },
- { AOM_CDF6(1405,10468,15220,25209,26482) },
- },
- { // Band 1
- { AOM_CDF5(23854,26692,31964,32291) },
- { AOM_CDF5(20514,25677,31833,32170) },
- { AOM_CDF5(16504,20235,30877,31237) },
- { AOM_CDF5(13241,15173,28673,29116) },
- { AOM_CDF5(9526,10553,23852,24361) },
- { AOM_CDF5(6144,6428,17806,18148) },
- },
- { // Band 2
- { AOM_CDF5(24345,27736,32033,32355) },
- { AOM_CDF5(20277,23726,31700,32031) },
- { AOM_CDF5(13361,15650,29411,29794) },
- { AOM_CDF5(9421,10887,25426,26039) },
- { AOM_CDF5(6242,7607,17749,18530) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 3
- { AOM_CDF5(26118,28888,32095,32413) },
- { AOM_CDF5(21286,24631,31871,32198) },
- { AOM_CDF5(13285,15402,29317,29737) },
- { AOM_CDF5(9902,10814,24755,25276) },
- { AOM_CDF5(11431,13717,20575,23623) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(27178,29612,32119,32433) },
- { AOM_CDF5(22095,25550,31976,32298) },
- { AOM_CDF5(13847,16273,29602,30024) },
- { AOM_CDF5(8771,10923,19694,20521) },
- { AOM_CDF5(11398,15672,21370,25645) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(28257,30327,32126,32441) },
- { AOM_CDF5(22325,26453,32054,32380) },
- { AOM_CDF5(14860,17652,30682,31035) },
- { AOM_CDF5(5097,10194,18933,21117) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- },
- { // UV plane
- { // Intra
- { // Band 0
- { AOM_CDF6(28902,29234,31608,31973,32378) },
- { AOM_CDF6(22721,23397,30476,31293,32179) },
- { AOM_CDF6(16404,18013,27505,29454,31300) },
- },
- { // Band 1
- { AOM_CDF5(14290,27662,31923,32327) },
- { AOM_CDF5(13282,26727,31749,32113) },
- { AOM_CDF5(12514,22487,30689,31459) },
- { AOM_CDF5(11657,16967,29660,30437) },
- { AOM_CDF5(8937,12660,24576,26810) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 2
- { AOM_CDF5(20145,28026,31820,32212) },
- { AOM_CDF5(16906,25677,31760,32059) },
- { AOM_CDF5(12332,18322,29597,31006) },
- { AOM_CDF5(8192,13107,21299,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 3
- { AOM_CDF5(23492,29214,32166,32467) },
- { AOM_CDF5(18757,25536,31789,32165) },
- { AOM_CDF5(12603,16384,25206,28987) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(24518,29453,32074,32382) },
- { AOM_CDF5(19369,26533,31972,32370) },
- { AOM_CDF5(6144,12288,20480,26624) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(24576,28789,31364,32066) },
- { AOM_CDF5(20052,24454,29834,31301) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(30358,30700,31747,32103,32430) },
- { AOM_CDF6(22346,23277,30508,31386,32138) },
- { AOM_CDF6(11974,14562,27349,28970,31969) },
- },
- { // Band 1
- { AOM_CDF5(22910,29539,32102,32412) },
- { AOM_CDF5(18429,28710,32106,32432) },
- { AOM_CDF5(13601,25238,31845,32262) },
- { AOM_CDF5(12472,20976,29026,30500) },
- { AOM_CDF5(8738,11469,24030,26761) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 2
- { AOM_CDF5(23359,30038,32127,32444) },
- { AOM_CDF5(19590,28108,32056,32382) },
- { AOM_CDF5(15578,22024,29008,30619) },
- { AOM_CDF5(8192,14336,20480,26624) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 3
- { AOM_CDF5(26372,31019,32146,32463) },
- { AOM_CDF5(22190,28573,32160,32464) },
- { AOM_CDF5(8192,16384,22938,27853) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(26672,31311,32156,32462) },
- { AOM_CDF5(20946,27885,31997,32382) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(27342,31385,32130,32449) },
- { AOM_CDF5(8674,22167,26985,29877) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- },
- },
- { // TX 16X16
- { // Y plane
- { // Intra
- { // Band 0
- { AOM_CDF6(2479,4993,17332,21885,25826) },
- { AOM_CDF6(2848,5996,15242,20755,23763) },
- { AOM_CDF6(2125,6226,11733,18389,20442) },
- },
- { // Band 1
- { AOM_CDF5(14539,19828,29467,29934) },
- { AOM_CDF5(12513,19139,29177,29702) },
- { AOM_CDF5(11826,16348,27245,27977) },
- { AOM_CDF5(10123,12262,24690,25359) },
- { AOM_CDF5(7979,8826,20804,21295) },
- { AOM_CDF5(5262,5604,14716,15015) },
- },
- { // Band 2
- { AOM_CDF5(20625,24118,31086,31446) },
- { AOM_CDF5(16710,20899,30505,30864) },
- { AOM_CDF5(13161,15579,27988,28449) },
- { AOM_CDF5(10596,11651,24124,24589) },
- { AOM_CDF5(7724,8452,21060,21476) },
- { AOM_CDF5(7282,9466,18933,21117) },
- },
- { // Band 3
- { AOM_CDF5(24265,26472,31667,31998) },
- { AOM_CDF5(18213,21117,30932,31280) },
- { AOM_CDF5(12944,14000,27696,28050) },
- { AOM_CDF5(9709,10056,23282,23579) },
- { AOM_CDF5(8590,9862,18770,19724) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(26658,28275,31975,32294) },
- { AOM_CDF5(20049,22203,31374,31708) },
- { AOM_CDF5(12795,13387,28328,28653) },
- { AOM_CDF5(8607,9073,23383,23695) },
- { AOM_CDF5(8192,9947,18725,20480) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(28651,29902,32085,32402) },
- { AOM_CDF5(21133,23229,31684,32013) },
- { AOM_CDF5(13231,14045,28203,28576) },
- { AOM_CDF5(7903,8481,21781,22359) },
- { AOM_CDF5(8192,14336,20480,26624) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(824,8672,16514,27587,29231) },
- { AOM_CDF6(1118,9561,17021,25911,27753) },
- { AOM_CDF6(806,9313,13998,22910,25224) },
- },
- { // Band 1
- { AOM_CDF5(23650,26487,31840,32166) },
- { AOM_CDF5(19593,25206,31604,31944) },
- { AOM_CDF5(15813,19643,30328,30726) },
- { AOM_CDF5(12978,15108,27886,28310) },
- { AOM_CDF5(9793,11020,23305,23818) },
- { AOM_CDF5(4855,5565,14268,14741) },
- },
- { // Band 2
- { AOM_CDF5(24547,27751,31964,32285) },
- { AOM_CDF5(19674,23377,31426,31759) },
- { AOM_CDF5(12643,14489,28159,28541) },
- { AOM_CDF5(9110,10279,23565,23992) },
- { AOM_CDF5(5082,5617,16317,16651) },
- { AOM_CDF5(5174,10348,18971,24145) },
- },
- { // Band 3
- { AOM_CDF5(26773,29038,32050,32367) },
- { AOM_CDF5(20956,23898,31563,31888) },
- { AOM_CDF5(12527,13472,27840,28211) },
- { AOM_CDF5(8773,9353,22555,22856) },
- { AOM_CDF5(4291,4876,16969,17554) },
- { AOM_CDF5(5783,11565,17348,23130) },
- },
- { // Band 4
- { AOM_CDF5(28065,29768,32086,32400) },
- { AOM_CDF5(21847,24001,31608,31929) },
- { AOM_CDF5(12482,13091,27413,27739) },
- { AOM_CDF5(7582,8002,22090,22405) },
- { AOM_CDF5(6324,7186,15809,16671) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(29731,30798,32113,32431) },
- { AOM_CDF5(22224,24448,31791,32118) },
- { AOM_CDF5(12622,13513,28103,28530) },
- { AOM_CDF5(8886,9600,22890,23604) },
- { AOM_CDF5(8058,9669,18264,19876) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- },
- { // UV plane
- { // Intra
- { // Band 0
- { AOM_CDF6(27375,27731,31591,31993,32404) },
- { AOM_CDF6(20943,21758,30037,31074,32003) },
- { AOM_CDF6(16218,17771,26832,29181,30586) },
- },
- { // Band 1
- { AOM_CDF5(17239,27853,31557,32198) },
- { AOM_CDF5(14494,25906,31543,32033) },
- { AOM_CDF5(12980,19788,29137,29410) },
- { AOM_CDF5(11796,14680,26477,27787) },
- { AOM_CDF5(12603,15124,21005,23526) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 2
- { AOM_CDF5(22821,27655,32024,32303) },
- { AOM_CDF5(16534,23629,31145,31686) },
- { AOM_CDF5(12407,14952,28950,30859) },
- { AOM_CDF5(6554,10486,19661,23593) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 3
- { AOM_CDF5(26369,29624,31996,32272) },
- { AOM_CDF5(19346,24807,31750,32027) },
- { AOM_CDF5(15056,19484,27454,30111) },
- { AOM_CDF5(5783,11565,21203,26985) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(28213,30301,32199,32483) },
- { AOM_CDF5(22988,27307,31879,32260) },
- { AOM_CDF5(11796,15729,24904,28836) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(29813,31323,32142,32444) },
- { AOM_CDF5(21497,25254,31307,32142) },
- { AOM_CDF5(6144,12288,20480,26624) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(30560,30889,31795,32128,32455) },
- { AOM_CDF6(20347,20993,30496,31112,32263) },
- { AOM_CDF6(9723,10992,27830,28681,32168) },
- },
- { // Band 1
- { AOM_CDF5(25900,30610,32179,32474) },
- { AOM_CDF5(18535,29316,32153,32437) },
- { AOM_CDF5(15230,25845,30922,31845) },
- { AOM_CDF5(8192,16384,27097,28987) },
- { AOM_CDF5(8548,12822,21370,25645) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 2
- { AOM_CDF5(26104,30659,32157,32462) },
- { AOM_CDF5(20457,28242,31682,32225) },
- { AOM_CDF5(10923,16384,24576,28672) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 3
- { AOM_CDF5(28740,30618,32154,32461) },
- { AOM_CDF5(19333,26214,30802,31785) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(28161,30834,32160,32464) },
- { AOM_CDF5(26536,29149,31562,32165) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(29913,31560,32172,32470) },
- { AOM_CDF5(22209,28035,30583,31676) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- },
- },
- { // TX 32X32
- { // Y plane
- { // Intra
- { // Band 0
- { AOM_CDF6(3982,6433,20418,25151,27471) },
- { AOM_CDF6(3342,6943,15018,20274,22412) },
- { AOM_CDF6(1805,5863,9932,16426,17655) },
- },
- { // Band 1
- { AOM_CDF5(11799,19138,28295,28881) },
- { AOM_CDF5(11008,18597,28369,29021) },
- { AOM_CDF5(10104,15628,26339,27195) },
- { AOM_CDF5(8537,11246,22663,23623) },
- { AOM_CDF5(5895,6476,16647,17329) },
- { AOM_CDF5(4046,4357,10849,11160) },
- },
- { // Band 2
- { AOM_CDF5(18503,22222,30403,30814) },
- { AOM_CDF5(15264,19282,29949,30339) },
- { AOM_CDF5(12101,14721,27350,27783) },
- { AOM_CDF5(9243,10177,22679,23097) },
- { AOM_CDF5(5571,5967,16714,17043) },
- { AOM_CDF5(2731,3755,14677,15701) },
- },
- { // Band 3
- { AOM_CDF5(23077,25272,31444,31771) },
- { AOM_CDF5(16598,19790,30479,30822) },
- { AOM_CDF5(11961,12871,27162,27529) },
- { AOM_CDF5(8156,8563,22220,22579) },
- { AOM_CDF5(5851,6242,15994,16384) },
- { AOM_CDF5(6144,12288,18432,24576) },
- },
- { // Band 4
- { AOM_CDF5(26084,27933,31906,32223) },
- { AOM_CDF5(19335,21760,31149,31477) },
- { AOM_CDF5(12724,13278,27015,27365) },
- { AOM_CDF5(8687,9010,21051,21334) },
- { AOM_CDF5(5814,6606,14534,15327) },
- { AOM_CDF5(6144,12288,18432,24576) },
- },
- { // Band 5
- { AOM_CDF5(30147,30787,32081,32395) },
- { AOM_CDF5(20402,21697,30943,31266) },
- { AOM_CDF5(11661,12125,25710,26034) },
- { AOM_CDF5(7224,7504,19876,20156) },
- { AOM_CDF5(6183,7110,17002,17930) },
- { AOM_CDF5(5174,10348,17246,22420) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(4079,8378,25109,29897,30898) },
- { AOM_CDF6(3870,8207,22495,27162,29559) },
- { AOM_CDF6(2127,6197,15932,20604,27312) },
- },
- { // Band 1
- { AOM_CDF5(21253,26168,31780,32120) },
- { AOM_CDF5(16610,23985,31495,31866) },
- { AOM_CDF5(14861,21030,30219,30784) },
- { AOM_CDF5(14573,18162,28524,29116) },
- { AOM_CDF5(14036,15983,26283,27085) },
- { AOM_CDF5(9119,10742,19630,20016) },
- },
- { // Band 2
- { AOM_CDF5(23192,27248,31887,32215) },
- { AOM_CDF5(18219,23213,31417,31769) },
- { AOM_CDF5(12657,14754,27845,28233) },
- { AOM_CDF5(8127,8829,20909,21279) },
- { AOM_CDF5(7547,8142,17476,18072) },
- { AOM_CDF5(5461,10923,16384,21845) },
- },
- { // Band 3
- { AOM_CDF5(25516,28301,31970,32289) },
- { AOM_CDF5(19094,23041,31404,31732) },
- { AOM_CDF5(12328,13099,27275,27613) },
- { AOM_CDF5(8134,8458,21075,21352) },
- { AOM_CDF5(5041,5881,17644,18485) },
- { AOM_CDF5(7282,12743,18204,23666) },
- },
- { // Band 4
- { AOM_CDF5(28082,29782,32087,32400) },
- { AOM_CDF5(21281,24161,31679,31997) },
- { AOM_CDF5(12144,12913,27139,27460) },
- { AOM_CDF5(8232,8472,21659,21979) },
- { AOM_CDF5(3034,4855,17598,19418) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(30193,31021,32122,32435) },
- { AOM_CDF5(22124,23763,31498,31816) },
- { AOM_CDF5(12066,12418,26849,27157) },
- { AOM_CDF5(8701,8979,20920,21197) },
- { AOM_CDF5(5266,7022,15799,17554) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- },
- { // UV plane
- { // Intra
- { // Band 0
- { AOM_CDF6(23468,24062,30645,31200,32193) },
- { AOM_CDF6(12642,14371,26924,28832,31098) },
- { AOM_CDF6(7785,8831,23705,26028,29979) },
- },
- { // Band 1
- { AOM_CDF5(13575,28087,31130,31832) },
- { AOM_CDF5(11108,27955,31657,32213) },
- { AOM_CDF5(9797,23985,28039,30741) },
- { AOM_CDF5(5578,18824,26493,28585) },
- { AOM_CDF5(5041,12603,18905,22686) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 2
- { AOM_CDF5(17613,26624,30310,31539) },
- { AOM_CDF5(11398,22795,29444,30868) },
- { AOM_CDF5(8548,15672,22795,28494) },
- { AOM_CDF5(6144,12288,20480,26624) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 3
- { AOM_CDF5(24145,26301,30181,31475) },
- { AOM_CDF5(15565,20480,27853,30310) },
- { AOM_CDF5(8192,14336,20480,26624) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(27434,28450,30990,31752) },
- { AOM_CDF5(14947,21845,29319,31043) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(31130,31676,32180,32474) },
- { AOM_CDF5(18289,22099,28196,30482) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- { // Inter
- { // Band 0
- { AOM_CDF6(29436,29775,31685,32029,32425) },
- { AOM_CDF6(10536,11074,27753,28385,31293) },
- { AOM_CDF6(3010,3521,22603,23227,30440) },
- },
- { // Band 1
- { AOM_CDF5(17576,29491,30981,31874) },
- { AOM_CDF5(10426,29044,31725,32321) },
- { AOM_CDF5(15766,28286,31377,32304) },
- { AOM_CDF5(19661,26985,30069,31611) },
- { AOM_CDF5(16035,23007,28585,30676) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 2
- { AOM_CDF5(23073,30053,31605,32186) },
- { AOM_CDF5(12858,24887,30279,31524) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 3
- { AOM_CDF5(24030,26839,30896,31832) },
- { AOM_CDF5(17644,23526,27727,30247) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 4
- { AOM_CDF5(28019,30156,31343,32056) },
- { AOM_CDF5(14980,22469,27151,29959) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- { // Band 5
- { AOM_CDF5(30549,31511,32176,32472) },
- { AOM_CDF5(15019,20480,24576,28672) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- { AOM_CDF5(6553,13107,19660,26214) },
- },
- },
- },
- },
-};
-/* clang-format on */
-
-typedef coeff_cdf_model coeff_cdf_table[TX_SIZES][PLANE_TYPES];
-static const coeff_cdf_table *av1_default_qctx_coef_cdfs[TOKEN_CDF_Q_CTXS] = {
- &av1_default_coef_head_cdfs_q0, &av1_default_coef_head_cdfs_q1,
- &av1_default_coef_head_cdfs_q2, &av1_default_coef_head_cdfs_q3
-};
-#endif // CONFIG_LV_MAP
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 668a0d2..c785a3e 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -57,9 +57,7 @@
#include "av1/decoder/decodeframe.h"
#include "av1/decoder/decodemv.h"
#include "av1/decoder/decoder.h"
-#if CONFIG_LV_MAP
#include "av1/decoder/decodetxb.h"
-#endif
#include "av1/decoder/detokenize.h"
#define MAX_AV1_HEADER_SIZE 80
@@ -129,7 +127,6 @@
struct aom_usec_timer timer;
aom_usec_timer_start(&timer);
#endif
-#if CONFIG_LV_MAP
int16_t max_scan_line = 0;
int eob;
av1_read_coeffs_txb_facade(cm, xd, r, row, col, plane, tx_size,
@@ -137,15 +134,6 @@
// tx_type will be read out in av1_read_coeffs_txb_facade
const TX_TYPE tx_type = av1_get_tx_type(plane_type, xd, row, col, tx_size,
cm->reduced_tx_set_used);
-#else // CONFIG_LV_MAP
- const TX_TYPE tx_type = av1_get_tx_type(plane_type, xd, row, col, tx_size,
- cm->reduced_tx_set_used);
- const SCAN_ORDER *scan_order = get_scan(cm, tx_size, tx_type, mbmi);
- int16_t max_scan_line = 0;
- const int eob =
- av1_decode_block_tokens(cm, xd, plane, scan_order, col, row, tx_size,
- tx_type, &max_scan_line, r, mbmi->segment_id);
-#endif // CONFIG_LV_MAP
#if TXCOEFF_TIMER
aom_usec_timer_mark(&timer);
@@ -192,7 +180,6 @@
struct aom_usec_timer timer;
aom_usec_timer_start(&timer);
#endif
-#if CONFIG_LV_MAP
int16_t max_scan_line = 0;
int eob;
av1_read_coeffs_txb_facade(cm, xd, r, blk_row, blk_col, plane, tx_size,
@@ -200,15 +187,6 @@
// tx_type will be read out in av1_read_coeffs_txb_facade
const TX_TYPE tx_type = av1_get_tx_type(plane_type, xd, blk_row, blk_col,
tx_size, cm->reduced_tx_set_used);
-#else // CONFIG_LV_MAP
- const TX_TYPE tx_type = av1_get_tx_type(plane_type, xd, blk_row, blk_col,
- tx_size, cm->reduced_tx_set_used);
- const SCAN_ORDER *sc = get_scan(cm, tx_size, tx_type, mbmi);
- int16_t max_scan_line = 0;
- const int eob =
- av1_decode_block_tokens(cm, xd, plane, sc, blk_col, blk_row, tx_size,
- tx_type, &max_scan_line, r, mbmi->segment_id);
-#endif // CONFIG_LV_MAP
#if TXCOEFF_TIMER
aom_usec_timer_mark(&timer);
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 5b8dee0..050f8c0 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -42,9 +42,7 @@
#include "av1/encoder/bitstream.h"
#include "av1/encoder/cost.h"
#include "av1/encoder/encodemv.h"
-#if CONFIG_LV_MAP
#include "av1/encoder/encodetxb.h"
-#endif // CONFIG_LV_MAP
#include "av1/encoder/mcomp.h"
#include "av1/encoder/palette.h"
#include "av1/encoder/segmentation.h"
@@ -385,79 +383,6 @@
*tp = p;
}
-#if !CONFIG_LV_MAP
-static INLINE void write_coeff_extra(const aom_cdf_prob *const *cdf, int val,
- int n, aom_writer *w) {
- // Code the extra bits from LSB to MSB in groups of 4
- int i = 0;
- int count = 0;
- while (count < n) {
- const int size = AOMMIN(n - count, 4);
- const int mask = (1 << size) - 1;
- aom_write_cdf(w, val & mask, cdf[i++], 1 << size);
- val >>= size;
- count += size;
- }
-}
-
-static void pack_mb_tokens(aom_writer *w, const TOKENEXTRA **tp,
- const TOKENEXTRA *const stop,
- aom_bit_depth_t bit_depth, const TX_SIZE tx_size,
- TOKEN_STATS *token_stats) {
- const TOKENEXTRA *p = *tp;
- int count = 0;
- const int seg_eob = av1_get_max_eob(tx_size);
-
- while (p < stop && p->token != EOSB_TOKEN) {
- const int token = p->token;
- const int8_t eob_val = p->eob_val;
- if (token == BLOCK_Z_TOKEN) {
- aom_write_symbol(w, 0, *p->head_cdf, HEAD_TOKENS + 1);
- p++;
- break;
- continue;
- }
-
- const av1_extra_bit *const extra_bits = &av1_extra_bits[token];
- if (eob_val == LAST_EOB) {
- // Just code a flag indicating whether the value is >1 or 1.
- aom_write_bit(w, token != ONE_TOKEN);
- } else {
- int comb_symb = 2 * AOMMIN(token, TWO_TOKEN) - eob_val + p->first_val;
- aom_write_symbol(w, comb_symb, *p->head_cdf, HEAD_TOKENS + p->first_val);
- }
- if (token > ONE_TOKEN) {
- aom_write_symbol(w, token - TWO_TOKEN, *p->tail_cdf, TAIL_TOKENS);
- }
-
- if (extra_bits->base_val) {
- const int bit_string = p->extra;
- const int bit_string_length = extra_bits->len; // Length of extra bits to
- const int is_cat6 = (extra_bits->base_val == CAT6_MIN_VAL);
- // be written excluding
- // the sign bit.
- int skip_bits = is_cat6 ? CAT6_BIT_SIZE - av1_get_cat6_extrabits_size(
- tx_size, bit_depth)
- : 0;
-
- assert(!(bit_string >> (bit_string_length - skip_bits + 1)));
- if (bit_string_length > 0)
- write_coeff_extra(extra_bits->cdf, bit_string >> 1,
- bit_string_length - skip_bits, w);
-
- aom_write_bit_record(w, bit_string & 1, token_stats);
- }
- ++p;
-
- ++count;
- if (eob_val == EARLY_EOB || count == seg_eob) break;
- }
-
- *tp = p;
-}
-#endif // !CONFIG_LV_MAP
-
-#if CONFIG_LV_MAP
static void pack_txb_tokens(aom_writer *w, AV1_COMMON *cm, MACROBLOCK *const x,
const TOKENEXTRA **tp,
const TOKENEXTRA *const tok_end, MACROBLOCKD *xd,
@@ -513,56 +438,6 @@
}
}
}
-#else // CONFIG_LV_MAP
-static void pack_txb_tokens(aom_writer *w, const TOKENEXTRA **tp,
- const TOKENEXTRA *const tok_end, MACROBLOCKD *xd,
- MB_MODE_INFO *mbmi, int plane,
- BLOCK_SIZE plane_bsize, aom_bit_depth_t bit_depth,
- int block, int blk_row, int blk_col,
- TX_SIZE tx_size, TOKEN_STATS *token_stats) {
- const struct macroblockd_plane *const pd = &xd->plane[plane];
- const int tx_row = blk_row >> (1 - pd->subsampling_y);
- const int tx_col = blk_col >> (1 - pd->subsampling_x);
- const int max_blocks_high = max_block_high(xd, plane_bsize, plane);
- const int max_blocks_wide = max_block_wide(xd, plane_bsize, plane);
-
- if (blk_row >= max_blocks_high || blk_col >= max_blocks_wide) return;
-
- const TX_SIZE plane_tx_size =
- plane ? av1_get_uv_tx_size(mbmi, pd->subsampling_x, pd->subsampling_y)
- : mbmi->inter_tx_size[tx_row][tx_col];
-
- if (tx_size == plane_tx_size || plane) {
- TOKEN_STATS tmp_token_stats;
- init_token_stats(&tmp_token_stats);
- pack_mb_tokens(w, tp, tok_end, bit_depth, tx_size, &tmp_token_stats);
-#if CONFIG_RD_DEBUG
- token_stats->txb_coeff_cost_map[blk_row][blk_col] = tmp_token_stats.cost;
- token_stats->cost += tmp_token_stats.cost;
-#endif
- } else {
- const TX_SIZE sub_txs = sub_tx_size_map[1][tx_size];
- const int bsw = tx_size_wide_unit[sub_txs];
- const int bsh = tx_size_high_unit[sub_txs];
-
- assert(bsw > 0 && bsh > 0);
-
- for (int r = 0; r < tx_size_high_unit[tx_size]; r += bsh) {
- for (int c = 0; c < tx_size_wide_unit[tx_size]; c += bsw) {
- const int offsetr = blk_row + r;
- const int offsetc = blk_col + c;
- const int step = bsh * bsw;
-
- if (offsetr >= max_blocks_high || offsetc >= max_blocks_wide) continue;
-
- pack_txb_tokens(w, tp, tok_end, xd, mbmi, plane, plane_bsize, bit_depth,
- block, offsetr, offsetc, sub_txs, token_stats);
- block += step;
- }
- }
- }
-}
-#endif // CONFIG_LV_MAP
#if CONFIG_SPATIAL_SEGMENTATION
static int neg_interleave(int x, int ref, int max) {
@@ -1875,12 +1750,9 @@
blk_row += bkh) {
for (blk_col = col >> pd->subsampling_x; blk_col < unit_width;
blk_col += bkw) {
- pack_txb_tokens(w,
-#if CONFIG_LV_MAP
- cm, x,
-#endif
- tok, tok_end, xd, mbmi, plane, plane_bsize, cm->bit_depth,
- *block, blk_row, blk_col, max_tx_size, token_stats);
+ pack_txb_tokens(w, cm, x, tok, tok_end, xd, mbmi, plane, plane_bsize,
+ cm->bit_depth, *block, blk_row, blk_col, max_tx_size,
+ token_stats);
*block += step;
}
}
@@ -1899,10 +1771,8 @@
int plane;
int bh, bw;
MACROBLOCK *const x = &cpi->td.mb;
-#if CONFIG_LV_MAP
(void)tok;
(void)tok_end;
-#endif
xd->mi = cm->mi_grid_visible + mi_offset;
assert(mbmi->sb_type <= cm->seq_params.sb_size ||
@@ -1934,17 +1804,10 @@
&cols);
assert(*tok < tok_end);
pack_map_tokens(w, tok, palette_size_plane, rows * cols);
-#if !CONFIG_LV_MAP
- assert(*tok < tok_end + mbmi->skip);
-#endif // !CONFIG_LV_MAP
}
}
if (!mbmi->skip) {
-#if !CONFIG_LV_MAP
- assert(*tok < tok_end);
-#endif
-
if (!is_inter_block(mbmi))
av1_write_coeffs_mb(cm, x, mi_row, mi_col, w, mbmi->sb_type);
@@ -1975,9 +1838,6 @@
const struct macroblockd_plane *const pd = &xd->plane[plane];
if (!is_chroma_reference(mi_row, mi_col, mbmi->sb_type,
pd->subsampling_x, pd->subsampling_y)) {
-#if !CONFIG_LV_MAP
- (*tok)++;
-#endif // !CONFIG_LV_MAP
continue;
}
write_inter_txb_coeff(cm, x, mbmi, w, tok, tok_end, &token_stats,
@@ -3071,9 +2931,6 @@
aom_start_encode(&mode_bc, dst + total_size);
write_modes(cpi, &tile_info, &mode_bc, &tok, tok_end);
-#if !CONFIG_LV_MAP
- assert(tok == tok_end);
-#endif // !CONFIG_LV_MAP
aom_stop_encode(&mode_bc);
tile_size = mode_bc.pos;
assert(tile_size > 0);
@@ -4878,9 +4735,6 @@
aom_start_encode(&mode_bc, dst + total_size);
write_modes(cpi, &tile_info, &mode_bc, &tok, tok_end);
-#if !CONFIG_LV_MAP
- assert(tok == tok_end);
-#endif // !CONFIG_LV_MAP
aom_stop_encode(&mode_bc);
tile_size = mode_bc.pos;
assert(tile_size > 0);
diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index 7c890b8..3cbb8ad 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -35,9 +35,7 @@
tran_low_t *qcoeff;
tran_low_t *coeff;
uint16_t *eobs;
-#if CONFIG_LV_MAP
uint8_t *txb_entropy_ctx;
-#endif
struct buf_2d src;
// Quantizer setings
@@ -56,7 +54,6 @@
typedef int av1_coeff_cost[PLANE_TYPES][REF_TYPES][COEF_BANDS][COEFF_CONTEXTS]
[TAIL_TOKENS];
-#if CONFIG_LV_MAP
typedef struct {
int txb_skip_cost[TXB_SKIP_CONTEXTS][2];
int base_eob_cost[SIG_COEF_CONTEXTS_EOB][3];
@@ -78,18 +75,15 @@
int dc_sign_ctx[MAX_MB_PLANE]
[MAX_SB_SQUARE / (TX_SIZE_W_MIN * TX_SIZE_H_MIN)];
} CB_COEFF_BUFFER;
-#endif
typedef struct {
int_mv ref_mvs[MODE_CTX_REF_FRAMES][MAX_MV_REF_CANDIDATES];
int16_t mode_context[MODE_CTX_REF_FRAMES];
-#if CONFIG_LV_MAP
// TODO(angiebird): Reduce the buffer size according to sb_type
tran_low_t *tcoeff[MAX_MB_PLANE];
uint16_t *eobs[MAX_MB_PLANE];
uint8_t *txb_skip_ctx[MAX_MB_PLANE];
int *dc_sign_ctx[MAX_MB_PLANE];
-#endif
uint8_t ref_mv_count[MODE_CTX_REF_FRAMES];
CANDIDATE_MV ref_mv_stack[MODE_CTX_REF_FRAMES][MAX_REF_MV_STACK_SIZE];
int16_t compound_mode_context[MODE_CTX_REF_FRAMES];
@@ -133,15 +127,11 @@
int64_t sse;
int rate;
uint16_t eob;
-#if CONFIG_LV_MAP
#if CONFIG_TXK_SEL
TX_TYPE tx_type;
#endif
uint16_t entropy_context;
uint8_t txb_entropy_ctx;
-#else
- uint8_t entropy_context;
-#endif
uint8_t valid;
uint8_t fast; // This is not being used now.
} TX_SIZE_RD_INFO;
@@ -267,11 +257,9 @@
int skip_mode_index;
#endif // CONFIG_EXT_SKIP
-#if CONFIG_LV_MAP
LV_MAP_COEFF_COST coeff_costs[TX_SIZES][PLANE_TYPES];
LV_MAP_EOB_COST eob_costs[7][2];
uint16_t cb_offset;
-#endif
av1_coeff_cost token_head_costs[TX_SIZES];
av1_coeff_cost token_tail_costs[TX_SIZES];
diff --git a/av1/encoder/context_tree.c b/av1/encoder/context_tree.c
index c6a9606..32231d4 100644
--- a/av1/encoder/context_tree.c
+++ b/av1/encoder/context_tree.c
@@ -36,11 +36,9 @@
aom_memalign(32, num_pix * sizeof(*ctx->dqcoeff[i])));
CHECK_MEM_ERROR(cm, ctx->eobs[i],
aom_memalign(32, num_blk * sizeof(*ctx->eobs[i])));
-#if CONFIG_LV_MAP
CHECK_MEM_ERROR(
cm, ctx->txb_entropy_ctx[i],
aom_memalign(32, num_blk * sizeof(*ctx->txb_entropy_ctx[i])));
-#endif
}
if (num_pix <= MAX_PALETTE_SQUARE) {
@@ -65,10 +63,8 @@
ctx->dqcoeff[i] = 0;
aom_free(ctx->eobs[i]);
ctx->eobs[i] = 0;
-#if CONFIG_LV_MAP
aom_free(ctx->txb_entropy_ctx[i]);
ctx->txb_entropy_ctx[i] = 0;
-#endif
}
for (i = 0; i < 2; ++i) {
diff --git a/av1/encoder/context_tree.h b/av1/encoder/context_tree.h
index c99a9c3..8c01175 100644
--- a/av1/encoder/context_tree.h
+++ b/av1/encoder/context_tree.h
@@ -45,9 +45,7 @@
tran_low_t *qcoeff[MAX_MB_PLANE];
tran_low_t *dqcoeff[MAX_MB_PLANE];
uint16_t *eobs[MAX_MB_PLANE];
-#if CONFIG_LV_MAP
uint8_t *txb_entropy_ctx[MAX_MB_PLANE];
-#endif
int num_4x4_blk;
int skip;
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 189a1dd..e5f8df2 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -51,9 +51,7 @@
#include "av1/encoder/encodeframe.h"
#include "av1/encoder/encodemb.h"
#include "av1/encoder/encodemv.h"
-#if CONFIG_LV_MAP
#include "av1/encoder/encodetxb.h"
-#endif
#include "av1/encoder/ethread.h"
#include "av1/encoder/extend.h"
#include "av1/encoder/rd.h"
@@ -505,9 +503,7 @@
p[i].qcoeff = ctx->qcoeff[i];
pd[i].dqcoeff = ctx->dqcoeff[i];
p[i].eobs = ctx->eobs[i];
-#if CONFIG_LV_MAP
p[i].txb_entropy_ctx = ctx->txb_entropy_ctx[i];
-#endif // CONFIG_LV_MAP
}
for (i = 0; i < 2; ++i) pd[i].color_index_map = ctx->color_index_map[i];
// Restore the coding context of the MB to that that was in place
@@ -669,9 +665,7 @@
p[i].qcoeff = ctx->qcoeff[i];
pd[i].dqcoeff = ctx->dqcoeff[i];
p[i].eobs = ctx->eobs[i];
-#if CONFIG_LV_MAP
p[i].txb_entropy_ctx = ctx->txb_entropy_ctx[i];
-#endif
}
for (i = 0; i < 2; ++i) pd[i].color_index_map = ctx->color_index_map[i];
@@ -1501,17 +1495,13 @@
#endif
update_state(cpi, tile_data, td, ctx, mi_row, mi_col, bsize, dry_run);
-#if CONFIG_LV_MAP
av1_set_coeff_buffer(cpi, x, mi_row, mi_col);
-#endif
encode_superblock(cpi, tile_data, td, tp, dry_run, mi_row, mi_col, bsize,
rate);
-#if CONFIG_LV_MAP
if (dry_run == 0)
x->cb_offset += block_size_wide[bsize] * block_size_high[bsize];
-#endif
if (!dry_run) {
#if CONFIG_EXT_DELTA_Q
@@ -2716,9 +2706,6 @@
#endif // CONFIG_DIST_8X8
if (bsize == cm->seq_params.sb_size) {
-#if !CONFIG_LV_MAP
- assert(tp_orig < *tp || (tp_orig == *tp && xd->mi[0]->mbmi.skip));
-#endif
assert(best_rdc.rate < INT_MAX);
assert(best_rdc.dist < INT64_MAX);
} else {
@@ -3565,9 +3552,7 @@
if (best_rdc.rate < INT_MAX && best_rdc.dist < INT64_MAX &&
pc_tree->index != 3) {
if (bsize == cm->seq_params.sb_size) {
-#if CONFIG_LV_MAP
x->cb_offset = 0;
-#endif
encode_sb(cpi, td, tile_data, tp, mi_row, mi_col, OUTPUT_ENABLED, bsize,
pc_tree, NULL);
@@ -3586,9 +3571,6 @@
#endif // CONFIG_DIST_8X8
if (bsize == cm->seq_params.sb_size) {
-#if !CONFIG_LV_MAP
- assert(tp_orig < *tp || (tp_orig == *tp && xd->mi[0]->mbmi.skip));
-#endif
assert(best_rdc.rate < INT_MAX);
assert(best_rdc.dist < INT64_MAX);
} else {
@@ -3644,14 +3626,7 @@
PC_TREE *const pc_root =
td->pc_root[cm->seq_params.mib_size_log2 - MIN_MIB_SIZE_LOG2];
-#if CONFIG_LV_MAP
av1_fill_coeff_costs(&td->mb, xd->tile_ctx, num_planes);
-#else
- av1_fill_token_costs_from_cdf(x->token_head_costs,
- x->e_mbd.tile_ctx->coef_head_cdfs);
- av1_fill_token_costs_from_cdf(x->token_tail_costs,
- x->e_mbd.tile_ctx->coef_tail_cdfs);
-#endif
av1_fill_mode_rates(cm, x, xd->tile_ctx);
if (sf->adaptive_pred_interp_filter) {
@@ -4969,13 +4944,8 @@
}
mbmi->min_tx_size = mbmi->tx_size;
-#if CONFIG_LV_MAP
av1_update_txb_context(cpi, td, dry_run, bsize, rate, mi_row, mi_col,
tile_data->allow_update_cdf);
-#else // CONFIG_LV_MAP
- av1_tokenize_sb(cpi, td, t, dry_run, bsize, rate, mi_row, mi_col,
- tile_data->allow_update_cdf);
-#endif // CONFIG_LV_MAP
} else {
int ref;
const int is_compound = has_second_ref(mbmi);
diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index 7bb3044..e0fac35 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -29,9 +29,7 @@
#include "av1/encoder/av1_quantize.h"
#include "av1/encoder/encodemb.h"
-#if CONFIG_LV_MAP
#include "av1/encoder/encodetxb.h"
-#endif
#include "av1/encoder/hybrid_fwd_txfm.h"
#include "av1/encoder/rd.h"
#include "av1/encoder/rdopt.h"
@@ -100,272 +98,6 @@
pd->dst.buf, pd->dst.stride);
}
-#if !CONFIG_LV_MAP
-// Shifting negative values is undefined behaviour in C99,
-// and could mislead the optimizer, who might assume the shifted is positive.
-// This also avoids ubsan warnings.
-// In practise, this gets inlined by the optimizer to a single instruction.
-static INLINE int signed_shift_right(int x, int shift) {
- if (x >= 0)
- return x >> shift;
- else
- return -((-x) >> shift);
-}
-
-// These numbers are empirically obtained.
-static const int plane_rd_mult[REF_TYPES][PLANE_TYPES] = {
- { 10, 7 },
- { 8, 5 },
-};
-
-static int optimize_b_greedy(const AV1_COMMON *cm, MACROBLOCK *mb, int plane,
- int blk_row, int blk_col, int block,
- TX_SIZE tx_size, int ctx, int fast_mode) {
- MACROBLOCKD *const xd = &mb->e_mbd;
- struct macroblock_plane *const p = &mb->plane[plane];
- struct macroblockd_plane *const pd = &xd->plane[plane];
- const PLANE_TYPE plane_type = pd->plane_type;
- const int eob = p->eobs[block];
- assert(mb->qindex > 0);
- assert((!plane_type && !plane) || (plane_type && plane));
- assert(eob <= av1_get_max_eob(tx_size));
- const int ref = is_inter_block(&xd->mi[0]->mbmi);
- const tran_low_t *const coeff = BLOCK_OFFSET(p->coeff, block);
- tran_low_t *const qcoeff = BLOCK_OFFSET(p->qcoeff, block);
- tran_low_t *const dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
- const int16_t *const dequant_ptr = p->dequant_QTX;
- const uint8_t *const band_translate = get_band_translate(tx_size);
- const TX_TYPE tx_type = av1_get_tx_type(plane_type, xd, blk_row, blk_col,
- tx_size, cm->reduced_tx_set_used);
- const SCAN_ORDER *const scan_order =
- get_scan(cm, tx_size, tx_type, &xd->mi[0]->mbmi);
- const int16_t *const scan = scan_order->scan;
- const int16_t *const nb = scan_order->neighbors;
- const int shift = av1_get_tx_scale(tx_size);
-#if CONFIG_AOM_QM
- int seg_id = xd->mi[0]->mbmi.segment_id;
- const TX_SIZE qm_tx_size = av1_get_adjusted_tx_size(tx_size);
- // Use a flat matrix (i.e. no weighting) for 1D and Identity transforms
- const qm_val_t *iqmatrix =
- IS_2D_TRANSFORM(tx_type)
- ? pd->seg_iqmatrix[seg_id][qm_tx_size]
- : cm->giqmatrix[NUM_QM_LEVELS - 1][0][qm_tx_size];
-#endif // CONFIG_AOM_QM
- int64_t rd_cost0, rd_cost1;
- int16_t t0, t1;
- int i, final_eob = 0;
- const int cat6_bits = av1_get_cat6_extrabits_size(tx_size, xd->bd);
- int(*head_token_costs)[COEFF_CONTEXTS][TAIL_TOKENS] =
- mb->token_head_costs[get_txsize_entropy_ctx(tx_size)][plane_type][ref];
- int(*tail_token_costs)[COEFF_CONTEXTS][TAIL_TOKENS] =
- mb->token_tail_costs[get_txsize_entropy_ctx(tx_size)][plane_type][ref];
-
- const int64_t rdmult = (mb->rdmult * plane_rd_mult[ref][plane_type]) >> 1;
- int64_t rate0, rate1;
- int64_t eob_cost0, eob_cost1;
- tran_low_t before_best_eob_qc = 0;
- tran_low_t before_best_eob_dqc = 0;
-
- uint8_t token_cache[MAX_TX_SQUARE];
-
- // TODO(debargha): Implement a fast mode. For now just skip.
- if (fast_mode) return eob;
-
- for (i = 0; i < eob; i++) {
- const int rc = scan[i];
- token_cache[rc] = av1_pt_energy_class[av1_get_token(qcoeff[rc])];
- }
-
- /* Record the r-d cost */
- int64_t accu_rate = 0;
- // Initialized to the worst possible error for the largest transform size.
- // This ensures that it never goes negative.
- int64_t accu_error = ((int64_t)1) << 50;
- rate0 = head_token_costs[0][ctx][0];
- int64_t best_block_rd_cost = RDCOST(rdmult, rate0, accu_error);
-
- // int64_t best_block_rd_cost_all0 = best_block_rd_cost;
- const int seg_eob =
- av1_get_tx_eob(&cm->seg, xd->mi[0]->mbmi.segment_id, tx_size);
- for (i = 0; i < eob; i++) {
- const int rc = scan[i];
- const int x = qcoeff[rc];
- const int sz = -(x < 0);
- const int band_cur = band_translate[i];
- const int ctx_cur = (i == 0) ? ctx : get_coef_context(nb, token_cache, i);
- const int8_t eob_val =
- (i + 1 == eob) ? (i + 1 == seg_eob ? LAST_EOB : EARLY_EOB) : NO_EOB;
- const int is_first = (i == 0);
-
- if (x == 0) {
- // no need to search when x == 0
- accu_rate += av1_get_coeff_token_cost(
- ZERO_TOKEN, eob_val, is_first, head_token_costs[band_cur][ctx_cur],
- tail_token_costs[band_cur][ctx_cur]);
- // accu_error does not change when x==0
- } else {
- /* Computing distortion
- */
- // compute the distortion for the first candidate
- // and the distortion for quantizing to 0.
- int dx0 = abs(coeff[rc]) * (1 << shift);
- dx0 >>= xd->bd - 8;
-
- const int64_t d0 = (int64_t)dx0 * dx0;
- const int x_a = x - 2 * sz - 1;
- int dqv = dequant_ptr[rc != 0];
-#if CONFIG_AOM_QM
- if (iqmatrix != NULL) {
- const qm_val_t iwt = iqmatrix[rc];
- dqv = ((iwt * (int)dqv) + (1 << (AOM_QM_BITS - 1))) >> AOM_QM_BITS;
- }
-#endif // CONFIG_AOM_QM
-
- int dx = (dqcoeff[rc] - coeff[rc]) * (1 << shift);
- dx = signed_shift_right(dx, xd->bd - 8);
- const int64_t d2 = (int64_t)dx * dx;
-
- /* compute the distortion for the second candidate
- * x_a = x - 2 * sz + 1;
- */
- int64_t d2_a;
- if (x_a != 0) {
- dx -= ((dqv >> (xd->bd - 8)) + sz) ^ sz;
- d2_a = (int64_t)dx * dx;
- } else {
- d2_a = d0;
- }
-
- // Computing RD cost
- int64_t base_bits;
- // rate cost of x
- base_bits = av1_get_token_cost(x, &t0, cat6_bits);
- rate0 = base_bits +
- av1_get_coeff_token_cost(t0, eob_val, is_first,
- head_token_costs[band_cur][ctx_cur],
- tail_token_costs[band_cur][ctx_cur]);
- // rate cost of x_a
- base_bits = av1_get_token_cost(x_a, &t1, cat6_bits);
- if (t1 == ZERO_TOKEN && eob_val) {
- rate1 = base_bits;
- } else {
- rate1 = base_bits +
- av1_get_coeff_token_cost(t1, eob_val, is_first,
- head_token_costs[band_cur][ctx_cur],
- tail_token_costs[band_cur][ctx_cur]);
- }
-
- int64_t next_bits0 = 0, next_bits1 = 0;
- if (i < eob - 1) {
- int ctx_next;
- const int band_next = band_translate[i + 1];
- const int token_next = av1_get_token(qcoeff[scan[i + 1]]);
- const int8_t eob_val_next =
- (i + 2 == eob) ? (i + 2 == seg_eob ? LAST_EOB : EARLY_EOB) : NO_EOB;
-
- token_cache[rc] = av1_pt_energy_class[t0];
- ctx_next = get_coef_context(nb, token_cache, i + 1);
- next_bits0 = av1_get_coeff_token_cost(
- token_next, eob_val_next, 0, head_token_costs[band_next][ctx_next],
- tail_token_costs[band_next][ctx_next]);
-
- token_cache[rc] = av1_pt_energy_class[t1];
- ctx_next = get_coef_context(nb, token_cache, i + 1);
- next_bits1 = av1_get_coeff_token_cost(
- token_next, eob_val_next, 0, head_token_costs[band_next][ctx_next],
- tail_token_costs[band_next][ctx_next]);
- }
-
- rd_cost0 = RDCOST(rdmult, (rate0 + next_bits0), d2);
- rd_cost1 = RDCOST(rdmult, (rate1 + next_bits1), d2_a);
- const int best_x = (rd_cost1 < rd_cost0);
-
- const int eob_v = (i + 1 == seg_eob) ? LAST_EOB : EARLY_EOB;
- int64_t next_eob_bits0, next_eob_bits1;
- int best_eob_x;
- next_eob_bits0 = av1_get_coeff_token_cost(
- t0, eob_v, is_first, head_token_costs[band_cur][ctx_cur],
- tail_token_costs[band_cur][ctx_cur]);
- eob_cost0 =
- RDCOST(rdmult, (accu_rate + next_eob_bits0), (accu_error + d2 - d0));
- eob_cost1 = eob_cost0;
- if (x_a != 0) {
- next_eob_bits1 = av1_get_coeff_token_cost(
- t1, eob_v, is_first, head_token_costs[band_cur][ctx_cur],
- tail_token_costs[band_cur][ctx_cur]);
- eob_cost1 = RDCOST(rdmult, (accu_rate + next_eob_bits1),
- (accu_error + d2_a - d0));
- best_eob_x = (eob_cost1 < eob_cost0);
- } else {
- best_eob_x = 0;
- }
-
- const int dqc = dqcoeff[rc];
- int dqc_a = 0;
- if (best_x || best_eob_x) {
- if (x_a != 0) {
- if (x_a < 0)
- dqc_a = -((-x_a * dqv) >> shift);
- else
- dqc_a = (x_a * dqv) >> shift;
- } else {
- dqc_a = 0;
- }
- }
-
- // record the better quantized value
- if (best_x) {
- assert(d2_a <= d0);
- qcoeff[rc] = x_a;
- dqcoeff[rc] = dqc_a;
- accu_rate += rate1;
- accu_error += d2_a - d0;
- token_cache[rc] = av1_pt_energy_class[t1];
- } else {
- assert(d2 <= d0);
- accu_rate += rate0;
- accu_error += d2 - d0;
- token_cache[rc] = av1_pt_energy_class[t0];
- }
- assert(accu_error >= 0);
-
- // determine whether to move the eob position to i+1
- const int use_a = (x_a != 0) && (best_eob_x);
- const int64_t best_eob_cost_i = use_a ? eob_cost1 : eob_cost0;
- if (best_eob_cost_i < best_block_rd_cost) {
- best_block_rd_cost = best_eob_cost_i;
- final_eob = i + 1;
- if (use_a) {
- before_best_eob_qc = x_a;
- before_best_eob_dqc = dqc_a;
- } else {
- before_best_eob_qc = x;
- before_best_eob_dqc = dqc;
- }
- }
- } // if (x==0)
- } // for (i)
-
- assert(final_eob <= eob);
- if (final_eob > 0) {
- assert(before_best_eob_qc != 0);
- i = final_eob - 1;
- int rc = scan[i];
- qcoeff[rc] = before_best_eob_qc;
- dqcoeff[rc] = before_best_eob_dqc;
- }
-
- for (i = final_eob; i < eob; i++) {
- int rc = scan[i];
- qcoeff[rc] = 0;
- dqcoeff[rc] = 0;
- }
-
- p->eobs[block] = final_eob;
- return final_eob;
-}
-#endif // !CONFIG_LV_MAP
-
int av1_optimize_b(const struct AV1_COMP *cpi, MACROBLOCK *mb, int plane,
int blk_row, int blk_col, int block, BLOCK_SIZE plane_bsize,
TX_SIZE tx_size, const ENTROPY_CONTEXT *a,
@@ -376,20 +108,10 @@
if (eob == 0 || !mb->optimize || xd->lossless[xd->mi[0]->mbmi.segment_id])
return eob;
-#if !CONFIG_LV_MAP
- (void)plane_bsize;
- (void)blk_row;
- (void)blk_col;
- int ctx = get_entropy_context(tx_size, a, l);
- const AV1_COMMON *const cm = &cpi->common;
- return optimize_b_greedy(cm, mb, plane, blk_row, blk_col, block, tx_size, ctx,
- fast_mode);
-#else // !CONFIG_LV_MAP
TXB_CTX txb_ctx;
get_txb_ctx(plane_bsize, tx_size, plane, a, l, &txb_ctx);
return av1_optimize_txb(cpi, mb, plane, blk_row, blk_col, block, tx_size,
&txb_ctx, fast_mode, rate_cost);
-#endif // !CONFIG_LV_MAP
}
typedef enum QUANT_FUNC {
@@ -471,10 +193,8 @@
av1_quantize_skip(n_coeffs, qcoeff, dqcoeff, eob);
}
}
-#if CONFIG_LV_MAP
p->txb_entropy_ctx[block] =
(uint8_t)av1_get_txb_entropy_context(qcoeff, scan_order, *eob);
-#endif // CONFIG_LV_MAP
return;
}
@@ -510,7 +230,7 @@
av1_xform_quant(cm, x, plane, block, blk_row, blk_col, plane_bsize,
tx_size, AV1_XFORM_QUANT_FP);
av1_optimize_b(args->cpi, x, plane, blk_row, blk_col, block, plane_bsize,
- tx_size, a, l, CONFIG_LV_MAP, &dummy_rate_cost);
+ tx_size, a, l, 1, &dummy_rate_cost);
} else {
av1_xform_quant(
cm, x, plane, block, blk_row, blk_col, plane_bsize, tx_size,
@@ -518,9 +238,7 @@
}
} else {
p->eobs[block] = 0;
-#if CONFIG_LV_MAP
p->txb_entropy_ctx[block] = 0;
-#endif
}
av1_set_txb_context(x, plane, block, tx_size, a, l);
@@ -770,11 +488,7 @@
(void)tx_size;
struct macroblock_plane *p = &x->plane[plane];
-#if !CONFIG_LV_MAP
- *a = *l = p->eobs[block] > 0;
-#else // !CONFIG_LV_MAP
*a = *l = p->txb_entropy_ctx[block];
-#endif // !CONFIG_LV_MAP
int i;
for (i = 0; i < tx_size_wide_unit[tx_size]; ++i) a[i] = a[0];
@@ -844,7 +558,7 @@
av1_xform_quant(cm, x, plane, block, blk_row, blk_col, plane_bsize, tx_size,
AV1_XFORM_QUANT_FP);
av1_optimize_b(args->cpi, x, plane, blk_row, blk_col, block, plane_bsize,
- tx_size, a, l, CONFIG_LV_MAP, &dummy_rate_cost);
+ tx_size, a, l, 1, &dummy_rate_cost);
#if CONFIG_TXK_SEL
if (plane == 0 && p->eobs[block] == 0) {
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index f0c3600..a45916c 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -35,9 +35,7 @@
#include "av1/encoder/encodeframe.h"
#include "av1/encoder/encodemv.h"
#include "av1/encoder/encoder.h"
-#if CONFIG_LV_MAP
#include "av1/encoder/encodetxb.h"
-#endif
#include "av1/encoder/ethread.h"
#include "av1/encoder/firstpass.h"
#if CONFIG_HASH_ME
@@ -550,9 +548,7 @@
#endif
av1_free_ref_frame_buffers(cm->buffer_pool);
-#if CONFIG_LV_MAP
av1_free_txb_buf(cpi);
-#endif
av1_free_context_buffers(cm);
aom_free_frame_buffer(&cpi->last_frame_uf);
@@ -842,9 +838,7 @@
av1_alloc_context_buffers(cm, cm->width, cm->height);
-#if CONFIG_LV_MAP
av1_alloc_txb_buf(cpi);
-#endif
alloc_context_buffers_ext(cpi);
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index d2c391e..4f5dc9a 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -402,9 +402,7 @@
QUANTS quants;
ThreadData td;
MB_MODE_INFO_EXT *mbmi_ext_base;
-#if CONFIG_LV_MAP
CB_COEFF_BUFFER *coeff_buffer_base;
-#endif
Dequants dequants;
AV1_COMMON common;
AV1EncoderConfig oxcf;
@@ -609,9 +607,7 @@
int arf_pos_in_gf[MAX_EXT_ARFS + 1];
int arf_pos_for_ovrly[MAX_EXT_ARFS + 1];
int global_motion_search_done;
-#if CONFIG_LV_MAP
tran_low_t *tcoeff_buf[MAX_MB_PLANE];
-#endif
int extra_arf_allowed;
int bwd_ref_allowed;
diff --git a/av1/encoder/firstpass.c b/av1/encoder/firstpass.c
index f605ed0..8c65d06 100644
--- a/av1/encoder/firstpass.c
+++ b/av1/encoder/firstpass.c
@@ -27,9 +27,7 @@
#include "av1/common/entropymv.h"
#include "av1/common/quant_common.h"
#include "av1/common/reconinter.h" // av1_setup_dst_planes()
-#if CONFIG_LV_MAP
#include "av1/common/txb_common.h"
-#endif
#include "av1/encoder/aq_variance.h"
#include "av1/encoder/av1_quantize.h"
#include "av1/encoder/block.h"
@@ -578,15 +576,11 @@
p[i].qcoeff = ctx->qcoeff[i];
pd[i].dqcoeff = ctx->dqcoeff[i];
p[i].eobs = ctx->eobs[i];
-#if CONFIG_LV_MAP
p[i].txb_entropy_ctx = ctx->txb_entropy_ctx[i];
-#endif
}
av1_init_mv_probs(cm);
-#if CONFIG_LV_MAP
av1_init_lv_map(cm);
-#endif
av1_initialize_rd_consts(cpi);
// Tiling is ignored in the first pass.
diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 4a13638..2f40dbb 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -36,9 +36,7 @@
#include "av1/encoder/encodemb.h"
#include "av1/encoder/encodemv.h"
#include "av1/encoder/encoder.h"
-#if CONFIG_LV_MAP
#include "av1/encoder/encodetxb.h"
-#endif
#include "av1/encoder/mcomp.h"
#include "av1/encoder/ratectrl.h"
#include "av1/encoder/rd.h"
@@ -473,7 +471,6 @@
x->nmvjointcost = x->nmv_vec_cost[nmv_ctx];
}
-#if CONFIG_LV_MAP
void av1_fill_coeff_costs(MACROBLOCK *x, FRAME_CONTEXT *fc,
const int num_planes) {
const int nplanes = AOMMIN(num_planes, PLANE_TYPES);
@@ -553,7 +550,6 @@
}
}
}
-#endif // CONFIG_LV_MAP
void av1_fill_token_costs_from_cdf(av1_coeff_cost *cost,
coeff_cdf_model (*cdf)[PLANE_TYPES]) {
@@ -733,11 +729,9 @@
const ENTROPY_CONTEXT *const above = pd->above_context;
const ENTROPY_CONTEXT *const left = pd->left_context;
-#if CONFIG_LV_MAP
memcpy(t_above, above, sizeof(ENTROPY_CONTEXT) * num_4x4_w);
memcpy(t_left, left, sizeof(ENTROPY_CONTEXT) * num_4x4_h);
return;
-#endif // CONFIG_LV_MAP
int i;
diff --git a/av1/encoder/rd.h b/av1/encoder/rd.h
index 44f2f1b..3cfcc96 100644
--- a/av1/encoder/rd.h
+++ b/av1/encoder/rd.h
@@ -461,10 +461,8 @@
void av1_fill_mode_rates(AV1_COMMON *const cm, MACROBLOCK *x,
FRAME_CONTEXT *fc);
-#if CONFIG_LV_MAP
void av1_fill_coeff_costs(MACROBLOCK *x, FRAME_CONTEXT *fc,
const int num_planes);
-#endif
void av1_fill_token_costs_from_cdf(av1_coeff_cost *cost,
coeff_cdf_model (*cdf)[PLANE_TYPES]);
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 0acf70b..de24d61 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -38,9 +38,7 @@
#include "av1/common/reconintra.h"
#include "av1/common/scan.h"
#include "av1/common/seg_common.h"
-#if CONFIG_LV_MAP
#include "av1/common/txb_common.h"
-#endif
#include "av1/common/warped_motion.h"
#include "av1/encoder/aq_variance.h"
@@ -49,9 +47,7 @@
#include "av1/encoder/encodemb.h"
#include "av1/encoder/encodemv.h"
#include "av1/encoder/encoder.h"
-#if CONFIG_LV_MAP
#include "av1/encoder/encodetxb.h"
-#endif
#include "av1/encoder/hybrid_fwd_txfm.h"
#include "av1/encoder/mcomp.h"
#include "av1/encoder/palette.h"
@@ -2089,7 +2085,7 @@
#endif
RDCOST(x->rdmult, 0, tmp_dist) + args->this_rd < args->best_rd) {
av1_optimize_b(cpi, x, plane, blk_row, blk_col, block, plane_bsize,
- tx_size, a, l, CONFIG_LV_MAP, &rate_cost);
+ tx_size, a, l, 1, &rate_cost);
const int eob = x->plane[plane].eobs[block];
if (!eob)
@@ -3792,15 +3788,9 @@
assert(tx_size < TX_SIZES_ALL);
-#if CONFIG_LV_MAP
TXB_CTX txb_ctx;
get_txb_ctx(plane_bsize, tx_size, plane, a, l, &txb_ctx);
uint16_t cur_joint_ctx = (txb_ctx.dc_sign_ctx << 8) + txb_ctx.txb_skip_ctx;
-#else
- const int coeff_ctx = get_entropy_context(tx_size, a, l);
- const int coeff_ctx_one_byte = combine_entropy_contexts(*a, *l);
- const uint8_t cur_joint_ctx = (coeff_ctx << 2) + coeff_ctx_one_byte;
-#endif
// Note: tmp below is pixel distortion, not TX domain
tmp = pixel_diff_dist(x, plane, diff, diff_stride, blk_row, blk_col,
@@ -3826,9 +3816,7 @@
rd_stats->rate += rd_info_array[tx_type].rate;
rd_stats->skip &= rd_info_array[tx_type].eob == 0;
p->eobs[block] = rd_info_array[tx_type].eob;
-#if CONFIG_LV_MAP
p->txb_entropy_ctx[block] = rd_info_array[tx_type].txb_entropy_ctx;
-#endif
return;
}
@@ -3951,9 +3939,7 @@
rd_info_array[tx_type].dist = cur_dist;
rd_info_array[tx_type].rate = cur_rate;
rd_info_array[tx_type].eob = eob;
-#if CONFIG_LV_MAP
rd_info_array[tx_type].txb_entropy_ctx = p->txb_entropy_ctx[block];
-#endif
}
rd_stats->dist += cur_dist;
@@ -4008,19 +3994,12 @@
// TX no split
{
-#if CONFIG_LV_MAP
const TX_SIZE txs_ctx = get_txsize_entropy_ctx(tx_size);
TXB_CTX txb_ctx;
get_txb_ctx(plane_bsize, tx_size, plane, pta, ptl, &txb_ctx);
const int zero_blk_rate = x->coeff_costs[txs_ctx][get_plane_type(plane)]
.txb_skip_cost[txb_ctx.txb_skip_ctx][1];
-#else
- const TX_SIZE tx_size_ctx = get_txsize_entropy_ctx(tx_size);
- const int coeff_ctx = get_entropy_context(tx_size, pta, ptl);
- const int zero_blk_rate =
- x->token_head_costs[tx_size_ctx][pd->plane_type][1][0][coeff_ctx][0];
-#endif
rd_stats->ref_rdcost = ref_best_rd;
rd_stats->zero_rate = zero_blk_rate;
@@ -4056,11 +4035,7 @@
if (tx_size > TX_4X4 && depth < MAX_VARTX_DEPTH)
rd_stats->rate += x->txfm_partition_cost[ctx][0];
this_rd = RDCOST(x->rdmult, rd_stats->rate, rd_stats->dist);
-#if CONFIG_LV_MAP
tmp_eob = p->txb_entropy_ctx[block];
-#else
- tmp_eob = p->eobs[block];
-#endif
#if CONFIG_TXK_SEL
const int txk_idx = (blk_row << MAX_MIB_SIZE_LOG2) + blk_col;
@@ -4225,11 +4200,7 @@
if (this_rd < sum_rd) {
const TX_SIZE tx_size_selected = tx_size;
-#if CONFIG_LV_MAP
p->txb_entropy_ctx[block] = tmp_eob;
-#else
- p->eobs[block] = tmp_eob;
-#endif
av1_set_txb_context(x, plane, block, tx_size_selected, pta, ptl);
@@ -4434,19 +4405,12 @@
if (tx_size == plane_tx_size || plane) {
ENTROPY_CONTEXT *ta = above_ctx + blk_col;
ENTROPY_CONTEXT *tl = left_ctx + blk_row;
-#if CONFIG_LV_MAP
const TX_SIZE txs_ctx = get_txsize_entropy_ctx(tx_size);
TXB_CTX txb_ctx;
get_txb_ctx(plane_bsize, tx_size, plane, ta, tl, &txb_ctx);
const int zero_blk_rate = x->coeff_costs[txs_ctx][get_plane_type(plane)]
.txb_skip_cost[txb_ctx.txb_skip_ctx][1];
-#else
- const int coeff_ctx = get_entropy_context(tx_size, ta, tl);
- const TX_SIZE tx_size_ctx = get_txsize_entropy_ctx(tx_size);
- const int zero_blk_rate =
- x->token_head_costs[tx_size_ctx][pd->plane_type][1][0][coeff_ctx][0];
-#endif // CONFIG_LV_MAP
rd_stats->zero_rate = zero_blk_rate;
rd_stats->ref_rdcost = ref_best_rd;
av1_tx_block_rd_b(cpi, x, tx_size, blk_row, blk_col, plane, block,
@@ -4460,12 +4424,10 @@
rd_stats->skip = 1;
x->blk_skip[plane][blk_row * mi_width + blk_col] = 1;
x->plane[plane].eobs[block] = 0;
-#if CONFIG_LV_MAP
x->plane[plane].txb_entropy_ctx[block] = 0;
#if CONFIG_TXK_SEL
update_txk_array(mbmi->txk_type, blk_row, blk_col, tx_size, DCT_DCT);
#endif
-#endif // CONFIG_LV_MAP
} else {
rd_stats->skip = 0;
x->blk_skip[plane][blk_row * mi_width + blk_col] = 0;
@@ -4906,16 +4868,11 @@
ENTROPY_CONTEXT ctxa[2 * MAX_MIB_SIZE];
ENTROPY_CONTEXT ctxl[2 * MAX_MIB_SIZE];
av1_get_entropy_contexts(bsize, 0, &xd->plane[0], ctxa, ctxl);
-#if CONFIG_LV_MAP
TXB_CTX txb_ctx;
// Because plane is 0, plane_bsize equal to bsize
get_txb_ctx(bsize, tx_size, 0, ctxa, ctxl, &txb_ctx);
int rate = x->coeff_costs[tx_size_ctx][PLANE_TYPE_Y]
.txb_skip_cost[txb_ctx.txb_skip_ctx][1];
-#else
- int coeff_ctx = get_entropy_context(tx_size, ctxa, ctxl);
- int rate = x->token_head_costs[tx_size_ctx][PLANE_TYPE_Y][1][0][coeff_ctx][0];
-#endif
if (tx_size > TX_4X4) {
int ctx = txfm_partition_context(
xd->above_txfm_context, xd->left_txfm_context, mbmi->sb_type, tx_size);
diff --git a/av1/encoder/rdopt.h b/av1/encoder/rdopt.h
index a53d193..a31d396 100644
--- a/av1/encoder/rdopt.h
+++ b/av1/encoder/rdopt.h
@@ -13,16 +13,12 @@
#define AV1_ENCODER_RDOPT_H_
#include "av1/common/blockd.h"
-#if CONFIG_LV_MAP
#include "av1/common/txb_common.h"
-#endif
#include "av1/encoder/block.h"
#include "av1/encoder/context_tree.h"
#include "av1/encoder/encoder.h"
-#if CONFIG_LV_MAP
#include "av1/encoder/encodetxb.h"
-#endif
#ifdef __cplusplus
extern "C" {
@@ -82,130 +78,6 @@
int bsh, int visible_w, int visible_h, int qindex);
#endif
-#if !CONFIG_LV_MAP
-DECLARE_ALIGNED(16, const uint16_t, band_count_table[TX_SIZES_ALL][8]);
-
-const uint16_t band_count_table[TX_SIZES_ALL][8] = {
- { 1, 2, 3, 4, 3, 16 - 13, 0 }, { 1, 2, 3, 4, 11, 64 - 21, 0 },
- { 1, 2, 3, 4, 11, 256 - 21, 0 }, { 1, 2, 3, 4, 11, 1024 - 21, 0 },
- { 1, 2, 3, 4, 11, 4096 - 21, 0 }, { 1, 2, 3, 4, 8, 32 - 18, 0 },
- { 1, 2, 3, 4, 8, 32 - 18, 0 }, { 1, 2, 3, 4, 11, 128 - 21, 0 },
- { 1, 2, 3, 4, 11, 128 - 21, 0 }, { 1, 2, 3, 4, 11, 512 - 21, 0 },
- { 1, 2, 3, 4, 11, 512 - 21, 0 }, { 1, 2, 3, 4, 11, 2048 - 21, 0 },
- { 1, 2, 3, 4, 11, 2048 - 21, 0 }, { 1, 2, 3, 4, 11, 64 - 21, 0 },
- { 1, 2, 3, 4, 11, 64 - 21, 0 }, { 1, 2, 3, 4, 11, 256 - 21, 0 },
- { 1, 2, 3, 4, 11, 256 - 21, 0 }, { 1, 2, 3, 4, 11, 1024 - 21, 0 },
- { 1, 2, 3, 4, 11, 1024 - 21, 0 },
-};
-
-static INLINE int cost_coeffs(const AV1_COMMON *const cm, MACROBLOCK *x,
- int plane, int block, TX_SIZE tx_size,
- const SCAN_ORDER *scan_order,
- const ENTROPY_CONTEXT *a,
- const ENTROPY_CONTEXT *l,
- int use_fast_coef_costing) {
- MACROBLOCKD *const xd = &x->e_mbd;
- MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi;
- const struct macroblock_plane *p = &x->plane[plane];
- const struct macroblockd_plane *pd = &xd->plane[plane];
- const PLANE_TYPE type = pd->plane_type;
- const uint16_t *band_count = &band_count_table[tx_size][1];
- const int eob = p->eobs[block];
- const tran_low_t *const qcoeff = BLOCK_OFFSET(p->qcoeff, block);
- const TX_SIZE tx_size_ctx = get_txsize_entropy_ctx(tx_size);
- uint8_t token_cache[MAX_TX_SQUARE];
- int pt = combine_entropy_contexts(*a, *l);
- int c, cost;
- const int16_t *scan = scan_order->scan;
- const int16_t *nb = scan_order->neighbors;
- const int ref = is_inter_block(mbmi);
- int(*head_token_costs)[COEFF_CONTEXTS][TAIL_TOKENS] =
- x->token_head_costs[tx_size_ctx][type][ref];
- int(*tail_token_costs)[COEFF_CONTEXTS][TAIL_TOKENS] =
- x->token_tail_costs[tx_size_ctx][type][ref];
- const int seg_eob = av1_get_tx_eob(&cm->seg, mbmi->segment_id, tx_size);
- int8_t eob_val;
- const int cat6_bits = av1_get_cat6_extrabits_size(tx_size, xd->bd);
- (void)cm;
-
- if (eob == 0) {
- // block zero
- cost = (*head_token_costs)[pt][0];
- } else {
- if (use_fast_coef_costing) {
- int band_left = *band_count++;
-
- // dc token
- int v = qcoeff[0];
- int16_t prev_t;
- cost = av1_get_token_cost(v, &prev_t, cat6_bits);
- eob_val = (eob == 1) ? EARLY_EOB : NO_EOB;
- cost += av1_get_coeff_token_cost(
- prev_t, eob_val, 1, (*head_token_costs)[pt], (*tail_token_costs)[pt]);
-
- token_cache[0] = av1_pt_energy_class[prev_t];
- ++head_token_costs;
- ++tail_token_costs;
-
- // ac tokens
- for (c = 1; c < eob; c++) {
- const int rc = scan[c];
- int16_t t;
-
- v = qcoeff[rc];
- cost += av1_get_token_cost(v, &t, cat6_bits);
- eob_val =
- (c + 1 == eob) ? (c + 1 == seg_eob ? LAST_EOB : EARLY_EOB) : NO_EOB;
- cost += av1_get_coeff_token_cost(t, eob_val, 0,
- (*head_token_costs)[!prev_t],
- (*tail_token_costs)[!prev_t]);
- prev_t = t;
- if (!--band_left) {
- band_left = *band_count++;
- ++head_token_costs;
- ++tail_token_costs;
- }
- }
- } else { // !use_fast_coef_costing
- int band_left = *band_count++;
-
- // dc token
- int v = qcoeff[0];
- int16_t tok;
- cost = av1_get_token_cost(v, &tok, cat6_bits);
- eob_val = (eob == 1) ? EARLY_EOB : NO_EOB;
- cost += av1_get_coeff_token_cost(tok, eob_val, 1, (*head_token_costs)[pt],
- (*tail_token_costs)[pt]);
-
- token_cache[0] = av1_pt_energy_class[tok];
- ++head_token_costs;
- ++tail_token_costs;
-
- // ac tokens
- for (c = 1; c < eob; c++) {
- const int rc = scan[c];
-
- v = qcoeff[rc];
- cost += av1_get_token_cost(v, &tok, cat6_bits);
- pt = get_coef_context(nb, token_cache, c);
- eob_val =
- (c + 1 == eob) ? (c + 1 == seg_eob ? LAST_EOB : EARLY_EOB) : NO_EOB;
- cost += av1_get_coeff_token_cost(
- tok, eob_val, 0, (*head_token_costs)[pt], (*tail_token_costs)[pt]);
- token_cache[rc] = av1_pt_energy_class[tok];
- if (!--band_left) {
- band_left = *band_count++;
- ++head_token_costs;
- ++tail_token_costs;
- }
- }
- }
- }
-
- return cost;
-}
-#endif // !CONFIG_LV_MAP
-
static INLINE int av1_cost_coeffs(const struct AV1_COMP *const cpi,
MACROBLOCK *x, int plane, int blk_row,
int blk_col, int block, TX_SIZE tx_size,
@@ -218,12 +90,6 @@
aom_usec_timer_start(&timer);
#endif
const AV1_COMMON *const cm = &cpi->common;
-#if !CONFIG_LV_MAP
- (void)blk_row;
- (void)blk_col;
- int cost = cost_coeffs(cm, x, plane, block, tx_size, scan_order, a, l,
- use_fast_coef_costing);
-#else // !CONFIG_LV_MAP
(void)scan_order;
(void)use_fast_coef_costing;
const MACROBLOCKD *xd = &x->e_mbd;
@@ -245,7 +111,6 @@
&x->coeff_costs[txs_ctx][plane_type];
cost = coeff_costs->txb_skip_cost[txb_ctx.txb_skip_ctx][1];
}
-#endif // !CONFIG_LV_MAP
#if TXCOEFF_COST_TIMER
AV1_COMMON *tmp_cm = (AV1_COMMON *)&cpi->common;
aom_usec_timer_mark(&timer);
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 1a246d5..3075a07 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -154,10 +154,10 @@
#if CONFIG_DUAL_FILTER
sf->use_fast_interpolation_filter_search = 1;
#endif // CONFIG_DUAL_FILTER
-#if 0 // CONFIG_HASH_ME && CONFIG_LV_MAP
+#if 0 // CONFIG_HASH_ME
// TODO(mfo): Activate feature once it gives positive results.
sf->use_hash_based_trellis = 1;
-#endif // CONFIG_HASH_ME && CONFIG_LV_MAP
+#endif // CONFIG_HASH_ME
sf->tx_type_search.skip_tx_search = 1;
}
diff --git a/av1/encoder/tokenize.c b/av1/encoder/tokenize.c
index ff6bcd4..f41449d 100644
--- a/av1/encoder/tokenize.c
+++ b/av1/encoder/tokenize.c
@@ -23,9 +23,7 @@
#include "av1/encoder/cost.h"
#include "av1/encoder/encoder.h"
-#if CONFIG_LV_MAP
#include "av1/encoder/encodetxb.h"
-#endif
#include "av1/encoder/rdopt.h"
#include "av1/encoder/tokenize.h"
@@ -498,7 +496,6 @@
if (tx_size == plane_tx_size || plane) {
plane_bsize = get_plane_block_size(mbmi->sb_type, pd);
-#if CONFIG_LV_MAP
if (!dry_run) {
av1_update_and_record_txb_context(plane, block, blk_row, blk_col,
plane_bsize, tx_size, arg);
@@ -509,15 +506,6 @@
printf("DRY_RUN_COSTCOEFFS is not supported yet\n");
assert(0);
}
-#else
- if (!dry_run)
- tokenize_b(plane, block, blk_row, blk_col, plane_bsize, tx_size, arg);
- else if (dry_run == DRY_RUN_NORMAL)
- set_entropy_context_b(plane, block, blk_row, blk_col, plane_bsize,
- tx_size, arg);
- else if (dry_run == DRY_RUN_COSTCOEFFS)
- cost_coeffs_b(plane, block, blk_row, blk_col, plane_bsize, tx_size, arg);
-#endif
} else {
// Half the block size in transform block unit.
const TX_SIZE sub_txs = sub_tx_size_map[1][tx_size];
@@ -551,37 +539,19 @@
MACROBLOCK *const x = &td->mb;
MACROBLOCKD *const xd = &x->e_mbd;
MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;
-#if CONFIG_LV_MAP
(void)t;
-#else
- TOKENEXTRA *t_backup = *t;
-#endif
struct tokenize_b_args arg = { cpi, td, t, 0, allow_update_cdf };
if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols) return;
if (mbmi->skip) {
av1_reset_skip_context(xd, mi_row, mi_col, bsize, num_planes);
-#if !CONFIG_LV_MAP
- if (dry_run) *t = t_backup;
-#endif
return;
}
-#if !CONFIG_LV_MAP
- else
- *t = t_backup;
-#endif
-
for (int plane = 0; plane < num_planes; ++plane) {
if (!is_chroma_reference(mi_row, mi_col, bsize,
xd->plane[plane].subsampling_x,
xd->plane[plane].subsampling_y)) {
-#if !CONFIG_LV_MAP
- if (!dry_run) {
- (*t)->token = EOSB_TOKEN;
- (*t)++;
- }
-#endif
continue;
}
const struct macroblockd_plane *const pd = &xd->plane[plane];
@@ -622,12 +592,6 @@
}
}
}
-#if !CONFIG_LV_MAP
- if (!dry_run) {
- (*t)->token = EOSB_TOKEN;
- (*t)++;
- }
-#endif
}
if (rate) *rate += arg.this_rate;
}
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 398d430..b4b887f 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -131,7 +131,6 @@
set(CONFIG_LOOPFILTER_LEVEL 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_LOOP_RESTORATION 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_LOWPRECISION_BLEND 2 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_LV_MAP 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_MAX_TILE 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_MFMV 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_MONO_VIDEO 1 CACHE NUMBER "AV1 experiment flag.")
diff --git a/build/cmake/aom_experiment_deps.cmake b/build/cmake/aom_experiment_deps.cmake
index fc9536d..45a6341 100644
--- a/build/cmake/aom_experiment_deps.cmake
+++ b/build/cmake/aom_experiment_deps.cmake
@@ -35,12 +35,6 @@
endif ()
endif ()
- if (CONFIG_EOB_FIRST)
- if (NOT CONFIG_LV_MAP)
- change_config_and_warn(CONFIG_LV_MAP 1 CONFIG_EOB_FIRST)
- endif ()
- endif ()
-
if (CONFIG_EXT_INTRA_MOD)
if (NOT CONFIG_INTRA_EDGE)
change_config_and_warn(CONFIG_INTRA_EDGE 1 CONFIG_EXT_INTRA_MOD)
@@ -65,12 +59,6 @@
endif ()
endif ()
- if (CONFIG_TXK_SEL)
- if (NOT CONFIG_LV_MAP)
- change_config_and_warn(CONFIG_LV_MAP 1 CONFIG_TXK_SEL)
- endif ()
- endif ()
-
if (CONFIG_AOM_QM_EXT)
if (NOT CONFIG_AOM_QM)
change_config_and_warn(CONFIG_AOM_QM 1 CONFIG_AOM_QM_EXT)
diff --git a/test/av1_inv_txfm_test.cc b/test/av1_inv_txfm_test.cc
index 09995d8..5b5c38f 100644
--- a/test/av1_inv_txfm_test.cc
+++ b/test/av1_inv_txfm_test.cc
@@ -81,180 +81,4 @@
IdctParam(&aom_idct16_c, 16, 4),
IdctParam(&aom_idct32_c, 32, 6)));
-#if CONFIG_AV1_ENCODER && !CONFIG_LV_MAP
-typedef void (*FwdTxfmFunc)(const int16_t *in, tran_low_t *out, int stride);
-typedef void (*InvTxfmFunc)(const tran_low_t *in, uint8_t *out, int stride);
-typedef std::tr1::tuple<FwdTxfmFunc, InvTxfmFunc, InvTxfmFunc, TX_SIZE, int>
- PartialInvTxfmParam;
-const int kMaxNumCoeffs = 1024;
-class AV1PartialIDctTest
- : public ::testing::TestWithParam<PartialInvTxfmParam> {
- public:
- virtual ~AV1PartialIDctTest() {}
- virtual void SetUp() {
- ftxfm_ = GET_PARAM(0);
- full_itxfm_ = GET_PARAM(1);
- partial_itxfm_ = GET_PARAM(2);
- tx_size_ = GET_PARAM(3);
- last_nonzero_ = GET_PARAM(4);
- }
-
- virtual void TearDown() { libaom_test::ClearSystemState(); }
-
- protected:
- int last_nonzero_;
- TX_SIZE tx_size_;
- FwdTxfmFunc ftxfm_;
- InvTxfmFunc full_itxfm_;
- InvTxfmFunc partial_itxfm_;
-};
-
-static MB_MODE_INFO get_mbmi() {
- MB_MODE_INFO mbmi;
- mbmi.ref_frame[0] = LAST_FRAME;
- assert(is_inter_block(&mbmi));
- return mbmi;
-}
-
-TEST_P(AV1PartialIDctTest, RunQuantCheck) {
- int size;
- switch (tx_size_) {
- case TX_4X4: size = 4; break;
- case TX_8X8: size = 8; break;
- case TX_16X16: size = 16; break;
- case TX_32X32: size = 32; break;
- default: FAIL() << "Wrong Size!"; break;
- }
- DECLARE_ALIGNED(16, tran_low_t, test_coef_block1[kMaxNumCoeffs]);
- DECLARE_ALIGNED(16, tran_low_t, test_coef_block2[kMaxNumCoeffs]);
- DECLARE_ALIGNED(16, uint8_t, dst1[kMaxNumCoeffs]);
- DECLARE_ALIGNED(16, uint8_t, dst2[kMaxNumCoeffs]);
-
- const int count_test_block = 1000;
- const int block_size = size * size;
-
- DECLARE_ALIGNED(16, int16_t, input_extreme_block[kMaxNumCoeffs]);
- DECLARE_ALIGNED(16, tran_low_t, output_ref_block[kMaxNumCoeffs]);
-
- int max_error = 0;
- for (int m = 0; m < count_test_block; ++m) {
- // clear out destination buffer
- memset(dst1, 0, sizeof(*dst1) * block_size);
- memset(dst2, 0, sizeof(*dst2) * block_size);
- memset(test_coef_block1, 0, sizeof(*test_coef_block1) * block_size);
- memset(test_coef_block2, 0, sizeof(*test_coef_block2) * block_size);
-
- ACMRandom rnd(ACMRandom::DeterministicSeed());
-
- for (int n = 0; n < count_test_block; ++n) {
- // Initialize a test block with input range [-255, 255].
- if (n == 0) {
- for (int j = 0; j < block_size; ++j) input_extreme_block[j] = 255;
- } else if (n == 1) {
- for (int j = 0; j < block_size; ++j) input_extreme_block[j] = -255;
- } else {
- for (int j = 0; j < block_size; ++j) {
- input_extreme_block[j] = rnd.Rand8() % 2 ? 255 : -255;
- }
- }
-
- ftxfm_(input_extreme_block, output_ref_block, size);
-
- // quantization with maximum allowed step sizes
- test_coef_block1[0] = (output_ref_block[0] / 1336) * 1336;
- MB_MODE_INFO mbmi = get_mbmi();
- for (int j = 1; j < last_nonzero_; ++j)
- test_coef_block1[get_scan((const AV1_COMMON *)NULL, tx_size_, DCT_DCT,
- &mbmi)
- ->scan[j]] = (output_ref_block[j] / 1828) * 1828;
- }
-
- ASM_REGISTER_STATE_CHECK(full_itxfm_(test_coef_block1, dst1, size));
- ASM_REGISTER_STATE_CHECK(partial_itxfm_(test_coef_block1, dst2, size));
-
- for (int j = 0; j < block_size; ++j) {
- const int diff = dst1[j] - dst2[j];
- const int error = diff * diff;
- if (max_error < error) max_error = error;
- }
- }
-
- EXPECT_EQ(0, max_error)
- << "Error: partial inverse transform produces different results";
-}
-
-TEST_P(AV1PartialIDctTest, ResultsMatch) {
- ACMRandom rnd(ACMRandom::DeterministicSeed());
- int size;
- switch (tx_size_) {
- case TX_4X4: size = 4; break;
- case TX_8X8: size = 8; break;
- case TX_16X16: size = 16; break;
- case TX_32X32: size = 32; break;
- default: FAIL() << "Wrong Size!"; break;
- }
- DECLARE_ALIGNED(16, tran_low_t, test_coef_block1[kMaxNumCoeffs]);
- DECLARE_ALIGNED(16, tran_low_t, test_coef_block2[kMaxNumCoeffs]);
- DECLARE_ALIGNED(16, uint8_t, dst1[kMaxNumCoeffs]);
- DECLARE_ALIGNED(16, uint8_t, dst2[kMaxNumCoeffs]);
- const int count_test_block = 1000;
- const int max_coeff = 32766 / 4;
- const int block_size = size * size;
- int max_error = 0;
- for (int i = 0; i < count_test_block; ++i) {
- // clear out destination buffer
- memset(dst1, 0, sizeof(*dst1) * block_size);
- memset(dst2, 0, sizeof(*dst2) * block_size);
- memset(test_coef_block1, 0, sizeof(*test_coef_block1) * block_size);
- memset(test_coef_block2, 0, sizeof(*test_coef_block2) * block_size);
- int max_energy_leftover = max_coeff * max_coeff;
- for (int j = 0; j < last_nonzero_; ++j) {
- int16_t coef = static_cast<int16_t>(sqrt(1.0 * max_energy_leftover) *
- (rnd.Rand16() - 32768) / 65536);
- max_energy_leftover -= coef * coef;
- if (max_energy_leftover < 0) {
- max_energy_leftover = 0;
- coef = 0;
- }
- MB_MODE_INFO mbmi = get_mbmi();
- test_coef_block1[get_scan((const AV1_COMMON *)NULL, tx_size_, DCT_DCT,
- &mbmi)
- ->scan[j]] = coef;
- }
-
- memcpy(test_coef_block2, test_coef_block1,
- sizeof(*test_coef_block2) * block_size);
-
- ASM_REGISTER_STATE_CHECK(full_itxfm_(test_coef_block1, dst1, size));
- ASM_REGISTER_STATE_CHECK(partial_itxfm_(test_coef_block2, dst2, size));
-
- for (int j = 0; j < block_size; ++j) {
- const int diff = dst1[j] - dst2[j];
- const int error = diff * diff;
- if (max_error < error) max_error = error;
- }
- }
-
- EXPECT_EQ(0, max_error)
- << "Error: partial inverse transform produces different results";
-}
-using std::tr1::make_tuple;
-
-INSTANTIATE_TEST_CASE_P(
- C, AV1PartialIDctTest,
- ::testing::Values(make_tuple(&aom_fdct32x32_c, &aom_idct32x32_1024_add_c,
- &aom_idct32x32_34_add_c, TX_32X32, 34),
- make_tuple(&aom_fdct32x32_c, &aom_idct32x32_1024_add_c,
- &aom_idct32x32_1_add_c, TX_32X32, 1),
- make_tuple(&aom_fdct16x16_c, &aom_idct16x16_256_add_c,
- &aom_idct16x16_10_add_c, TX_16X16, 10),
- make_tuple(&aom_fdct16x16_c, &aom_idct16x16_256_add_c,
- &aom_idct16x16_1_add_c, TX_16X16, 1),
- make_tuple(&aom_fdct8x8_c, &aom_idct8x8_64_add_c,
- &aom_idct8x8_12_add_c, TX_8X8, 12),
- make_tuple(&aom_fdct8x8_c, &aom_idct8x8_64_add_c,
- &aom_idct8x8_1_add_c, TX_8X8, 1),
- make_tuple(&aom_fdct4x4_c, &aom_idct4x4_16_add_c,
- &aom_idct4x4_1_add_c, TX_4X4, 1)));
-#endif // CONFIG_AV1_ENCODER && !CONFIG_LV_MAP
} // namespace
diff --git a/test/boolcoder_test.cc b/test/boolcoder_test.cc
index 1ab768d..72182de 100644
--- a/test/boolcoder_test.cc
+++ b/test/boolcoder_test.cc
@@ -86,11 +86,7 @@
}
}
-#if CONFIG_LV_MAP
#define FRAC_DIFF_TOTAL_ERROR 0.18
-#else
-#define FRAC_DIFF_TOTAL_ERROR 0.16
-#endif
TEST(AV1, TestTell) {
const int kBufferSize = 10000;
diff --git a/test/partial_idct_test.cc b/test/partial_idct_test.cc
index f513c6d..0f65ba0 100644
--- a/test/partial_idct_test.cc
+++ b/test/partial_idct_test.cc
@@ -29,361 +29,4 @@
using libaom_test::ACMRandom;
-namespace {
-#if !CONFIG_LV_MAP
-typedef void (*FwdTxfmFunc)(const int16_t *in, tran_low_t *out, int stride);
-typedef void (*InvTxfmFunc)(const tran_low_t *in, uint8_t *out, int stride);
-typedef void (*InvTxfmWithBdFunc)(const tran_low_t *in, uint8_t *out,
- int stride, int bd);
-
-template <InvTxfmFunc fn>
-void wrapper(const tran_low_t *in, uint8_t *out, int stride, int bd) {
- (void)bd;
- fn(in, out, stride);
-}
-
-typedef std::tr1::tuple<FwdTxfmFunc, InvTxfmWithBdFunc, InvTxfmWithBdFunc,
- TX_SIZE, int, int, int>
- PartialInvTxfmParam;
-const int kMaxNumCoeffs = 1024;
-const int kCountTestBlock = 10000;
-
-class PartialIDctTest : public ::testing::TestWithParam<PartialInvTxfmParam> {
- public:
- virtual ~PartialIDctTest() {}
- virtual void SetUp() {
- rnd_.Reset(ACMRandom::DeterministicSeed());
- ftxfm_ = GET_PARAM(0);
- full_itxfm_ = GET_PARAM(1);
- partial_itxfm_ = GET_PARAM(2);
- tx_size_ = GET_PARAM(3);
- last_nonzero_ = GET_PARAM(4);
- bit_depth_ = GET_PARAM(5);
- pixel_size_ = GET_PARAM(6);
- mask_ = (1 << bit_depth_) - 1;
-
- switch (tx_size_) {
- case TX_4X4: size_ = 4; break;
- case TX_8X8: size_ = 8; break;
- case TX_16X16: size_ = 16; break;
- case TX_32X32: size_ = 32; break;
- default: FAIL() << "Wrong Size!"; break;
- }
-
- // Randomize stride_ to a value less than or equal to 1024
- stride_ = rnd_(1024) + 1;
- if (stride_ < size_) {
- stride_ = size_;
- }
- // Align stride_ to 16 if it's bigger than 16.
- if (stride_ > 16) {
- stride_ &= ~15;
- }
-
- input_block_size_ = size_ * size_;
- output_block_size_ = size_ * stride_;
-
- input_block_ = reinterpret_cast<tran_low_t *>(
- aom_memalign(16, sizeof(*input_block_) * input_block_size_));
- output_block_ = reinterpret_cast<uint8_t *>(
- aom_memalign(16, pixel_size_ * output_block_size_));
- output_block_ref_ = reinterpret_cast<uint8_t *>(
- aom_memalign(16, pixel_size_ * output_block_size_));
- }
-
- virtual void TearDown() {
- aom_free(input_block_);
- input_block_ = NULL;
- aom_free(output_block_);
- output_block_ = NULL;
- aom_free(output_block_ref_);
- output_block_ref_ = NULL;
- libaom_test::ClearSystemState();
- }
-
- void InitMem() {
- memset(input_block_, 0, sizeof(*input_block_) * input_block_size_);
- if (pixel_size_ == 1) {
- for (int j = 0; j < output_block_size_; ++j) {
- output_block_[j] = output_block_ref_[j] = rnd_.Rand16() & mask_;
- }
- } else {
- ASSERT_EQ(2, pixel_size_);
- uint16_t *const output = reinterpret_cast<uint16_t *>(output_block_);
- uint16_t *const output_ref =
- reinterpret_cast<uint16_t *>(output_block_ref_);
- for (int j = 0; j < output_block_size_; ++j) {
- output[j] = output_ref[j] = rnd_.Rand16() & mask_;
- }
- }
- }
-
- void InitInput() {
- const int max_coeff = 32766 / 4;
- int max_energy_leftover = max_coeff * max_coeff;
- for (int j = 0; j < last_nonzero_; ++j) {
- int16_t coeff = static_cast<int16_t>(sqrt(1.0 * max_energy_leftover) *
- (rnd_.Rand16() - 32768) / 65536);
- max_energy_leftover -= coeff * coeff;
- if (max_energy_leftover < 0) {
- max_energy_leftover = 0;
- coeff = 0;
- }
- input_block_[av1_default_scan_orders[tx_size_].scan[j]] = coeff;
- }
- }
-
- protected:
- int last_nonzero_;
- TX_SIZE tx_size_;
- tran_low_t *input_block_;
- uint8_t *output_block_;
- uint8_t *output_block_ref_;
- int size_;
- int stride_;
- int pixel_size_;
- int input_block_size_;
- int output_block_size_;
- int bit_depth_;
- int mask_;
- FwdTxfmFunc ftxfm_;
- InvTxfmWithBdFunc full_itxfm_;
- InvTxfmWithBdFunc partial_itxfm_;
- ACMRandom rnd_;
-};
-
-TEST_P(PartialIDctTest, RunQuantCheck) {
- DECLARE_ALIGNED(16, int16_t, input_extreme_block[kMaxNumCoeffs]);
- DECLARE_ALIGNED(16, tran_low_t, output_ref_block[kMaxNumCoeffs]);
-
- InitMem();
- for (int i = 0; i < kCountTestBlock; ++i) {
- // Initialize a test block with input range [-mask_, mask_].
- if (i == 0) {
- for (int k = 0; k < input_block_size_; ++k) {
- input_extreme_block[k] = mask_;
- }
- } else if (i == 1) {
- for (int k = 0; k < input_block_size_; ++k) {
- input_extreme_block[k] = -mask_;
- }
- } else {
- for (int k = 0; k < input_block_size_; ++k) {
- input_extreme_block[k] = rnd_.Rand8() % 2 ? mask_ : -mask_;
- }
- }
-
- ftxfm_(input_extreme_block, output_ref_block, size_);
-
- // quantization with minimum allowed step sizes
- input_block_[0] = (output_ref_block[0] / 4) * 4;
- for (int k = 1; k < last_nonzero_; ++k) {
- const int pos = av1_default_scan_orders[tx_size_].scan[k];
- input_block_[pos] = (output_ref_block[pos] / 4) * 4;
- }
-
- ASM_REGISTER_STATE_CHECK(
- full_itxfm_(input_block_, output_block_ref_, stride_, bit_depth_));
- ASM_REGISTER_STATE_CHECK(
- partial_itxfm_(input_block_, output_block_, stride_, bit_depth_));
- ASSERT_EQ(0, memcmp(output_block_ref_, output_block_,
- pixel_size_ * output_block_size_))
- << "Error: partial inverse transform produces different results";
- }
-}
-
-TEST_P(PartialIDctTest, ResultsMatch) {
- for (int i = 0; i < kCountTestBlock; ++i) {
- InitMem();
- InitInput();
-
- ASM_REGISTER_STATE_CHECK(
- full_itxfm_(input_block_, output_block_ref_, stride_, bit_depth_));
- ASM_REGISTER_STATE_CHECK(
- partial_itxfm_(input_block_, output_block_, stride_, bit_depth_));
- ASSERT_EQ(0, memcmp(output_block_ref_, output_block_,
- pixel_size_ * output_block_size_))
- << "Error: partial inverse transform produces different results";
- }
-}
-
-TEST_P(PartialIDctTest, AddOutputBlock) {
- for (int i = 0; i < kCountTestBlock; ++i) {
- InitMem();
- for (int j = 0; j < last_nonzero_; ++j) {
- input_block_[av1_default_scan_orders[tx_size_].scan[j]] = 10;
- }
-
- ASM_REGISTER_STATE_CHECK(
- full_itxfm_(input_block_, output_block_ref_, stride_, bit_depth_));
- ASM_REGISTER_STATE_CHECK(
- partial_itxfm_(input_block_, output_block_, stride_, bit_depth_));
- ASSERT_EQ(0, memcmp(output_block_ref_, output_block_,
- pixel_size_ * output_block_size_))
- << "Error: Transform results are not correctly added to output.";
- }
-}
-
-TEST_P(PartialIDctTest, SingleExtremeCoeff) {
- const int16_t max_coeff = INT16_MAX;
- const int16_t min_coeff = INT16_MIN;
- for (int i = 0; i < last_nonzero_; ++i) {
- memset(input_block_, 0, sizeof(*input_block_) * input_block_size_);
- // Run once for min and once for max.
- for (int j = 0; j < 2; ++j) {
- const int coeff = j ? min_coeff : max_coeff;
-
- memset(output_block_, 0, pixel_size_ * output_block_size_);
- memset(output_block_ref_, 0, pixel_size_ * output_block_size_);
- input_block_[av1_default_scan_orders[tx_size_].scan[i]] = coeff;
-
- ASM_REGISTER_STATE_CHECK(
- full_itxfm_(input_block_, output_block_ref_, stride_, bit_depth_));
- ASM_REGISTER_STATE_CHECK(
- partial_itxfm_(input_block_, output_block_, stride_, bit_depth_));
- ASSERT_EQ(0, memcmp(output_block_ref_, output_block_,
- pixel_size_ * output_block_size_))
- << "Error: Fails with single coeff of " << coeff << " at " << i
- << ".";
- }
- }
-}
-
-TEST_P(PartialIDctTest, DISABLED_Speed) {
- // Keep runtime stable with transform size.
- const int kCountSpeedTestBlock = 500000000 / input_block_size_;
- InitMem();
- InitInput();
-
- for (int i = 0; i < kCountSpeedTestBlock; ++i) {
- ASM_REGISTER_STATE_CHECK(
- full_itxfm_(input_block_, output_block_ref_, stride_, bit_depth_));
- }
- aom_usec_timer timer;
- aom_usec_timer_start(&timer);
- for (int i = 0; i < kCountSpeedTestBlock; ++i) {
- partial_itxfm_(input_block_, output_block_, stride_, bit_depth_);
- }
- libaom_test::ClearSystemState();
- aom_usec_timer_mark(&timer);
- const int elapsed_time =
- static_cast<int>(aom_usec_timer_elapsed(&timer) / 1000);
- printf("idct%dx%d_%d (bitdepth %d) time: %5d ms\n", size_, size_,
- last_nonzero_, bit_depth_, elapsed_time);
-
- ASSERT_EQ(0, memcmp(output_block_ref_, output_block_,
- pixel_size_ * output_block_size_))
- << "Error: partial inverse transform produces different results";
-}
-
-using std::tr1::make_tuple;
-
-const PartialInvTxfmParam c_partial_idct_tests[] = {
- make_tuple(&aom_fdct32x32_c, &wrapper<aom_idct32x32_1024_add_c>,
- &wrapper<aom_idct32x32_1024_add_c>, TX_32X32, 1024, 8, 1),
- make_tuple(&aom_fdct32x32_c, &wrapper<aom_idct32x32_1024_add_c>,
- &wrapper<aom_idct32x32_135_add_c>, TX_32X32, 135, 8, 1),
- make_tuple(&aom_fdct32x32_c, &wrapper<aom_idct32x32_1024_add_c>,
- &wrapper<aom_idct32x32_34_add_c>, TX_32X32, 34, 8, 1),
- make_tuple(&aom_fdct32x32_c, &wrapper<aom_idct32x32_1024_add_c>,
- &wrapper<aom_idct32x32_1_add_c>, TX_32X32, 1, 8, 1),
- make_tuple(&aom_fdct16x16_c, &wrapper<aom_idct16x16_256_add_c>,
- &wrapper<aom_idct16x16_256_add_c>, TX_16X16, 256, 8, 1),
- make_tuple(&aom_fdct16x16_c, &wrapper<aom_idct16x16_256_add_c>,
- &wrapper<aom_idct16x16_38_add_c>, TX_16X16, 38, 8, 1),
- make_tuple(&aom_fdct16x16_c, &wrapper<aom_idct16x16_256_add_c>,
- &wrapper<aom_idct16x16_10_add_c>, TX_16X16, 10, 8, 1),
- make_tuple(&aom_fdct16x16_c, &wrapper<aom_idct16x16_256_add_c>,
- &wrapper<aom_idct16x16_1_add_c>, TX_16X16, 1, 8, 1),
- make_tuple(&aom_fdct8x8_c, &wrapper<aom_idct8x8_64_add_c>,
- &wrapper<aom_idct8x8_64_add_c>, TX_8X8, 64, 8, 1),
- make_tuple(&aom_fdct8x8_c, &wrapper<aom_idct8x8_64_add_c>,
- &wrapper<aom_idct8x8_12_add_c>, TX_8X8, 12, 8, 1),
- make_tuple(&aom_fdct8x8_c, &wrapper<aom_idct8x8_64_add_c>,
- &wrapper<aom_idct8x8_1_add_c>, TX_8X8, 1, 8, 1),
- make_tuple(&aom_fdct4x4_c, &wrapper<aom_idct4x4_16_add_c>,
- &wrapper<aom_idct4x4_16_add_c>, TX_4X4, 16, 8, 1),
- make_tuple(&aom_fdct4x4_c, &wrapper<aom_idct4x4_16_add_c>,
- &wrapper<aom_idct4x4_1_add_c>, TX_4X4, 1, 8, 1)
-};
-
-INSTANTIATE_TEST_CASE_P(C, PartialIDctTest,
- ::testing::ValuesIn(c_partial_idct_tests));
-
-#if HAVE_SSE2
-const PartialInvTxfmParam sse2_partial_idct_tests[] = {
- make_tuple(&aom_fdct32x32_c, &wrapper<aom_idct32x32_1024_add_c>,
- &wrapper<aom_idct32x32_1024_add_sse2>, TX_32X32, 1024, 8, 1),
- make_tuple(&aom_fdct32x32_c, &wrapper<aom_idct32x32_1024_add_c>,
- &wrapper<aom_idct32x32_1024_add_sse2>, TX_32X32, 135, 8, 1),
- make_tuple(&aom_fdct32x32_c, &wrapper<aom_idct32x32_1024_add_c>,
- &wrapper<aom_idct32x32_34_add_sse2>, TX_32X32, 34, 8, 1),
- make_tuple(&aom_fdct32x32_c, &wrapper<aom_idct32x32_1024_add_c>,
- &wrapper<aom_idct32x32_1_add_sse2>, TX_32X32, 1, 8, 1),
- make_tuple(&aom_fdct16x16_c, &wrapper<aom_idct16x16_256_add_c>,
- &wrapper<aom_idct16x16_256_add_sse2>, TX_16X16, 256, 8, 1),
- make_tuple(&aom_fdct16x16_c, &wrapper<aom_idct16x16_256_add_c>,
- &wrapper<aom_idct16x16_10_add_sse2>, TX_16X16, 10, 8, 1),
- make_tuple(&aom_fdct16x16_c, &wrapper<aom_idct16x16_256_add_c>,
- &wrapper<aom_idct16x16_1_add_sse2>, TX_16X16, 1, 8, 1),
- make_tuple(&aom_fdct8x8_c, &wrapper<aom_idct8x8_64_add_c>,
- &wrapper<aom_idct8x8_64_add_sse2>, TX_8X8, 64, 8, 1),
- make_tuple(&aom_fdct8x8_c, &wrapper<aom_idct8x8_64_add_c>,
- &wrapper<aom_idct8x8_12_add_sse2>, TX_8X8, 12, 8, 1),
- make_tuple(&aom_fdct8x8_c, &wrapper<aom_idct8x8_64_add_c>,
- &wrapper<aom_idct8x8_1_add_sse2>, TX_8X8, 1, 8, 1),
- make_tuple(&aom_fdct4x4_c, &wrapper<aom_idct4x4_16_add_c>,
- &wrapper<aom_idct4x4_16_add_sse2>, TX_4X4, 16, 8, 1),
- make_tuple(&aom_fdct4x4_c, &wrapper<aom_idct4x4_16_add_c>,
- &wrapper<aom_idct4x4_1_add_sse2>, TX_4X4, 1, 8, 1)
-};
-
-INSTANTIATE_TEST_CASE_P(SSE2, PartialIDctTest,
- ::testing::ValuesIn(sse2_partial_idct_tests));
-
-#endif // HAVE_SSE2
-
-#if HAVE_SSSE3
-const PartialInvTxfmParam ssse3_partial_idct_tests[] = {
- make_tuple(&aom_fdct32x32_c, &wrapper<aom_idct32x32_1024_add_c>,
- &wrapper<aom_idct32x32_1024_add_ssse3>, TX_32X32, 1024, 8, 1),
- make_tuple(&aom_fdct32x32_c, &wrapper<aom_idct32x32_1024_add_c>,
- &wrapper<aom_idct32x32_135_add_ssse3>, TX_32X32, 135, 8, 1),
- make_tuple(&aom_fdct32x32_c, &wrapper<aom_idct32x32_1024_add_c>,
- &wrapper<aom_idct32x32_34_add_ssse3>, TX_32X32, 34, 8, 1),
- make_tuple(&aom_fdct8x8_c, &wrapper<aom_idct8x8_64_add_c>,
- &wrapper<aom_idct8x8_64_add_ssse3>, TX_8X8, 64, 8, 1),
- make_tuple(&aom_fdct8x8_c, &wrapper<aom_idct8x8_64_add_c>,
- &wrapper<aom_idct8x8_12_add_ssse3>, TX_8X8, 12, 8, 1)
-};
-
-INSTANTIATE_TEST_CASE_P(SSSE3, PartialIDctTest,
- ::testing::ValuesIn(ssse3_partial_idct_tests));
-#endif // HAVE_SSSE3
-
-#if HAVE_AVX2
-const PartialInvTxfmParam avx2_partial_idct_tests[] = {
- make_tuple(&aom_fdct16x16_c, &wrapper<aom_idct16x16_256_add_c>,
- &wrapper<aom_idct16x16_256_add_avx2>, TX_16X16, 256, 8, 1),
- make_tuple(&aom_fdct16x16_c, &wrapper<aom_idct16x16_256_add_c>,
- &wrapper<aom_idct16x16_38_add_avx2>, TX_16X16, 38, 8, 1),
- make_tuple(&aom_fdct16x16_c, &wrapper<aom_idct16x16_256_add_c>,
- &wrapper<aom_idct16x16_10_add_avx2>, TX_16X16, 10, 8, 1),
- make_tuple(&aom_fdct16x16_c, &wrapper<aom_idct16x16_256_add_c>,
- &wrapper<aom_idct16x16_1_add_avx2>, TX_16X16, 1, 8, 1),
- make_tuple(&aom_fdct32x32_c, &wrapper<aom_idct32x32_1024_add_c>,
- &wrapper<aom_idct32x32_1024_add_avx2>, TX_32X32, 1024, 8, 1),
- make_tuple(&aom_fdct32x32_c, &wrapper<aom_idct32x32_1024_add_c>,
- &wrapper<aom_idct32x32_135_add_avx2>, TX_32X32, 135, 8, 1),
- make_tuple(&aom_fdct32x32_c, &wrapper<aom_idct32x32_1024_add_c>,
- &wrapper<aom_idct32x32_34_add_avx2>, TX_32X32, 34, 8, 1),
- make_tuple(&aom_fdct32x32_c, &wrapper<aom_idct32x32_1024_add_c>,
- &wrapper<aom_idct32x32_1_add_avx2>, TX_32X32, 1, 8, 1),
-};
-
-INSTANTIATE_TEST_CASE_P(AVX2, PartialIDctTest,
- ::testing::ValuesIn(avx2_partial_idct_tests));
-#endif // HAVE_AVX2
-#endif // !CONFIG_LV_MAP
-
-} // namespace
+namespace {} // namespace
diff --git a/test/scan_test.cc b/test/scan_test.cc
index f33b0dc..213fa47 100644
--- a/test/scan_test.cc
+++ b/test/scan_test.cc
@@ -13,8 +13,6 @@
#include "av1/common/scan.h"
#include "av1/common/txb_common.h"
-#if CONFIG_LV_MAP
-
static int scan_test(const int16_t *scan, const int16_t *iscan, int si, int r,
int c, int w) {
if (iscan[r * w + c] != si || scan[si] != r * w + c) {
@@ -136,4 +134,3 @@
}
}
}
-#endif
diff --git a/test/test.cmake b/test/test.cmake
index 20611f8..f584433 100644
--- a/test/test.cmake
+++ b/test/test.cmake
@@ -169,15 +169,13 @@
endif ()
endif ()
- if (CONFIG_LV_MAP)
- set(AOM_UNIT_TEST_COMMON_SOURCES
- ${AOM_UNIT_TEST_COMMON_SOURCES}
- "${AOM_ROOT}/test/txb_test.cc")
+ set(AOM_UNIT_TEST_COMMON_SOURCES
+ ${AOM_UNIT_TEST_COMMON_SOURCES}
+ "${AOM_ROOT}/test/txb_test.cc")
- set(AOM_UNIT_TEST_ENCODER_SOURCES
- ${AOM_UNIT_TEST_ENCODER_SOURCES}
- "${AOM_ROOT}/test/encodetxb_test.cc")
- endif ()
+ set(AOM_UNIT_TEST_ENCODER_SOURCES
+ ${AOM_UNIT_TEST_ENCODER_SOURCES}
+ "${AOM_ROOT}/test/encodetxb_test.cc")
set(AOM_UNIT_TEST_COMMON_INTRIN_NEON
${AOM_UNIT_TEST_COMMON_INTRIN_NEON}
@@ -309,11 +307,7 @@
"${AOM_ROOT}/test/binary_codes_test.cc"
"${AOM_ROOT}/test/boolcoder_test.cc"
"${AOM_ROOT}/test/ec_test.cc")
- if (NOT CONFIG_LV_MAP)
- set(AOM_UNIT_TEST_COMMON_SOURCES
- ${AOM_UNIT_TEST_COMMON_SOURCES}
- "${AOM_ROOT}/test/partial_idct_test.cc")
- endif ()
+
if (CONFIG_EXT_TILE)
set(AOM_UNIT_TEST_COMMON_SOURCES
${AOM_UNIT_TEST_COMMON_SOURCES}
diff --git a/tools/aom_entropy_optimizer.c b/tools/aom_entropy_optimizer.c
index b5a1bf3..084ce67 100644
--- a/tools/aom_entropy_optimizer.c
+++ b/tools/aom_entropy_optimizer.c
@@ -524,8 +524,6 @@
"default_filter_intra_cdfs[TX_SIZES_ALL][CDF_SIZE(2)]");
#endif
-#if CONFIG_LV_MAP
-
cts_each_dim[0] = TX_SIZES;
cts_each_dim[1] = TXB_SKIP_CONTEXTS;
cts_each_dim[2] = 2;
@@ -646,8 +644,6 @@
"default_coeff_base_eob_multi[TX_SIZES][PLANE_TYPES][SIG_COEF_"
"CONTEXTS_EOB][CDF_SIZE(NUM_BASE_LEVELS+1)]");
-#endif // CONFIG_LV_MAP
-
#if CONFIG_EXT_SKIP
/* Skip mode flag */
cts_each_dim[0] = SKIP_MODE_CONTEXTS;
