Remove smooth_hv experiment flag.
This experiment has been cleared by Tapas.
Also, fix a couple of hash signatures in the test while we are at it.
Change-Id: I1658bcb07913cf8bd47cfffadd729e16d5c55fc3
diff --git a/av1/common/av1_loopfilter.c b/av1/common/av1_loopfilter.c
index 3e8ce50..82ce873 100644
--- a/av1/common/av1_loopfilter.c
+++ b/av1/common/av1_loopfilter.c
@@ -314,12 +314,8 @@
static const uint16_t above_border_uv = 0x000f;
static const int mode_lf_lut[] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // INTRA_MODES
- 0,
-#if CONFIG_SMOOTH_HV
- 0, 0,
-#endif // CONFIG_SMOOTH_HV
- 1, 1, 0, 1, // INTER_MODES (GLOBALMV == 0)
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // INTRA_MODES
+ 1, 1, 0, 1, // INTER_MODES (GLOBALMV == 0)
#if CONFIG_COMPOUND_SINGLEREF
// 1, 1, 1, 1, 1, // INTER_SINGLEREF_COMP_MODES
// NOTE(zoeliu): Remove SR_NEAREST_NEWMV
diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 1644057..013172f 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -102,10 +102,8 @@
MB_MODE_COUNT, // D207_PRED
MB_MODE_COUNT, // D63_PRED
MB_MODE_COUNT, // SMOOTH_PRED
-#if CONFIG_SMOOTH_HV
MB_MODE_COUNT, // SMOOTH_V_PRED
MB_MODE_COUNT, // SMOOTH_H_PRED
-#endif // CONFIG_SMOOTH_HV
MB_MODE_COUNT, // PAETH_PRED
MB_MODE_COUNT, // NEARESTMV
MB_MODE_COUNT, // NEARMV
@@ -148,10 +146,8 @@
MB_MODE_COUNT, // D207_PRED
MB_MODE_COUNT, // D63_PRED
MB_MODE_COUNT, // SMOOTH_PRED
-#if CONFIG_SMOOTH_HV
MB_MODE_COUNT, // SMOOTH_V_PRED
MB_MODE_COUNT, // SMOOTH_H_PRED
-#endif // CONFIG_SMOOTH_HV
MB_MODE_COUNT, // PAETH_PRED
MB_MODE_COUNT, // NEARESTMV
MB_MODE_COUNT, // NEARMV
@@ -422,20 +418,18 @@
#if CONFIG_CFL
static INLINE PREDICTION_MODE get_uv_mode(UV_PREDICTION_MODE mode) {
static const PREDICTION_MODE uv2y[UV_INTRA_MODES] = {
- DC_PRED, // UV_DC_PRED
- V_PRED, // UV_V_PRED
- H_PRED, // UV_H_PRED
- D45_PRED, // UV_D45_PRED
- D135_PRED, // UV_D135_PRED
- D117_PRED, // UV_D117_PRED
- D153_PRED, // UV_D153_PRED
- D207_PRED, // UV_D207_PRED
- D63_PRED, // UV_D63_PRED
- SMOOTH_PRED, // UV_SMOOTH_PRED
-#if CONFIG_SMOOTH_HV
+ DC_PRED, // UV_DC_PRED
+ V_PRED, // UV_V_PRED
+ H_PRED, // UV_H_PRED
+ D45_PRED, // UV_D45_PRED
+ D135_PRED, // UV_D135_PRED
+ D117_PRED, // UV_D117_PRED
+ D153_PRED, // UV_D153_PRED
+ D207_PRED, // UV_D207_PRED
+ D63_PRED, // UV_D63_PRED
+ SMOOTH_PRED, // UV_SMOOTH_PRED
SMOOTH_V_PRED, // UV_SMOOTH_V_PRED
SMOOTH_H_PRED, // UV_SMOOTH_H_PRED
-#endif // CONFIG_SMOOTH_HV
PAETH_PRED, // UV_PAETH_PRED
DC_PRED, // CFL_PRED
};
@@ -785,10 +779,8 @@
DCT_ADST, // D207
ADST_DCT, // D63
ADST_ADST, // SMOOTH
-#if CONFIG_SMOOTH_HV
ADST_DCT, // SMOOTH_V
DCT_ADST, // SMOOTH_H
-#endif // CONFIG_SMOOTH_HV
ADST_ADST, // PAETH
};
@@ -1069,10 +1061,7 @@
#if CONFIG_EXT_INTRA
extern const int16_t dr_intra_derivative[90];
static const uint8_t mode_to_angle_map[] = {
- 0, 90, 180, 45, 135, 113, 157, 203, 67, 0, 0,
-#if CONFIG_SMOOTH_HV
- 0, 0,
-#endif // CONFIG_SMOOTH_HV
+ 0, 90, 180, 45, 135, 113, 157, 203, 67, 0, 0, 0, 0,
};
#endif // CONFIG_EXT_INTRA
diff --git a/av1/common/common_data.h b/av1/common/common_data.h
index 4b2f34f..525547c 100644
--- a/av1/common/common_data.h
+++ b/av1/common/common_data.h
@@ -1793,11 +1793,7 @@
#if CONFIG_KF_CTX
static const int intra_mode_context[INTRA_MODES] = {
- 0, 1, 2, 3, 4, 4, 4, 4, 3, 0,
-#if CONFIG_SMOOTH_HV
- 1, 2,
-#endif
- 0,
+ 0, 1, 2, 3, 4, 4, 4, 4, 3, 0, 1, 2, 0,
};
#endif
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 548d7d2..92bc02e 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -1768,7 +1768,6 @@
#endif
};
-#if CONFIG_SMOOTH_HV
static const aom_cdf_prob
default_if_y_mode_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE(INTRA_MODES)] = {
{ AOM_CDF13(7168, 10680, 13913, 16928, 20294, 22790, 24706, 26275, 28139,
@@ -1874,45 +1873,6 @@
};
#endif
#endif // CONFIG_CFL
-#else // !CONFIG_SMOOTH_HV
-static const aom_cdf_prob
- default_if_y_mode_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE(INTRA_MODES)] = {
- { AOM_CDF11(11264, 14965, 19742, 21904, 24115, 25678, 27210, 28705, 29782,
- 31424) },
- { AOM_CDF11(9600, 13747, 18569, 20091, 21925, 23082, 24404, 26285, 27574,
- 30415) },
- { AOM_CDF11(9344, 14319, 19567, 20476, 21791, 22529, 23393, 24881, 26012,
- 30572) },
- { AOM_CDF11(12288, 15866, 21186, 21722, 22209, 22564, 22966, 24025, 24716,
- 30608) },
- };
-
-static const aom_cdf_prob
- default_uv_mode_cdf[INTRA_MODES][CDF_SIZE(UV_INTRA_MODES)] = {
- { AOM_CDF11(25472, 27697, 30693, 30916, 31125, 31406, 31679, 32085, 32334,
- 32682) },
- { AOM_CDF11(2176, 28142, 29335, 29504, 29762, 30642, 30741, 30902, 31683,
- 32529) },
- { AOM_CDF11(3328, 3901, 30984, 31068, 31241, 31389, 31697, 32379, 32483,
- 32653) },
- { AOM_CDF11(23424, 25805, 27721, 29432, 29659, 30032, 30282, 31192, 32259,
- 32658) },
- { AOM_CDF11(22784, 24177, 26209, 26476, 28679, 29698, 30786, 31257, 31596,
- 32690) },
- { AOM_CDF11(19712, 22988, 24275, 24520, 25823, 31469, 31880, 32189, 32614,
- 32615) },
- { AOM_CDF11(21376, 22085, 27643, 27799, 28596, 28890, 31767, 32255, 32405,
- 32723) },
- { AOM_CDF11(19712, 20623, 28408, 28766, 29070, 29355, 29759, 32034, 32306,
- 32666) },
- { AOM_CDF11(19584, 23437, 25295, 26200, 26612, 27372, 27704, 28319, 31664,
- 32562) },
- { AOM_CDF11(20864, 23989, 26168, 26591, 27345, 27348, 27809, 28575, 29132,
- 32628) },
- { AOM_CDF11(23680, 27582, 30197, 30312, 30464, 30995, 31208, 31574, 31985,
- 32519) },
- };
-#endif // CONFIG_SMOOTH_HV
#if CONFIG_EXT_PARTITION_TYPES
static const aom_cdf_prob default_partition_cdf[PARTITION_CONTEXTS][CDF_SIZE(
@@ -1978,10 +1938,8 @@
{ 0 },
{ 0 },
{ 0 },
-#if CONFIG_SMOOTH_HV
{ 0 },
{ 0 },
-#endif // CONFIG_SMOOTH_HV
{ 0 },
},
{
@@ -1995,10 +1953,8 @@
{ 0 },
{ 0 },
{ 0 },
-#if CONFIG_SMOOTH_HV
{ 0 },
{ 0 },
-#endif // CONFIG_SMOOTH_HV
{ 0 },
},
{
@@ -2012,10 +1968,8 @@
{ 0 },
{ 0 },
{ 0 },
-#if CONFIG_SMOOTH_HV
{ 0 },
{ 0 },
-#endif // CONFIG_SMOOTH_HV
{ 0 },
},
{
@@ -2029,10 +1983,8 @@
{ 0 },
{ 0 },
{ 0 },
-#if CONFIG_SMOOTH_HV
{ 0 },
{ 0 },
-#endif // CONFIG_SMOOTH_HV
{ 0 },
},
},
@@ -2048,10 +2000,8 @@
{ AOM_CDF7(1280, 4109, 5900, 7691, 15528, 27380) },
{ AOM_CDF7(1280, 4109, 5900, 7691, 15528, 27380) },
{ AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-#if CONFIG_SMOOTH_HV
{ AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
{ AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-#endif // CONFIG_SMOOTH_HV
{ AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
},
{
@@ -2065,10 +2015,8 @@
{ AOM_CDF7(1280, 4109, 5900, 7691, 15528, 27380) },
{ AOM_CDF7(1280, 4109, 5900, 7691, 15528, 27380) },
{ AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-#if CONFIG_SMOOTH_HV
{ AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
{ AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-#endif // CONFIG_SMOOTH_HV
{ AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
},
{
@@ -2082,10 +2030,8 @@
{ AOM_CDF7(1280, 4109, 5900, 7691, 15528, 27380) },
{ AOM_CDF7(1280, 4109, 5900, 7691, 15528, 27380) },
{ AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-#if CONFIG_SMOOTH_HV
{ AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
{ AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-#endif // CONFIG_SMOOTH_HV
{ AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
},
{
@@ -2099,10 +2045,8 @@
{ AOM_CDF7(1280, 4109, 5900, 7691, 15528, 27380) },
{ AOM_CDF7(1280, 4109, 5900, 7691, 15528, 27380) },
{ AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-#if CONFIG_SMOOTH_HV
{ AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
{ AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-#endif // CONFIG_SMOOTH_HV
{ AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
},
},
@@ -2118,10 +2062,8 @@
{ AOM_CDF5(1280, 4109, 13065, 26611) },
{ AOM_CDF5(1280, 4109, 13065, 26611) },
{ AOM_CDF5(1280, 5216, 6938, 13396) },
-#if CONFIG_SMOOTH_HV
{ AOM_CDF5(1280, 5216, 6938, 13396) },
{ AOM_CDF5(1280, 5216, 6938, 13396) },
-#endif // CONFIG_SMOOTH_HV
{ AOM_CDF5(1280, 5216, 6938, 13396) },
},
{
@@ -2135,10 +2077,8 @@
{ AOM_CDF5(1280, 4109, 13065, 26611) },
{ AOM_CDF5(1280, 4109, 13065, 26611) },
{ AOM_CDF5(1280, 5216, 6938, 13396) },
-#if CONFIG_SMOOTH_HV
{ AOM_CDF5(1280, 5216, 6938, 13396) },
{ AOM_CDF5(1280, 5216, 6938, 13396) },
-#endif // CONFIG_SMOOTH_HV
{ AOM_CDF5(1280, 5216, 6938, 13396) },
},
{
@@ -2152,10 +2092,8 @@
{ AOM_CDF5(1280, 4109, 13065, 26611) },
{ AOM_CDF5(1280, 4109, 13065, 26611) },
{ AOM_CDF5(1280, 5216, 6938, 13396) },
-#if CONFIG_SMOOTH_HV
{ AOM_CDF5(1280, 5216, 6938, 13396) },
{ AOM_CDF5(1280, 5216, 6938, 13396) },
-#endif // CONFIG_SMOOTH_HV
{ AOM_CDF5(1280, 5216, 6938, 13396) },
},
{
@@ -2169,10 +2107,8 @@
{ AOM_CDF5(1280, 4109, 13065, 26611) },
{ AOM_CDF5(1280, 4109, 13065, 26611) },
{ AOM_CDF5(1280, 5216, 6938, 13396) },
-#if CONFIG_SMOOTH_HV
{ AOM_CDF5(1280, 5216, 6938, 13396) },
{ AOM_CDF5(1280, 5216, 6938, 13396) },
-#endif // CONFIG_SMOOTH_HV
{ AOM_CDF5(1280, 5216, 6938, 13396) },
},
},
@@ -2189,10 +2125,8 @@
{ AOM_CDF2(1280) },
{ AOM_CDF2(1280) },
{ AOM_CDF2(1280) },
-#if CONFIG_SMOOTH_HV
{ AOM_CDF2(1280) },
{ AOM_CDF2(1280) },
-#endif // CONFIG_SMOOTH_HV
{ AOM_CDF2(1280) },
},
{
@@ -2206,10 +2140,8 @@
{ AOM_CDF2(1280) },
{ AOM_CDF2(1280) },
{ AOM_CDF2(1280) },
-#if CONFIG_SMOOTH_HV
{ AOM_CDF2(1280) },
{ AOM_CDF2(1280) },
-#endif // CONFIG_SMOOTH_HV
{ AOM_CDF2(1280) },
},
{
@@ -2223,10 +2155,8 @@
{ AOM_CDF2(1280) },
{ AOM_CDF2(1280) },
{ AOM_CDF2(1280) },
-#if CONFIG_SMOOTH_HV
{ AOM_CDF2(1280) },
{ AOM_CDF2(1280) },
-#endif // CONFIG_SMOOTH_HV
{ AOM_CDF2(1280) },
},
{
@@ -2240,10 +2170,8 @@
{ AOM_CDF2(1280) },
{ AOM_CDF2(1280) },
{ AOM_CDF2(1280) },
-#if CONFIG_SMOOTH_HV
{ AOM_CDF2(1280) },
{ AOM_CDF2(1280) },
-#endif // CONFIG_SMOOTH_HV
{ AOM_CDF2(1280) },
},
}
@@ -2376,7 +2304,6 @@
#else
const aom_cdf_prob
default_kf_y_mode_cdf[INTRA_MODES][INTRA_MODES][CDF_SIZE(INTRA_MODES)] = {
-#if CONFIG_SMOOTH_HV
#if CONFIG_FILTER_INTRA
{ { AOM_CDF13(14683, 16164, 18655, 19530, 20058, 20712, 21844, 23569,
24762, 29323, 30502, 32305) },
@@ -3082,272 +3009,6 @@
20405, 23541, 25258, 26726) },
},
#endif
-#else
- {
- { AOM_CDF11(15488, 18706, 22561, 23619, 24954, 25782, 26710, 27861,
- 28656, 30743) },
- { AOM_CDF11(11648, 18744, 20846, 22100, 23332, 24337, 25093, 26104,
- 27097, 29633) },
- { AOM_CDF11(8448, 10732, 22507, 23254, 24382, 24876, 25827, 27488,
- 28040, 30108) },
- { AOM_CDF11(13568, 16981, 19885, 22014, 23543, 24658, 25641, 27378,
- 28625, 31043) },
- { AOM_CDF11(9600, 12225, 14408, 16033, 19544, 22318, 23960, 25617,
- 26522, 30596) },
- { AOM_CDF11(12160, 15078, 16990, 18964, 22725, 25793, 27133, 28447,
- 30831, 30836) },
- { AOM_CDF11(9088, 11274, 15818, 16940, 21178, 22338, 26171, 27754,
- 28503, 31473) },
- { AOM_CDF11(10880, 13846, 18649, 20252, 22157, 22992, 24396, 27581,
- 28501, 31400) },
- { AOM_CDF11(11008, 13462, 15747, 18378, 20085, 21663, 22766, 24635,
- 27476, 30643) },
- { AOM_CDF11(10112, 13147, 16135, 17577, 19681, 19689, 20856, 22374,
- 24454, 30555) },
- { AOM_CDF11(8704, 12176, 17582, 18905, 19994, 20669, 21635, 23564,
- 24741, 27222) },
- },
- {
- { AOM_CDF11(8448, 18738, 21694, 22413, 23358, 24675, 25193, 26119,
- 27310, 30773) },
- { AOM_CDF11(6656, 22027, 23242, 23986, 24529, 25363, 25646, 26087,
- 27130, 30218) },
- { AOM_CDF11(7168, 13862, 21137, 22124, 23036, 23803, 24458, 26390,
- 27342, 30968) },
- { AOM_CDF11(9600, 17409, 19830, 21521, 22580, 23726, 24377, 25679,
- 27269, 30867) },
- { AOM_CDF11(6912, 15832, 17559, 18777, 20425, 22719, 23447, 24952,
- 26527, 30950) },
- { AOM_CDF11(7808, 18730, 20143, 21445, 23347, 26267, 27229, 28315,
- 30911, 30915) },
- { AOM_CDF11(6784, 14299, 17264, 18505, 20765, 22440, 24331, 26038,
- 27481, 31448) },
- { AOM_CDF11(8832, 15726, 19455, 20668, 21607, 22655, 23384, 26356,
- 27697, 31459) },
- { AOM_CDF11(8192, 17385, 18866, 20120, 21273, 22853, 23470, 24881,
- 27216, 31040) },
- { AOM_CDF11(6656, 16341, 18497, 19439, 20706, 20711, 21234, 22307,
- 23950, 30728) },
- { AOM_CDF11(6400, 17625, 20326, 21821, 22568, 23415, 23854, 24896,
- 26171, 29575) },
- },
- {
- { AOM_CDF11(12032, 14259, 22597, 23443, 24581, 25079, 26399, 27862,
- 28509, 30419) },
- { AOM_CDF11(9216, 14883, 20941, 21958, 23597, 24328, 25208, 26590,
- 27377, 29364) },
- { AOM_CDF11(6784, 8088, 24407, 25006, 25777, 25950, 26882, 28811,
- 29159, 30636) },
- { AOM_CDF11(11904, 14425, 18729, 20730, 21998, 22686, 23856, 26580,
- 27613, 29834) },
- { AOM_CDF11(10752, 12784, 16305, 17624, 20320, 22450, 24380, 26773,
- 27837, 30016) },
- { AOM_CDF11(10496, 14090, 18314, 20621, 23539, 25261, 26953, 28692,
- 30064, 30071) },
- { AOM_CDF11(8448, 10229, 16542, 17725, 21504, 22332, 26006, 27895,
- 28487, 31248) },
- { AOM_CDF11(9728, 11162, 19379, 20981, 22356, 22926, 24318, 28364,
- 29020, 31328) },
- { AOM_CDF11(9216, 10861, 14850, 16471, 18611, 19674, 21009, 23454,
- 26078, 29272) },
- { AOM_CDF11(7808, 10132, 17327, 18472, 20126, 20132, 21599, 23338,
- 24514, 29843) },
- { AOM_CDF11(6784, 9210, 19309, 20715, 21833, 22262, 23353, 24942,
- 25800, 28200) },
- },
- {
- { AOM_CDF11(12288, 15040, 18401, 21071, 22800, 23945, 25274, 26939,
- 28554, 31328) },
- { AOM_CDF11(9344, 17170, 19325, 22119, 23284, 24378, 24911, 26095,
- 27781, 31121) },
- { AOM_CDF11(9344, 11650, 19788, 21928, 22916, 23571, 24362, 26633,
- 27946, 31212) },
- { AOM_CDF11(12928, 14428, 17080, 20882, 22104, 23149, 23715, 27167,
- 28932, 31218) },
- { AOM_CDF11(9088, 11962, 13849, 16880, 19818, 21895, 23000, 25923,
- 27961, 31380) },
- { AOM_CDF11(10240, 13336, 15505, 18844, 21646, 24723, 25832, 27802,
- 31088, 31096) },
- { AOM_CDF11(8704, 10683, 14446, 17035, 20211, 21577, 24370, 26477,
- 28223, 31734) },
- { AOM_CDF11(12928, 17358, 19982, 22123, 23335, 23948, 24890, 28884,
- 30197, 32148) },
- { AOM_CDF11(10496, 12429, 16401, 20493, 21471, 22433, 23162, 24686,
- 29027, 31115) },
- { AOM_CDF11(8448, 12157, 14796, 17676, 19754, 19762, 20641, 23274,
- 25569, 31058) },
- { AOM_CDF11(7296, 11083, 15313, 20550, 21783, 22727, 23461, 25072,
- 27195, 30380) },
- },
- {
- { AOM_CDF11(10880, 13214, 15829, 16866, 20613, 22316, 24539, 27077,
- 28116, 31485) },
- { AOM_CDF11(9984, 13868, 16397, 17486, 20011, 22071, 23357, 24990,
- 26336, 30276) },
- { AOM_CDF11(7168, 8637, 17963, 18813, 21065, 22052, 23502, 25702,
- 26745, 30668) },
- { AOM_CDF11(8960, 10682, 12496, 18240, 20500, 21585, 23387, 25795,
- 27119, 31001) },
- { AOM_CDF11(9856, 12056, 13722, 15196, 19276, 21891, 23643, 25538,
- 26854, 31515) },
- { AOM_CDF11(9984, 12963, 14960, 16734, 21279, 25616, 27638, 28950,
- 31161, 31166) },
- { AOM_CDF11(7168, 8604, 12044, 13632, 18931, 20553, 23452, 25800,
- 27754, 31668) },
- { AOM_CDF11(11520, 13372, 16642, 18137, 20232, 21510, 23052, 26792,
- 27974, 31274) },
- { AOM_CDF11(10240, 12483, 14364, 16168, 18668, 20707, 22158, 24410,
- 26370, 30744) },
- { AOM_CDF11(8064, 10798, 13829, 15128, 19136, 19152, 21057, 22583,
- 24513, 30645) },
- { AOM_CDF11(8448, 11025, 16073, 17603, 20094, 21468, 22971, 24628,
- 26015, 29728) },
- },
- {
- { AOM_CDF11(10368, 15372, 18442, 19576, 22674, 27128, 28232, 29624,
- 31363, 31368) },
- { AOM_CDF11(9472, 16687, 18957, 20272, 22852, 27082, 27839, 28995,
- 30943, 30948) },
- { AOM_CDF11(8064, 12334, 19197, 20956, 24804, 26553, 27556, 29877,
- 31311, 31320) },
- { AOM_CDF11(8960, 14083, 16058, 19129, 21136, 23635, 24870, 27577,
- 31176, 31187) },
- { AOM_CDF11(9984, 14208, 15589, 17640, 22080, 26660, 27947, 29400,
- 31605, 31611) },
- { AOM_CDF11(9216, 15167, 16263, 17767, 21531, 26689, 27607, 28880,
- 31291, 31296) },
- { AOM_CDF11(8448, 12756, 15781, 17279, 21198, 24057, 26171, 29200,
- 31901, 31913) },
- { AOM_CDF11(9984, 15074, 18244, 19878, 22246, 24436, 25560, 28991,
- 31687, 31700) },
- { AOM_CDF11(10496, 15128, 17012, 18989, 21294, 25011, 25999, 27784,
- 30934, 30941) },
- { AOM_CDF11(2944, 5875, 8846, 11817, 14806, 17795, 20769, 23761,
- 26747, 29739) },
- { AOM_CDF11(7424, 12915, 17544, 19392, 23074, 25635, 26431, 28241,
- 30088, 30095) },
- },
- {
- { AOM_CDF11(11648, 13565, 18996, 19908, 21897, 22852, 26656, 28172,
- 28995, 31283) },
- { AOM_CDF11(10240, 14255, 18109, 19716, 21521, 22859, 24613, 26161,
- 27279, 30392) },
- { AOM_CDF11(6784, 7848, 18820, 19447, 22335, 22733, 25112, 28427,
- 29013, 31550) },
- { AOM_CDF11(11904, 13581, 17695, 19311, 21698, 22562, 24391, 26559,
- 27779, 30567) },
- { AOM_CDF11(10624, 12334, 14643, 16255, 20783, 22767, 24929, 26876,
- 27998, 31470) },
- { AOM_CDF11(12032, 14415, 16715, 18712, 21557, 25332, 27840, 29663,
- 31708, 31715) },
- { AOM_CDF11(9728, 10683, 13955, 14786, 18481, 19492, 26749, 28483,
- 29116, 31958) },
- { AOM_CDF11(8960, 10032, 15755, 16949, 19144, 19744, 22082, 27608,
- 28411, 31838) },
- { AOM_CDF11(14592, 15937, 18518, 19566, 21817, 23102, 24436, 26651,
- 28100, 30993) },
- { AOM_CDF11(8960, 10791, 14718, 16094, 18560, 18570, 22120, 24188,
- 25677, 31280) },
- { AOM_CDF11(11136, 13058, 19006, 20135, 21463, 22159, 24042, 26348,
- 27367, 30064) },
- },
- {
- { AOM_CDF11(12544, 15384, 20327, 21555, 23456, 24144, 25421, 27884,
- 28875, 31188) },
- { AOM_CDF11(10368, 15009, 17631, 18970, 20691, 21850, 22749, 25280,
- 26570, 29530) },
- { AOM_CDF11(9088, 10956, 21554, 22698, 23666, 24052, 25122, 27792,
- 28612, 30825) },
- { AOM_CDF11(11520, 12888, 16374, 19132, 21186, 21843, 22902, 26440,
- 27928, 29946) },
- { AOM_CDF11(9984, 12199, 14625, 17321, 20195, 21574, 23010, 25688,
- 27600, 30988) },
- { AOM_CDF11(10112, 13705, 16847, 19242, 22011, 24064, 26481, 29125,
- 30545, 30555) },
- { AOM_CDF11(9344, 10994, 15018, 16915, 20471, 21334, 24577, 27472,
- 28592, 31578) },
- { AOM_CDF11(12928, 14540, 18022, 19481, 21028, 21825, 22728, 28191,
- 29154, 31683) },
- { AOM_CDF11(10368, 12160, 14900, 17161, 19379, 20521, 21747, 24534,
- 26677, 30318) },
- { AOM_CDF11(8960, 11488, 16197, 18030, 20010, 20018, 21347, 23948,
- 25016, 30536) },
- { AOM_CDF11(7808, 10310, 15420, 18961, 20114, 20772, 21721, 24599,
- 26237, 29160) },
- },
- {
- { AOM_CDF11(9856, 13764, 16995, 19540, 20802, 22302, 23113, 24519,
- 27717, 31604) },
- { AOM_CDF11(8704, 15725, 17309, 20296, 21257, 22573, 23165, 23893,
- 27755, 31170) },
- { AOM_CDF11(7936, 11343, 19355, 21223, 22121, 22978, 23703, 26079,
- 27978, 31507) },
- { AOM_CDF11(11264, 14823, 17314, 20715, 21999, 22982, 23728, 25229,
- 28593, 31508) },
- { AOM_CDF11(8704, 11788, 13666, 16523, 18630, 20579, 21574, 23335,
- 26298, 31264) },
- { AOM_CDF11(9088, 14031, 15766, 18533, 21457, 24078, 24973, 26102,
- 31284, 31288) },
- { AOM_CDF11(7040, 9648, 12140, 14601, 16742, 18070, 21154, 23582,
- 27647, 31763) },
- { AOM_CDF11(10240, 13466, 16837, 19351, 20636, 21620, 22474, 25815,
- 28364, 31976) },
- { AOM_CDF11(11008, 13682, 15127, 18779, 19841, 20792, 21954, 23365,
- 29100, 31748) },
- { AOM_CDF11(7168, 12260, 15037, 17152, 18730, 18736, 19436, 20484,
- 24465, 30868) },
- { AOM_CDF11(6784, 12469, 15422, 19291, 20301, 21344, 21894, 23415,
- 27696, 31042) },
- },
- {
- { AOM_CDF11(10112, 13929, 17880, 18857, 20955, 20963, 21974, 23273,
- 24734, 31352) },
- { AOM_CDF11(8064, 15826, 17929, 19017, 21016, 21024, 21687, 22701,
- 24242, 30645) },
- { AOM_CDF11(6528, 9196, 20118, 21101, 22227, 22231, 22997, 25070,
- 25919, 30923) },
- { AOM_CDF11(9600, 13218, 15898, 17780, 19991, 20000, 21196, 23912,
- 26044, 31139) },
- { AOM_CDF11(8960, 12037, 14178, 15681, 20126, 20143, 21435, 23083,
- 24675, 31466) },
- { AOM_CDF11(2944, 5875, 8846, 11817, 14806, 17795, 20769, 23761,
- 26747, 29739) },
- { AOM_CDF11(9472, 12334, 15469, 16848, 19972, 19984, 22292, 24384,
- 25891, 31676) },
- { AOM_CDF11(8448, 11176, 15497, 16676, 18528, 18535, 19595, 24334,
- 25725, 31723) },
- { AOM_CDF11(8704, 12141, 14313, 15828, 18358, 18368, 19469, 21089,
- 24027, 30700) },
- { AOM_CDF11(7680, 11689, 14556, 15548, 17878, 17887, 18873, 20512,
- 22152, 31004) },
- { AOM_CDF11(6656, 11476, 16600, 18052, 19683, 19689, 20509, 22077,
- 23496, 29504) },
- },
- {
- { AOM_CDF11(9728, 14651, 19394, 20550, 21680, 22479, 23516, 24952,
- 26183, 28538) },
- { AOM_CDF11(8832, 18693, 20913, 21933, 22956, 23831, 24341, 25317,
- 26434, 29028) },
- { AOM_CDF11(5888, 8413, 20542, 21609, 22437, 22864, 23663, 26329,
- 26900, 29828) },
- { AOM_CDF11(9984, 13134, 16328, 18267, 19814, 21461, 22393, 24944,
- 26320, 29653) },
- { AOM_CDF11(8448, 12425, 15474, 17031, 19216, 20889, 23077, 25108,
- 26548, 30108) },
- { AOM_CDF11(9856, 15675, 19169, 20837, 22638, 24556, 25438, 27114,
- 29449, 29456) },
- { AOM_CDF11(6784, 10294, 14542, 15724, 19109, 19972, 24084, 26329,
- 27637, 30433) },
- { AOM_CDF11(8320, 10873, 17095, 18466, 19674, 20129, 21230, 27562,
- 28568, 30858) },
- { AOM_CDF11(9088, 13196, 15898, 17566, 19210, 20354, 21186, 23647,
- 26235, 30548) },
- { AOM_CDF11(6912, 11512, 16390, 17479, 19065, 19071, 19740, 21715,
- 23208, 29132) },
- { AOM_CDF11(6656, 11485, 16060, 17734, 19099, 19814, 21018, 23053,
- 24333, 27260) },
- },
-#endif // CONFIG_SMOOTH_HV
};
#endif // CONFIG_KF_CTX
diff --git a/av1/common/enums.h b/av1/common/enums.h
index 8da1854..e883103 100644
--- a/av1/common/enums.h
+++ b/av1/common/enums.h
@@ -481,20 +481,18 @@
// Note: All directional predictors must be between V_PRED and D63_PRED (both
// inclusive).
typedef enum ATTRIBUTE_PACKED {
- DC_PRED, // Average of above and left pixels
- V_PRED, // Vertical
- H_PRED, // Horizontal
- D45_PRED, // Directional 45 deg = round(arctan(1/1) * 180/pi)
- D135_PRED, // Directional 135 deg = 180 - 45
- D117_PRED, // Directional 117 deg = 180 - 63
- D153_PRED, // Directional 153 deg = 180 - 27
- D207_PRED, // Directional 207 deg = 180 + 27
- D63_PRED, // Directional 63 deg = round(arctan(2/1) * 180/pi)
- SMOOTH_PRED, // Combination of horizontal and vertical interpolation
-#if CONFIG_SMOOTH_HV
+ DC_PRED, // Average of above and left pixels
+ V_PRED, // Vertical
+ H_PRED, // Horizontal
+ D45_PRED, // Directional 45 deg = round(arctan(1/1) * 180/pi)
+ D135_PRED, // Directional 135 deg = 180 - 45
+ D117_PRED, // Directional 117 deg = 180 - 63
+ D153_PRED, // Directional 153 deg = 180 - 27
+ D207_PRED, // Directional 207 deg = 180 + 27
+ D63_PRED, // Directional 63 deg = round(arctan(2/1) * 180/pi)
+ SMOOTH_PRED, // Combination of horizontal and vertical interpolation
SMOOTH_V_PRED, // Vertical interpolation
SMOOTH_H_PRED, // Horizontal interpolation
-#endif // CONFIG_SMOOTH_HV
PAETH_PRED, // Predict from the direction of smallest gradient
NEARESTMV,
NEARMV,
@@ -526,20 +524,18 @@
// TODO(ltrudeau) Do we really want to pack this?
// TODO(ltrudeau) Do we match with PREDICTION_MODE?
typedef enum ATTRIBUTE_PACKED {
- UV_DC_PRED, // Average of above and left pixels
- UV_V_PRED, // Vertical
- UV_H_PRED, // Horizontal
- UV_D45_PRED, // Directional 45 deg = round(arctan(1/1) * 180/pi)
- UV_D135_PRED, // Directional 135 deg = 180 - 45
- UV_D117_PRED, // Directional 117 deg = 180 - 63
- UV_D153_PRED, // Directional 153 deg = 180 - 27
- UV_D207_PRED, // Directional 207 deg = 180 + 27
- UV_D63_PRED, // Directional 63 deg = round(arctan(2/1) * 180/pi)
- UV_SMOOTH_PRED, // Combination of horizontal and vertical interpolation
-#if CONFIG_SMOOTH_HV
+ UV_DC_PRED, // Average of above and left pixels
+ UV_V_PRED, // Vertical
+ UV_H_PRED, // Horizontal
+ UV_D45_PRED, // Directional 45 deg = round(arctan(1/1) * 180/pi)
+ UV_D135_PRED, // Directional 135 deg = 180 - 45
+ UV_D117_PRED, // Directional 117 deg = 180 - 63
+ UV_D153_PRED, // Directional 153 deg = 180 - 27
+ UV_D207_PRED, // Directional 207 deg = 180 + 27
+ UV_D63_PRED, // Directional 63 deg = round(arctan(2/1) * 180/pi)
+ UV_SMOOTH_PRED, // Combination of horizontal and vertical interpolation
UV_SMOOTH_V_PRED, // Vertical interpolation
UV_SMOOTH_H_PRED, // Horizontal interpolation
-#endif // CONFIG_SMOOTH_HV
UV_PAETH_PRED, // Predict from the direction of smallest gradient
UV_CFL_PRED, // Chroma-from-Luma
UV_INTRA_MODES,
diff --git a/av1/common/mvref_common.h b/av1/common/mvref_common.h
index ea131d1..d823187 100644
--- a/av1/common/mvref_common.h
+++ b/av1/common/mvref_common.h
@@ -54,15 +54,13 @@
9, // D207_PRED
9, // D63_PRED
9, // SMOOTH_PRED
-#if CONFIG_SMOOTH_HV
- 9, // SMOOTH_V_PRED
- 9, // SMOOTH_H_PRED
-#endif // CONFIG_SMOOTH_HV
- 9, // PAETH_PRED
- 0, // NEARESTMV
- 0, // NEARMV
- 3, // GLOBALMV
- 1, // NEWMV
+ 9, // SMOOTH_V_PRED
+ 9, // SMOOTH_H_PRED
+ 9, // PAETH_PRED
+ 0, // NEARESTMV
+ 0, // NEARMV
+ 3, // GLOBALMV
+ 1, // NEWMV
#if CONFIG_COMPOUND_SINGLEREF
0, // SR_NEAREST_NEARMV
// 1, // SR_NEAREST_NEWMV
diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c
index 4208ae3..76af119 100644
--- a/av1/common/reconintra.c
+++ b/av1/common/reconintra.c
@@ -58,10 +58,8 @@
NEED_LEFT | NEED_BOTTOMLEFT, // D207
NEED_ABOVE | NEED_ABOVERIGHT, // D63
NEED_LEFT | NEED_ABOVE, // SMOOTH
-#if CONFIG_SMOOTH_HV
NEED_LEFT | NEED_ABOVE, // SMOOTH_V
NEED_LEFT | NEED_ABOVE, // SMOOTH_H
-#endif // CONFIG_SMOOTH_HV
NEED_LEFT | NEED_ABOVE | NEED_ABOVELEFT, // PAETH
};
@@ -717,10 +715,8 @@
INIT_ALL_SIZES(pred[PAETH_PRED], paeth);
INIT_ALL_SIZES(pred[SMOOTH_PRED], smooth);
-#if CONFIG_SMOOTH_HV
INIT_ALL_SIZES(pred[SMOOTH_V_PRED], smooth_v);
INIT_ALL_SIZES(pred[SMOOTH_H_PRED], smooth_h);
-#endif // CONFIG_SMOOTH_HV
INIT_ALL_SIZES(dc_pred[0][0], dc_128);
INIT_ALL_SIZES(dc_pred[0][1], dc_top);
@@ -739,10 +735,8 @@
INIT_ALL_SIZES(pred_high[PAETH_PRED], highbd_paeth);
INIT_ALL_SIZES(pred_high[SMOOTH_PRED], highbd_smooth);
-#if CONFIG_SMOOTH_HV
INIT_ALL_SIZES(pred_high[SMOOTH_V_PRED], highbd_smooth_v);
INIT_ALL_SIZES(pred_high[SMOOTH_H_PRED], highbd_smooth_h);
-#endif // CONFIG_SMOOTH_HV
INIT_ALL_SIZES(dc_pred_high[0][0], highbd_dc_128);
INIT_ALL_SIZES(dc_pred_high[0][1], highbd_dc_top);
@@ -1472,12 +1466,8 @@
#if CONFIG_INTRA_EDGE
static int is_smooth(MB_MODE_INFO *mbmi) {
-#if CONFIG_SMOOTH_HV
return (mbmi->mode == SMOOTH_PRED || mbmi->mode == SMOOTH_V_PRED ||
mbmi->mode == SMOOTH_H_PRED);
-#else
- return mbmi->mode == SMOOTH_PRED;
-#endif
}
static int get_filt_type(const MACROBLOCKD *xd) {
