Remove experimental flag of Q_ADAPT_PROBS
This experiment has been adopted, we can simplify the code
by dropping the associated preprocessor conditionals.
Change-Id: Idf52f49d953b422f7789247df966d238fc34299b
diff --git a/av1/av1.cmake b/av1/av1.cmake
index 9b651a3..ad51fbf 100644
--- a/av1/av1.cmake
+++ b/av1/av1.cmake
@@ -481,11 +481,9 @@
"${AOM_ROOT}/third_party/vector/vector.c")
endif ()
-if (CONFIG_Q_ADAPT_PROBS)
set(AOM_AV1_COMMON_SOURCES
${AOM_AV1_COMMON_SOURCES}
"${AOM_ROOT}/av1/common/token_cdfs.h")
-endif ()
if (CONFIG_XIPHRC)
set(AOM_AV1_ENCODER_SOURCES
diff --git a/av1/av1_common.mk b/av1/av1_common.mk
index b12d756..86faa45 100644
--- a/av1/av1_common.mk
+++ b/av1/av1_common.mk
@@ -163,8 +163,6 @@
AV1_COMMON_SRCS-$(HAVE_SSE2) += common/x86/txb_sse2.c
endif
-ifeq ($(CONFIG_Q_ADAPT_PROBS),yes)
AV1_COMMON_SRCS-yes += common/token_cdfs.h
-endif
$(eval $(call rtcd_h_template,av1_rtcd,av1/common/av1_rtcd_defs.pl))
diff --git a/av1/common/entropy.c b/av1/common/entropy.c
index 516e756..bc76c4f 100644
--- a/av1/common/entropy.c
+++ b/av1/common/entropy.c
@@ -17,9 +17,7 @@
#include "av1/common/entropymode.h"
#include "av1/common/onyxc_int.h"
#include "av1/common/scan.h"
-#if CONFIG_Q_ADAPT_PROBS
#include "av1/common/token_cdfs.h"
-#endif // CONFIG_Q_ADAPT_PROBS
#if CONFIG_LV_MAP
#include "av1/common/txb_common.h"
#endif
@@ -837,667 +835,6 @@
{ 31486, 1150, 107, 20, 1, 1, 1, 1, 1 },
};
-#if !CONFIG_Q_ADAPT_PROBS
-static const coeff_cdf_model default_coef_head_cdf_4x4[PLANE_TYPES] = {
- { // Y plane
- { // Intra
- { // Band 0
- { AOM_CDF6(25024, 25863, 27361, 29796, 30374) },
- { AOM_CDF6(10816, 14127, 17116, 23516, 24999) },
- { AOM_CDF6(1088, 6358, 8428, 16648, 18276) } },
- { // Band 1
- { AOM_CDF5(14529, 18769, 29100, 29634) },
- { AOM_CDF5(12993, 17117, 28404, 28988) },
- { AOM_CDF5(11201, 14084, 25818, 26504) },
- { AOM_CDF5(9793, 11267, 21775, 22451) },
- { AOM_CDF5(7105, 7562, 15777, 16225) },
- { AOM_CDF5(3905, 3966, 8359, 8526) } },
- { // Band 2
- { AOM_CDF5(20033, 23643, 31102, 31374) },
- { AOM_CDF5(16321, 20350, 30167, 30546) },
- { AOM_CDF5(12993, 15512, 26859, 27396) },
- { AOM_CDF5(10305, 11659, 21669, 22330) },
- { AOM_CDF5(7361, 7819, 15450, 15940) },
- { AOM_CDF5(3521, 3580, 7805, 7976) } },
- { // Band 3
- { AOM_CDF5(21057, 25460, 31740, 31952) },
- { AOM_CDF5(16449, 21173, 30761, 31092) },
- { AOM_CDF5(11841, 14615, 26188, 26824) },
- { AOM_CDF5(7745, 8991, 18937, 19707) },
- { AOM_CDF5(4417, 4706, 10342, 10890) },
- { AOM_CDF5(7617, 8392, 17295, 17915) } },
- { // Band 4
- { AOM_CDF5(20417, 26452, 32166, 32321) },
- { AOM_CDF5(15809, 21634, 30947, 31298) },
- { AOM_CDF5(10049, 12176, 23495, 24229) },
- { AOM_CDF5(5953, 6731, 16166, 16798) },
- { AOM_CDF5(6081, 6188, 8114, 8764) },
- { AOM_CDF5(2113, 2291, 4448, 5527) } },
- { // Band 5
- { AOM_CDF5(9153, 25905, 31431, 31934) },
- { AOM_CDF5(9025, 23345, 30033, 30965) },
- { AOM_CDF5(5953, 13835, 22032, 24664) },
- { AOM_CDF5(6337, 11435, 18366, 21418) },
- { AOM_CDF5(3137, 4871, 8519, 12426) },
- { AOM_CDF5(1857, 2727, 5540, 8757) } } },
- { // Intra
- { // Band 0
- { AOM_CDF6(24512, 26673, 28962, 31929, 32126) },
- { AOM_CDF6(15936, 21711, 25569, 30899, 31305) },
- { AOM_CDF6(3264, 14756, 20107, 29407, 30032) } },
- { // Band 1
- { AOM_CDF5(21313, 26020, 32523, 32575) },
- { AOM_CDF5(18369, 24215, 32291, 32391) },
- { AOM_CDF5(15297, 19637, 30414, 30752) },
- { AOM_CDF5(11713, 14040, 25408, 26033) },
- { AOM_CDF5(9537, 10173, 18839, 19315) },
- { AOM_CDF5(9025, 9093, 13987, 14115) } },
- { // Band 2
- { AOM_CDF5(22721, 27599, 32592, 32636) },
- { AOM_CDF5(19009, 24676, 32258, 32367) },
- { AOM_CDF5(12737, 16769, 28739, 29247) },
- { AOM_CDF5(8769, 10956, 21941, 22840) },
- { AOM_CDF5(6721, 7678, 15319, 16290) },
- { AOM_CDF5(4417, 4430, 4583, 5712) } },
- { // Band 3
- { AOM_CDF5(22849, 28333, 32633, 32671) },
- { AOM_CDF5(18497, 24619, 32184, 32315) },
- { AOM_CDF5(11841, 14640, 27251, 27752) },
- { AOM_CDF5(8385, 10154, 18339, 19621) },
- { AOM_CDF5(5697, 6977, 13787, 15289) },
- { AOM_CDF5(193, 194, 384, 479) } },
- { // Band 4
- { AOM_CDF5(20417, 28167, 32552, 32621) },
- { AOM_CDF5(16833, 23968, 31991, 32174) },
- { AOM_CDF5(10433, 13387, 26356, 26951) },
- { AOM_CDF5(5057, 6823, 18967, 19843) },
- { AOM_CDF5(5697, 6479, 11672, 13052) },
- { AOM_CDF5(2241, 2265, 6355, 6432) } },
- { // Band 5
- { AOM_CDF5(12097, 28717, 32406, 32555) },
- { AOM_CDF5(10433, 26113, 31504, 31975) },
- { AOM_CDF5(5825, 14284, 21349, 24461) },
- { AOM_CDF5(4545, 8454, 12648, 17501) },
- { AOM_CDF5(193, 7173, 15272, 19322) },
- { AOM_CDF5(2113, 2183, 7202, 7377) } } } },
- { // UV plane
- { // Inter
- { // Band 0
- { AOM_CDF6(27456, 28244, 31289, 32358, 32534) },
- { AOM_CDF6(16960, 21207, 26511, 30539, 31190) },
- { AOM_CDF6(5440, 13412, 18469, 26423, 27669) } },
- { // Band 1
- { AOM_CDF5(17857, 26327, 31983, 32219) },
- { AOM_CDF5(16065, 24198, 31431, 31785) },
- { AOM_CDF5(12865, 18011, 28454, 29166) },
- { AOM_CDF5(9665, 12501, 24331, 25147) },
- { AOM_CDF5(2753, 3121, 12661, 13034) },
- { AOM_CDF5(4033, 4140, 11834, 11977) } },
- { // Band 2
- { AOM_CDF5(21185, 28338, 32249, 32417) },
- { AOM_CDF5(18497, 25227, 31905, 32122) },
- { AOM_CDF5(12097, 16516, 28610, 29166) },
- { AOM_CDF5(9281, 11157, 21438, 22312) },
- { AOM_CDF5(5697, 6566, 15585, 16340) },
- { AOM_CDF5(9409, 9659, 11827, 12911) } },
- { // Band 3
- { AOM_CDF5(22337, 29459, 32382, 32519) },
- { AOM_CDF5(16961, 25262, 31874, 32123) },
- { AOM_CDF5(12353, 17748, 29300, 29852) },
- { AOM_CDF5(9025, 11528, 24468, 25141) },
- { AOM_CDF5(6209, 6565, 15806, 16121) },
- { AOM_CDF5(2497, 2524, 7050, 7125) } },
- { // Band 4
- { AOM_CDF5(20417, 29779, 32552, 32636) },
- { AOM_CDF5(15553, 26420, 32063, 32295) },
- { AOM_CDF5(9665, 17946, 29385, 30096) },
- { AOM_CDF5(5569, 10207, 22410, 23836) },
- { AOM_CDF5(16449, 16450, 16545, 16593) },
- { AOM_CDF5(2369, 2395, 6822, 6898) } },
- { // Band 5
- { AOM_CDF5(10177, 30567, 32725, 32745) },
- { AOM_CDF5(9537, 28243, 32179, 32423) },
- { AOM_CDF5(13377, 23187, 29322, 30382) },
- { AOM_CDF5(13121, 21346, 29507, 30326) },
- { AOM_CDF5(4417, 4939, 15104, 15535) },
- { AOM_CDF5(2625, 2680, 8218, 8338) } } },
- { // Inter
- { // Band 0
- { AOM_CDF6(29376, 30098, 32421, 32766, 32767) },
- { AOM_CDF6(18368, 22916, 30116, 32541, 32650) },
- { AOM_CDF6(5952, 16505, 25955, 32163, 32365) } },
- { // Band 1
- { AOM_CDF5(19649, 30160, 32743, 32753) },
- { AOM_CDF5(18881, 28724, 32688, 32717) },
- { AOM_CDF5(16833, 23053, 31244, 31573) },
- { AOM_CDF5(14657, 17714, 26083, 26978) },
- { AOM_CDF5(14657, 16618, 24597, 25403) },
- { AOM_CDF5(4289, 4326, 10686, 10751) } },
- { // Band 2
- { AOM_CDF5(21953, 30956, 32748, 32757) },
- { AOM_CDF5(20929, 29412, 32700, 32725) },
- { AOM_CDF5(13377, 21495, 31216, 31569) },
- { AOM_CDF5(9153, 15097, 28295, 28990) },
- { AOM_CDF5(5313, 5363, 13839, 13894) },
- { AOM_CDF5(2625, 2652, 7276, 7351) } },
- { // Band 3
- { AOM_CDF5(20289, 31164, 32745, 32755) },
- { AOM_CDF5(17601, 29635, 32739, 32751) },
- { AOM_CDF5(18241, 24284, 32116, 32258) },
- { AOM_CDF5(32705, 32706, 32739, 32740) },
- { AOM_CDF5(5697, 5750, 14739, 14792) },
- { AOM_CDF5(2881, 2913, 8427, 8498) } },
- { // Band 4
- { AOM_CDF5(19009, 31481, 32742, 32754) },
- { AOM_CDF5(15809, 30521, 32736, 32750) },
- { AOM_CDF5(16449, 32705, 32737, 32753) },
- { AOM_CDF5(7873, 8039, 19981, 20068) },
- { AOM_CDF5(5313, 5366, 14376, 14430) },
- { AOM_CDF5(2753, 2789, 8909, 8979) } },
- { // Band 5
- { AOM_CDF5(11841, 32116, 32728, 32748) },
- { AOM_CDF5(12353, 32132, 32729, 32748) },
- { AOM_CDF5(7489, 12435, 25708, 26666) },
- { AOM_CDF5(5697, 7486, 20238, 21009) },
- { AOM_CDF5(4929, 5579, 16402, 16866) },
- { AOM_CDF5(3009, 3246, 10158, 10533) } } } }
-};
-static const coeff_cdf_model default_coef_head_cdf_8x8[PLANE_TYPES] = {
- { // Y plane
- { // Intra
- { // Band 0
- { AOM_CDF6(16064, 18127, 22153, 27289, 28507) },
- { AOM_CDF6(6720, 10545, 13491, 20948, 22631) },
- { AOM_CDF6(832, 5270, 5918, 12645, 13532) } },
- { // Band 1
- { AOM_CDF5(14017, 16139, 26799, 27295) },
- { AOM_CDF5(12737, 15136, 26235, 26816) },
- { AOM_CDF5(10817, 12445, 23637, 24217) },
- { AOM_CDF5(8897, 9702, 20040, 20500) },
- { AOM_CDF5(5953, 6156, 13966, 14205) },
- { AOM_CDF5(2497, 2519, 6222, 6300) } },
- { // Band 2
- { AOM_CDF5(19777, 21403, 30054, 30269) },
- { AOM_CDF5(16193, 17913, 28593, 28883) },
- { AOM_CDF5(12609, 13572, 25248, 25534) },
- { AOM_CDF5(9665, 10118, 20721, 20968) },
- { AOM_CDF5(6849, 7028, 15202, 15391) },
- { AOM_CDF5(3009, 3036, 7601, 7675) } },
- { // Band 3
- { AOM_CDF5(22593, 23915, 31159, 31283) },
- { AOM_CDF5(17345, 18690, 29425, 29611) },
- { AOM_CDF5(11969, 12540, 24685, 24867) },
- { AOM_CDF5(8129, 8355, 18668, 18819) },
- { AOM_CDF5(4673, 4714, 11752, 11814) },
- { AOM_CDF5(1857, 1876, 5057, 5138) } },
- { // Band 4
- { AOM_CDF5(24513, 25718, 31947, 32014) },
- { AOM_CDF5(18881, 20029, 30409, 30527) },
- { AOM_CDF5(12481, 12953, 25201, 25341) },
- { AOM_CDF5(8385, 8528, 18815, 18910) },
- { AOM_CDF5(4289, 4327, 10797, 10861) },
- { AOM_CDF5(1857, 1872, 4332, 4415) } },
- { // Band 5
- { AOM_CDF5(26049, 27752, 32415, 32462) },
- { AOM_CDF5(20417, 22100, 31056, 31192) },
- { AOM_CDF5(12481, 13075, 24646, 24844) },
- { AOM_CDF5(7489, 7696, 17117, 17285) },
- { AOM_CDF5(3777, 3814, 10062, 10129) },
- { AOM_CDF5(1473, 1486, 3735, 3820) } } },
- { // Intra
- { // Band 0
- { AOM_CDF6(25920, 27743, 29455, 32147, 32280) },
- { AOM_CDF6(13888, 19845, 23350, 30219, 30660) },
- { AOM_CDF6(2368, 12781, 16196, 27232, 27894) } },
- { // Band 1
- { AOM_CDF5(21697, 24758, 32358, 32417) },
- { AOM_CDF5(20289, 23960, 32111, 32213) },
- { AOM_CDF5(17345, 19966, 30630, 30841) },
- { AOM_CDF5(14529, 16070, 27461, 27777) },
- { AOM_CDF5(9793, 10613, 21146, 21566) },
- { AOM_CDF5(6977, 7162, 15591, 15776) } },
- { // Band 2
- { AOM_CDF5(23617, 26783, 32572, 32607) },
- { AOM_CDF5(20801, 24292, 32185, 32275) },
- { AOM_CDF5(15169, 17905, 29916, 30181) },
- { AOM_CDF5(10945, 12972, 25565, 26064) },
- { AOM_CDF5(6849, 8334, 18543, 19446) },
- { AOM_CDF5(3649, 4346, 12351, 13169) } },
- { // Band 3
- { AOM_CDF5(25281, 28440, 32667, 32689) },
- { AOM_CDF5(22081, 25694, 32414, 32476) },
- { AOM_CDF5(15297, 18341, 30141, 30410) },
- { AOM_CDF5(10305, 12381, 24477, 25084) },
- { AOM_CDF5(5697, 6673, 16325, 17080) },
- { AOM_CDF5(2369, 2393, 6466, 6543) } },
- { // Band 4
- { AOM_CDF5(25921, 29445, 32729, 32739) },
- { AOM_CDF5(22465, 26834, 32588, 32627) },
- { AOM_CDF5(16449, 20062, 31016, 31233) },
- { AOM_CDF5(11073, 13165, 25353, 25896) },
- { AOM_CDF5(11713, 13837, 20144, 21734) },
- { AOM_CDF5(2241, 2265, 6355, 6432) } },
- { // Band 5
- { AOM_CDF5(26177, 29403, 32705, 32721) },
- { AOM_CDF5(22337, 26344, 32545, 32589) },
- { AOM_CDF5(19009, 21527, 31775, 31873) },
- { AOM_CDF5(11585, 12685, 22632, 23137) },
- { AOM_CDF5(8257, 8305, 16444, 16492) },
- { AOM_CDF5(2113, 2183, 7202, 7377) } } } },
- { // UV plane
- { // Inter
- { // Band 0
- { AOM_CDF6(27200, 27981, 31389, 32444, 32592) },
- { AOM_CDF6(14528, 19068, 24887, 29901, 30688) },
- { AOM_CDF6(3776, 11778, 14700, 23745, 24854) } },
- { // Band 1
- { AOM_CDF5(20289, 25202, 31672, 31909) },
- { AOM_CDF5(18369, 23493, 31166, 31487) },
- { AOM_CDF5(15425, 18619, 28941, 29393) },
- { AOM_CDF5(10945, 12535, 24287, 24792) },
- { AOM_CDF5(6465, 6810, 15764, 16080) },
- { AOM_CDF5(2113, 2137, 6125, 6203) } },
- { // Band 2
- { AOM_CDF5(23745, 27041, 31976, 32135) },
- { AOM_CDF5(19521, 22766, 31139, 31367) },
- { AOM_CDF5(14273, 15834, 27820, 28105) },
- { AOM_CDF5(9537, 10445, 22106, 22491) },
- { AOM_CDF5(7233, 7386, 15961, 16109) },
- { AOM_CDF5(2369, 2401, 7891, 7964) } },
- { // Band 3
- { AOM_CDF5(26305, 28703, 32352, 32435) },
- { AOM_CDF5(20673, 23490, 31517, 31680) },
- { AOM_CDF5(14017, 15251, 27458, 27702) },
- { AOM_CDF5(10945, 11374, 22496, 22687) },
- { AOM_CDF5(9153, 9435, 22299, 22411) },
- { AOM_CDF5(193, 269, 13236, 13293) } },
- { // Band 4
- { AOM_CDF5(27713, 29770, 32522, 32575) },
- { AOM_CDF5(21569, 24342, 31785, 31919) },
- { AOM_CDF5(15297, 16497, 28367, 28569) },
- { AOM_CDF5(17601, 17828, 24444, 24582) },
- { AOM_CDF5(6977, 7035, 16901, 16947) },
- { AOM_CDF5(193, 384, 32706, 32707) } },
- { // Band 5
- { AOM_CDF5(28737, 30879, 32667, 32695) },
- { AOM_CDF5(22593, 26241, 32073, 32207) },
- { AOM_CDF5(16577, 19148, 28436, 28906) },
- { AOM_CDF5(12993, 14005, 23151, 23630) },
- { AOM_CDF5(7617, 9188, 22797, 23313) },
- { AOM_CDF5(2625, 2680, 8218, 8338) } } },
- { // Inter
- { // Band 0
- { AOM_CDF6(28864, 29988, 32423, 32766, 32767) },
- { AOM_CDF6(18496, 24572, 30167, 32687, 32737) },
- { AOM_CDF6(5440, 19618, 25332, 32393, 32491) } },
- { // Band 1
- { AOM_CDF5(23745, 29427, 32751, 32757) },
- { AOM_CDF5(23745, 28704, 32716, 32731) },
- { AOM_CDF5(23105, 27943, 32524, 32587) },
- { AOM_CDF5(21057, 24773, 29589, 30282) },
- { AOM_CDF5(12609, 14823, 23831, 24713) },
- { AOM_CDF5(16449, 16450, 16545, 16593) } },
- { // Band 2
- { AOM_CDF5(25025, 30203, 32754, 32759) },
- { AOM_CDF5(23617, 28361, 32715, 32729) },
- { AOM_CDF5(17985, 21562, 31354, 31543) },
- { AOM_CDF5(12353, 18915, 28742, 29548) },
- { AOM_CDF5(193, 289, 16545, 16593) },
- { AOM_CDF5(2625, 2652, 7276, 7351) } },
- { // Band 3
- { AOM_CDF5(26433, 30892, 32757, 32761) },
- { AOM_CDF5(24513, 29274, 32721, 32735) },
- { AOM_CDF5(20161, 24040, 32055, 32171) },
- { AOM_CDF5(21953, 24678, 27382, 28734) },
- { AOM_CDF5(5697, 5750, 14739, 14792) },
- { AOM_CDF5(2881, 2913, 8427, 8498) } },
- { // Band 4
- { AOM_CDF5(27457, 31485, 32759, 32763) },
- { AOM_CDF5(24129, 29502, 32752, 32757) },
- { AOM_CDF5(19009, 25452, 32473, 32544) },
- { AOM_CDF5(32705, 32706, 32737, 32738) },
- { AOM_CDF5(5313, 5366, 14376, 14430) },
- { AOM_CDF5(2753, 2789, 8909, 8979) } },
- { // Band 5
- { AOM_CDF5(27841, 32288, 32759, 32764) },
- { AOM_CDF5(19137, 30271, 32742, 32753) },
- { AOM_CDF5(18625, 27739, 29979, 31099) },
- { AOM_CDF5(5697, 7486, 20238, 21009) },
- { AOM_CDF5(4929, 5579, 16402, 16866) },
- { AOM_CDF5(3009, 3246, 10158, 10533) } } } }
-};
-static const coeff_cdf_model default_coef_head_cdf_16x16[PLANE_TYPES] = {
- { // Y plane
- { // Intra
- { // Band 0
- { AOM_CDF6(960, 4882, 9467, 17710, 20412) },
- { AOM_CDF6(704, 4657, 6561, 14507, 16279) },
- { AOM_CDF6(192, 3443, 3759, 9011, 9685) } },
- { // Band 1
- { AOM_CDF5(12481, 13958, 24487, 24997) },
- { AOM_CDF5(11457, 13075, 23820, 24406) },
- { AOM_CDF5(9793, 11127, 21775, 22387) },
- { AOM_CDF5(7745, 8457, 18155, 18655) },
- { AOM_CDF5(5441, 5668, 13180, 13467) },
- { AOM_CDF5(2497, 2520, 6340, 6417) } },
- { // Band 2
- { AOM_CDF5(19521, 20572, 28965, 29177) },
- { AOM_CDF5(15425, 16741, 27247, 27554) },
- { AOM_CDF5(11969, 12690, 23872, 24141) },
- { AOM_CDF5(9281, 9678, 19970, 20207) },
- { AOM_CDF5(6081, 6266, 14682, 14876) },
- { AOM_CDF5(2753, 2779, 7150, 7225) } },
- { // Band 3
- { AOM_CDF5(22337, 23293, 30630, 30753) },
- { AOM_CDF5(16321, 17427, 28368, 28570) },
- { AOM_CDF5(11457, 11907, 23570, 23741) },
- { AOM_CDF5(7233, 7331, 17258, 17334) },
- { AOM_CDF5(4033, 4070, 10375, 10441) },
- { AOM_CDF5(1601, 1619, 4706, 4788) } },
- { // Band 4
- { AOM_CDF5(24769, 25536, 31660, 31722) },
- { AOM_CDF5(18113, 18886, 29420, 29534) },
- { AOM_CDF5(11201, 11412, 23207, 23291) },
- { AOM_CDF5(6977, 7033, 16599, 16646) },
- { AOM_CDF5(4033, 4070, 10375, 10441) },
- { AOM_CDF5(1601, 1620, 4827, 4909) } },
- { // Band 5
- { AOM_CDF5(28353, 28831, 32502, 32517) },
- { AOM_CDF5(21441, 21869, 30977, 31017) },
- { AOM_CDF5(11969, 12088, 24116, 24158) },
- { AOM_CDF5(7489, 7547, 17413, 17458) },
- { AOM_CDF5(4545, 4585, 11325, 11388) },
- { AOM_CDF5(2113, 2133, 5526, 5606) } } },
- { // Intra
- { // Band 0
- { AOM_CDF6(2496, 8717, 17280, 28922, 29751) },
- { AOM_CDF6(2496, 9665, 15235, 26542, 27580) },
- { AOM_CDF6(448, 9240, 11886, 24124, 24898) } },
- { // Band 1
- { AOM_CDF5(21057, 22896, 31877, 31953) },
- { AOM_CDF5(20673, 23151, 31706, 31825) },
- { AOM_CDF5(18753, 20519, 30497, 30668) },
- { AOM_CDF5(15425, 16608, 27789, 28027) },
- { AOM_CDF5(10305, 10977, 21405, 21749) },
- { AOM_CDF5(3649, 3812, 11213, 11445) } },
- { // Band 2
- { AOM_CDF5(24001, 25899, 32307, 32360) },
- { AOM_CDF5(20929, 22941, 31775, 31867) },
- { AOM_CDF5(15169, 16734, 29228, 29425) },
- { AOM_CDF5(10561, 12047, 24918, 25324) },
- { AOM_CDF5(6977, 7929, 18311, 18918) },
- { AOM_CDF5(3649, 3760, 9962, 10162) } },
- { // Band 3
- { AOM_CDF5(25793, 27526, 32565, 32591) },
- { AOM_CDF5(21825, 23885, 32064, 32135) },
- { AOM_CDF5(15041, 16286, 29203, 29360) },
- { AOM_CDF5(10433, 11058, 24349, 24538) },
- { AOM_CDF5(5569, 6016, 16460, 16794) },
- { AOM_CDF5(193, 194, 384, 479) } },
- { // Band 4
- { AOM_CDF5(26433, 28398, 32682, 32696) },
- { AOM_CDF5(22977, 25086, 32367, 32412) },
- { AOM_CDF5(16577, 17928, 30144, 30275) },
- { AOM_CDF5(12481, 13352, 25993, 26211) },
- { AOM_CDF5(7745, 8069, 20501, 20657) },
- { AOM_CDF5(16449, 16450, 16545, 16593) } },
- { // Band 5
- { AOM_CDF5(27841, 29700, 32721, 32730) },
- { AOM_CDF5(23873, 26202, 32578, 32604) },
- { AOM_CDF5(17729, 19046, 30448, 30568) },
- { AOM_CDF5(13505, 14508, 26034, 26304) },
- { AOM_CDF5(10049, 10494, 19945, 20233) },
- { AOM_CDF5(2113, 2183, 7202, 7377) } } } },
- { // UV plane
- { // Inter
- { // Band 0
- { AOM_CDF6(27072, 27916, 31095, 32400, 32553) },
- { AOM_CDF6(12352, 16792, 22516, 28853, 29797) },
- { AOM_CDF6(2880, 9023, 11126, 20602, 21713) } },
- { // Band 1
- { AOM_CDF5(20161, 24785, 31070, 31430) },
- { AOM_CDF5(17985, 22773, 30430, 30880) },
- { AOM_CDF5(15937, 18802, 28265, 28788) },
- { AOM_CDF5(11841, 13587, 24798, 25335) },
- { AOM_CDF5(8769, 9160, 19316, 19566) },
- { AOM_CDF5(5313, 5357, 12874, 12932) } },
- { // Band 2
- { AOM_CDF5(24129, 26501, 31672, 31844) },
- { AOM_CDF5(19649, 21553, 30130, 30370) },
- { AOM_CDF5(11713, 13134, 25983, 26321) },
- { AOM_CDF5(9409, 9948, 21408, 21663) },
- { AOM_CDF5(5569, 5757, 14335, 14533) },
- { AOM_CDF5(2241, 2305, 13152, 13209) } },
- { // Band 3
- { AOM_CDF5(26817, 28135, 32130, 32209) },
- { AOM_CDF5(20161, 21412, 30331, 30481) },
- { AOM_CDF5(13377, 13798, 26065, 26176) },
- { AOM_CDF5(8129, 8290, 19920, 20008) },
- { AOM_CDF5(5697, 5751, 14950, 15002) },
- { AOM_CDF5(5569, 5601, 11041, 11105) } },
- { // Band 4
- { AOM_CDF5(28225, 29079, 32387, 32426) },
- { AOM_CDF5(21185, 22046, 30982, 31061) },
- { AOM_CDF5(13377, 13595, 25762, 25824) },
- { AOM_CDF5(8001, 8123, 20530, 20590) },
- { AOM_CDF5(4289, 4322, 9907, 9974) },
- { AOM_CDF5(3393, 3412, 6663, 6739) } },
- { // Band 5
- { AOM_CDF5(30529, 31014, 32651, 32664) },
- { AOM_CDF5(23489, 24268, 31627, 31682) },
- { AOM_CDF5(14017, 14239, 26653, 26707) },
- { AOM_CDF5(11201, 11317, 23122, 23169) },
- { AOM_CDF5(6721, 6768, 14810, 14863) },
- { AOM_CDF5(6593, 6632, 13188, 13245) } } },
- { // Inter
- { // Band 0
- { AOM_CDF6(29888, 30492, 32500, 32766, 32767) },
- { AOM_CDF6(18752, 23235, 29846, 32214, 32442) },
- { AOM_CDF6(5568, 17762, 25039, 31213, 31651) } },
- { // Band 1
- { AOM_CDF5(26433, 29681, 32757, 32760) },
- { AOM_CDF5(24769, 28761, 32722, 32734) },
- { AOM_CDF5(22209, 26975, 32418, 32500) },
- { AOM_CDF5(16321, 21333, 28368, 29283) },
- { AOM_CDF5(12865, 14775, 22545, 23553) },
- { AOM_CDF5(12353, 12354, 12473, 12532) } },
- { // Band 2
- { AOM_CDF5(27457, 30005, 32738, 32745) },
- { AOM_CDF5(24897, 27541, 32723, 32731) },
- { AOM_CDF5(15297, 19106, 30414, 30711) },
- { AOM_CDF5(6593, 8826, 19732, 20840) },
- { AOM_CDF5(4161, 4233, 16509, 16557) },
- { AOM_CDF5(2625, 2652, 7276, 7351) } },
- { // Band 3
- { AOM_CDF5(28609, 30482, 32761, 32763) },
- { AOM_CDF5(25665, 27830, 32727, 32733) },
- { AOM_CDF5(21057, 23803, 30367, 30721) },
- { AOM_CDF5(10945, 21878, 32726, 32737) },
- { AOM_CDF5(5697, 5750, 14739, 14792) },
- { AOM_CDF5(2881, 2913, 8427, 8498) } },
- { // Band 4
- { AOM_CDF5(28993, 30944, 32762, 32764) },
- { AOM_CDF5(26561, 28695, 32733, 32739) },
- { AOM_CDF5(17985, 19028, 31008, 31079) },
- { AOM_CDF5(7873, 8039, 19981, 20068) },
- { AOM_CDF5(5313, 5366, 14376, 14430) },
- { AOM_CDF5(2753, 2789, 8909, 8979) } },
- { // Band 5
- { AOM_CDF5(30273, 32029, 32764, 32766) },
- { AOM_CDF5(28609, 30847, 32745, 32751) },
- { AOM_CDF5(21313, 24377, 31986, 32098) },
- { AOM_CDF5(32705, 32709, 32739, 32741) },
- { AOM_CDF5(4929, 5579, 16402, 16866) },
- { AOM_CDF5(3009, 3246, 10158, 10533) } } } }
-};
-static const coeff_cdf_model default_coef_head_cdf_32x32[PLANE_TYPES] = {
- { // Y plane
- { // Intra
- { // Band 0
- { AOM_CDF6(2240, 5407, 18304, 25601, 27911) },
- { AOM_CDF6(960, 4633, 8197, 16254, 18796) },
- { AOM_CDF6(192, 3061, 3557, 8701, 9762) } },
- { // Band 1
- { AOM_CDF5(11969, 15846, 25660, 26667) },
- { AOM_CDF5(11713, 15794, 25737, 26760) },
- { AOM_CDF5(9281, 12675, 23181, 24351) },
- { AOM_CDF5(7105, 8757, 18383, 19437) },
- { AOM_CDF5(4289, 4579, 11353, 11792) },
- { AOM_CDF5(1857, 1874, 4695, 4777) } },
- { // Band 2
- { AOM_CDF5(20929, 22297, 29370, 29646) },
- { AOM_CDF5(17473, 18985, 28079, 28413) },
- { AOM_CDF5(13121, 14064, 24902, 25217) },
- { AOM_CDF5(9793, 10214, 20069, 20329) },
- { AOM_CDF5(5825, 5987, 13350, 13559) },
- { AOM_CDF5(2241, 2260, 5520, 5600) } },
- { // Band 3
- { AOM_CDF5(25921, 26891, 31632, 31729) },
- { AOM_CDF5(18241, 19463, 29222, 29419) },
- { AOM_CDF5(11585, 12065, 23294, 23488) },
- { AOM_CDF5(6593, 6686, 16153, 16234) },
- { AOM_CDF5(3137, 3170, 8751, 8821) },
- { AOM_CDF5(1345, 1359, 3739, 3824) } },
- { // Band 4
- { AOM_CDF5(27713, 28504, 32068, 32132) },
- { AOM_CDF5(19265, 20354, 29789, 29943) },
- { AOM_CDF5(11201, 11538, 22701, 22848) },
- { AOM_CDF5(6337, 6424, 15268, 15353) },
- { AOM_CDF5(3649, 3681, 9052, 9121) },
- { AOM_CDF5(1601, 1618, 4584, 4667) } },
- { // Band 5
- { AOM_CDF5(30913, 31044, 32635, 32640) },
- { AOM_CDF5(22081, 22261, 30452, 30477) },
- { AOM_CDF5(10561, 10625, 21535, 21568) },
- { AOM_CDF5(6081, 6130, 14369, 14423) },
- { AOM_CDF5(3777, 3809, 9156, 9225) },
- { AOM_CDF5(1857, 1875, 4936, 5018) } } },
- { // Intra
- { // Band 0
- { AOM_CDF6(4672, 6927, 23534, 29846, 30928) },
- { AOM_CDF6(3776, 6784, 18075, 25863, 27926) },
- { AOM_CDF6(1344, 5588, 12166, 20966, 23504) } },
- { // Band 1
- { AOM_CDF5(19393, 22016, 31280, 31444) },
- { AOM_CDF5(21185, 24329, 31706, 31865) },
- { AOM_CDF5(20673, 23240, 31186, 31379) },
- { AOM_CDF5(17857, 20035, 29594, 29889) },
- { AOM_CDF5(13633, 14929, 24883, 25337) },
- { AOM_CDF5(7873, 8416, 17452, 17886) } },
- { // Band 2
- { AOM_CDF5(25665, 27145, 32256, 32314) },
- { AOM_CDF5(21057, 22826, 31465, 31576) },
- { AOM_CDF5(13633, 14885, 27873, 28088) },
- { AOM_CDF5(8769, 9515, 21941, 22248) },
- { AOM_CDF5(6209, 6594, 15598, 15950) },
- { AOM_CDF5(1985, 2014, 6855, 6931) } },
- { // Band 3
- { AOM_CDF5(26817, 27824, 32362, 32399) },
- { AOM_CDF5(21185, 22321, 31389, 31466) },
- { AOM_CDF5(13761, 14154, 27163, 27245) },
- { AOM_CDF5(8897, 9011, 20600, 20659) },
- { AOM_CDF5(4673, 4774, 15044, 15131) },
- { AOM_CDF5(193, 194, 384, 479) } },
- { // Band 4
- { AOM_CDF5(28865, 29687, 32655, 32667) },
- { AOM_CDF5(23233, 24218, 32080, 32118) },
- { AOM_CDF5(15041, 15444, 28787, 28845) },
- { AOM_CDF5(9921, 10248, 22818, 22944) },
- { AOM_CDF5(7745, 7866, 16591, 16702) },
- { AOM_CDF5(193, 194, 384, 479) } },
- { // Band 5
- { AOM_CDF5(31169, 31559, 32741, 32744) },
- { AOM_CDF5(24769, 25583, 32347, 32370) },
- { AOM_CDF5(15937, 16169, 29120, 29152) },
- { AOM_CDF5(7489, 7578, 22647, 22677) },
- { AOM_CDF5(7617, 7689, 19849, 19887) },
- { AOM_CDF5(2113, 2183, 7202, 7377) } } } },
- { // UV plane
- { // Inter
- { // Band 0
- { AOM_CDF6(23232, 24301, 30231, 31582, 32091) },
- { AOM_CDF6(7872, 11041, 22542, 27086, 29145) },
- { AOM_CDF6(1344, 3989, 18125, 25340, 27820) } },
- { // Band 1
- { AOM_CDF5(15937, 29000, 32210, 32434) },
- { AOM_CDF5(12353, 26626, 31533, 31993) },
- { AOM_CDF5(11457, 29187, 30896, 31750) },
- { AOM_CDF5(5697, 21278, 28169, 29764) },
- { AOM_CDF5(7489, 8855, 13365, 15620) },
- { AOM_CDF5(4289, 4833, 8572, 10108) } },
- { // Band 2
- { AOM_CDF5(25025, 30783, 32603, 32666) },
- { AOM_CDF5(24385, 29586, 31803, 32142) },
- { AOM_CDF5(22337, 23002, 27573, 27903) },
- { AOM_CDF5(10945, 12336, 21900, 22590) },
- { AOM_CDF5(8257, 8830, 19986, 20298) },
- { AOM_CDF5(10945, 10990, 18660, 18701) } },
- { // Band 3
- { AOM_CDF5(29761, 31473, 32693, 32715) },
- { AOM_CDF5(20417, 24512, 31394, 31650) },
- { AOM_CDF5(11713, 13283, 25819, 26206) },
- { AOM_CDF5(13121, 14099, 21909, 22514) },
- { AOM_CDF5(193, 248, 9546, 9614) },
- { AOM_CDF5(2497, 2524, 7050, 7125) } },
- { // Band 4
- { AOM_CDF5(30657, 31885, 32691, 32715) },
- { AOM_CDF5(19393, 26050, 31698, 31988) },
- { AOM_CDF5(15809, 15863, 24985, 25008) },
- { AOM_CDF5(23489, 28138, 32751, 32756) },
- { AOM_CDF5(16449, 16450, 16545, 16593) },
- { AOM_CDF5(2369, 2395, 6822, 6898) } },
- { // Band 5
- { AOM_CDF5(32705, 32744, 32766, 32767) },
- { AOM_CDF5(21953, 24962, 32156, 32246) },
- { AOM_CDF5(13121, 15358, 26284, 26835) },
- { AOM_CDF5(5697, 7417, 20132, 20885) },
- { AOM_CDF5(4417, 4939, 15104, 15535) },
- { AOM_CDF5(2625, 2680, 8218, 8338) } } },
- { // Inter
- { // Band 0
- { AOM_CDF6(25280, 25678, 32446, 32622, 32724) },
- { AOM_CDF6(10560, 11822, 28682, 29919, 31276) },
- { AOM_CDF6(3264, 5170, 21779, 24026, 27905) } },
- { // Band 1
- { AOM_CDF5(24257, 30554, 32719, 32738) },
- { AOM_CDF5(17217, 27413, 32617, 32667) },
- { AOM_CDF5(22977, 27600, 32482, 32552) },
- { AOM_CDF5(16833, 24360, 30746, 31293) },
- { AOM_CDF5(17089, 20060, 28880, 29370) },
- { AOM_CDF5(10945, 11009, 21900, 21932) } },
- { // Band 2
- { AOM_CDF5(27201, 30217, 32736, 32745) },
- { AOM_CDF5(22721, 27676, 32749, 32754) },
- { AOM_CDF5(5057, 12431, 25246, 26620) },
- { AOM_CDF5(193, 321, 22016, 22048) },
- { AOM_CDF5(5313, 5363, 13839, 13894) },
- { AOM_CDF5(2625, 2652, 7276, 7351) } },
- { // Band 3
- { AOM_CDF5(27713, 30739, 32759, 32762) },
- { AOM_CDF5(26177, 30430, 32756, 32760) },
- { AOM_CDF5(193, 384, 32706, 32707) },
- { AOM_CDF5(9409, 9528, 21591, 21646) },
- { AOM_CDF5(193, 194, 384, 479) },
- { AOM_CDF5(2881, 2913, 8427, 8498) } },
- { // Band 4
- { AOM_CDF5(28993, 31156, 32747, 32753) },
- { AOM_CDF5(25153, 28701, 32754, 32758) },
- { AOM_CDF5(16449, 16544, 32737, 32738) },
- { AOM_CDF5(193, 321, 22016, 22048) },
- { AOM_CDF5(193, 194, 384, 479) },
- { AOM_CDF5(2753, 2789, 8909, 8979) } },
- { // Band 5
- { AOM_CDF5(30785, 32088, 32765, 32766) },
- { AOM_CDF5(22977, 26623, 32750, 32754) },
- { AOM_CDF5(21953, 21954, 22017, 22049) },
- { AOM_CDF5(5697, 7486, 20238, 21009) },
- { AOM_CDF5(4929, 5579, 16402, 16866) },
- { AOM_CDF5(3009, 3246, 10158, 10533) } } } }
-};
-
-/* clang-format on */
-#endif // !CONFIG_Q_ADAPT_PROBS
-
static void build_tail_cdfs(aom_cdf_prob cdf_tail[CDF_SIZE(ENTROPY_TOKENS)],
aom_cdf_prob cdf_head[CDF_SIZE(ENTROPY_TOKENS)],
int band_zero) {
@@ -1523,19 +860,6 @@
}
}
-#if !CONFIG_Q_ADAPT_PROBS
-// FIXME. Optimize for TX_2X2 and TX_64X64.
-static void av1_default_coef_cdfs(FRAME_CONTEXT *fc) {
- av1_copy(fc->coef_head_cdfs[TX_4X4], default_coef_head_cdf_4x4);
- av1_copy(fc->coef_head_cdfs[TX_8X8], default_coef_head_cdf_8x8);
- av1_copy(fc->coef_head_cdfs[TX_16X16], default_coef_head_cdf_16x16);
- av1_copy(fc->coef_head_cdfs[TX_32X32], default_coef_head_cdf_32x32);
-#if CONFIG_TX64X64
- av1_copy(fc->coef_head_cdfs[TX_64X64], default_coef_head_cdf_32x32);
-#endif // CONFIG_TX64X64
-}
-#endif // !CONFIG_Q_ADAPT_PROBS
-
void av1_coef_pareto_cdfs(FRAME_CONTEXT *fc) {
/* Build the tail based on a Pareto distribution */
TX_SIZE t;
@@ -1550,7 +874,6 @@
}
void av1_default_coef_probs(AV1_COMMON *cm) {
-#if CONFIG_Q_ADAPT_PROBS
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]);
@@ -1564,10 +887,6 @@
av1_copy(cm->fc->coef_head_cdfs[TX_64X64],
(*av1_default_qctx_coef_cdfs[index])[TX_32X32]);
#endif // CONFIG_TX64X64
-#else
- /* Load the head tokens */
- av1_default_coef_cdfs(cm->fc);
-#endif // CONFIG_Q_ADAPT_PROBS
av1_coef_pareto_cdfs(cm->fc);
}
diff --git a/av1/common/entropy.h b/av1/common/entropy.h
index b0227df..7316ef6 100644
--- a/av1/common/entropy.h
+++ b/av1/common/entropy.h
@@ -27,9 +27,7 @@
#define DIFF_UPDATE_PROB 252
#define GROUP_DIFF_UPDATE_PROB 252
-#if CONFIG_Q_ADAPT_PROBS
#define TOKEN_CDF_Q_CTXS 4
-#endif // CONFIG_Q_ADAPT_PROBS
// Coefficient token alphabet
#define ZERO_TOKEN 0 // 0 Extra Bits 0+0
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 15adb74..6484008 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -2983,12 +2983,10 @@
setup_quantization(cm, rb);
xd->bd = (int)cm->bit_depth;
-#if CONFIG_Q_ADAPT_PROBS
if (frame_is_intra_only(cm) || cm->error_resilient_mode) {
av1_default_coef_probs(cm);
av1_setup_frame_contexts(cm);
}
-#endif // CONFIG_Q_ADAPT_PROBS
setup_segmentation(cm, rb);
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index d872635..d7dde87 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -5523,14 +5523,12 @@
if (loop_count == 0) setup_frame(cpi);
-#if CONFIG_Q_ADAPT_PROBS
// Base q-index may have changed, so we need to assign proper default coef
// probs before every iteration.
if (frame_is_intra_only(cm) || cm->error_resilient_mode) {
av1_default_coef_probs(cm);
av1_setup_frame_contexts(cm);
}
-#endif // CONFIG_Q_ADAPT_PROBS
// Variance adaptive and in frame q adjustment experiments are mutually
// exclusive.
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 1719e89..016347f 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -170,7 +170,6 @@
set(CONFIG_OPT_REF_MV 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_PALETTE_THROUGHPUT 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_PARALLEL_DEBLOCKING 1 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_Q_ADAPT_PROBS 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_RD_DEBUG 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_RECT_TX_EXT 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_RECT_TX_EXT_INTRA 1 CACHE NUMBER "AV1 experiment flag.")
diff --git a/configure b/configure
index cb3a97f..59bd9a6 100755
--- a/configure
+++ b/configure
@@ -265,7 +265,6 @@
ext_partition
ext_partition_types
ext_tile
- q_adapt_probs
inter_stats_only
kf_ctx
cfl
@@ -499,7 +498,6 @@
soft_enable ext_partition_types
# Provisional adopted
- soft_enable q_adapt_probs
soft_enable reference_buffer
soft_enable loopfiltering_across_tiles
soft_enable palette_throughput
