diff --git a/av1/common/warped_motion.c b/av1/common/warped_motion.c index 5b51aa6b16ce9d9a724158b1546057a7c383271f..3f8b570aebe087c790ce363ac0c2adf18f45ea42 100644 --- a/av1/common/warped_motion.c +++ b/av1/common/warped_motion.c @@ -20,71 +20,71 @@ /* clang-format off */ static const int error_measure_lut[512] = { - // power 0.6 - 255, 254, 254, 253, 253, 252, 251, 251, - 250, 250, 249, 248, 248, 247, 247, 246, - 245, 245, 244, 243, 243, 242, 242, 241, - 240, 240, 239, 238, 238, 237, 237, 236, - 235, 235, 234, 233, 233, 232, 231, 231, - 230, 230, 229, 228, 228, 227, 226, 226, - 225, 224, 224, 223, 222, 222, 221, 220, - 220, 219, 218, 218, 217, 216, 216, 215, - 214, 214, 213, 212, 212, 211, 210, 210, - 209, 208, 208, 207, 206, 206, 205, 204, - 203, 203, 202, 201, 201, 200, 199, 199, - 198, 197, 196, 196, 195, 194, 194, 193, - 192, 191, 191, 190, 189, 188, 188, 187, - 186, 185, 185, 184, 183, 182, 182, 181, - 180, 179, 179, 178, 177, 176, 176, 175, - 174, 173, 173, 172, 171, 170, 169, 169, - 168, 167, 166, 165, 165, 164, 163, 162, - 161, 161, 160, 159, 158, 157, 156, 156, - 155, 154, 153, 152, 151, 151, 150, 149, - 148, 147, 146, 145, 145, 144, 143, 142, - 141, 140, 139, 138, 137, 137, 136, 135, - 134, 133, 132, 131, 130, 129, 128, 127, - 126, 125, 124, 123, 122, 121, 120, 119, - 118, 117, 116, 115, 114, 113, 112, 111, - 110, 109, 108, 107, 106, 105, 104, 103, - 102, 100, 99, 98, 97, 96, 95, 94, - 92, 91, 90, 89, 88, 86, 85, 84, - 83, 81, 80, 79, 77, 76, 75, 73, - 72, 71, 69, 68, 66, 65, 63, 62, - 60, 59, 57, 55, 54, 52, 50, 48, - 47, 45, 43, 41, 39, 37, 34, 32, - 29, 27, 24, 21, 18, 14, 9, 0, - 9, 14, 18, 21, 24, 27, 29, 32, - 34, 37, 39, 41, 43, 45, 47, 48, - 50, 52, 54, 55, 57, 59, 60, 62, - 63, 65, 66, 68, 69, 71, 72, 73, - 75, 76, 77, 79, 80, 81, 83, 84, - 85, 86, 88, 89, 90, 91, 92, 94, - 95, 96, 97, 98, 99, 100, 102, 103, - 104, 105, 106, 107, 108, 109, 110, 111, - 112, 113, 114, 115, 116, 117, 118, 119, - 120, 121, 122, 123, 124, 125, 126, 127, - 128, 129, 130, 131, 132, 133, 134, 135, - 136, 137, 137, 138, 139, 140, 141, 142, - 143, 144, 145, 145, 146, 147, 148, 149, - 150, 151, 151, 152, 153, 154, 155, 156, - 156, 157, 158, 159, 160, 161, 161, 162, - 163, 164, 165, 165, 166, 167, 168, 169, - 169, 170, 171, 172, 173, 173, 174, 175, - 176, 176, 177, 178, 179, 179, 180, 181, - 182, 182, 183, 184, 185, 185, 186, 187, - 188, 188, 189, 190, 191, 191, 192, 193, - 194, 194, 195, 196, 196, 197, 198, 199, - 199, 200, 201, 201, 202, 203, 203, 204, - 205, 206, 206, 207, 208, 208, 209, 210, - 210, 211, 212, 212, 213, 214, 214, 215, - 216, 216, 217, 218, 218, 219, 220, 220, - 221, 222, 222, 223, 224, 224, 225, 226, - 226, 227, 228, 228, 229, 230, 230, 231, - 231, 232, 233, 233, 234, 235, 235, 236, - 237, 237, 238, 238, 239, 240, 240, 241, - 242, 242, 243, 243, 244, 245, 245, 246, - 247, 247, 248, 248, 249, 250, 250, 251, - 251, 252, 253, 253, 254, 254, 255, 255, + // pow 0.7 + 16384, 16339, 16294, 16249, 16204, 16158, 16113, 16068, + 16022, 15977, 15932, 15886, 15840, 15795, 15749, 15703, + 15657, 15612, 15566, 15520, 15474, 15427, 15381, 15335, + 15289, 15242, 15196, 15149, 15103, 15056, 15010, 14963, + 14916, 14869, 14822, 14775, 14728, 14681, 14634, 14587, + 14539, 14492, 14445, 14397, 14350, 14302, 14254, 14206, + 14159, 14111, 14063, 14015, 13967, 13918, 13870, 13822, + 13773, 13725, 13676, 13628, 13579, 13530, 13481, 13432, + 13383, 13334, 13285, 13236, 13187, 13137, 13088, 13038, + 12988, 12939, 12889, 12839, 12789, 12739, 12689, 12639, + 12588, 12538, 12487, 12437, 12386, 12335, 12285, 12234, + 12183, 12132, 12080, 12029, 11978, 11926, 11875, 11823, + 11771, 11719, 11667, 11615, 11563, 11511, 11458, 11406, + 11353, 11301, 11248, 11195, 11142, 11089, 11036, 10982, + 10929, 10875, 10822, 10768, 10714, 10660, 10606, 10552, + 10497, 10443, 10388, 10333, 10279, 10224, 10168, 10113, + 10058, 10002, 9947, 9891, 9835, 9779, 9723, 9666, + 9610, 9553, 9497, 9440, 9383, 9326, 9268, 9211, + 9153, 9095, 9037, 8979, 8921, 8862, 8804, 8745, + 8686, 8627, 8568, 8508, 8449, 8389, 8329, 8269, + 8208, 8148, 8087, 8026, 7965, 7903, 7842, 7780, + 7718, 7656, 7593, 7531, 7468, 7405, 7341, 7278, + 7214, 7150, 7086, 7021, 6956, 6891, 6826, 6760, + 6695, 6628, 6562, 6495, 6428, 6361, 6293, 6225, + 6157, 6089, 6020, 5950, 5881, 5811, 5741, 5670, + 5599, 5527, 5456, 5383, 5311, 5237, 5164, 5090, + 5015, 4941, 4865, 4789, 4713, 4636, 4558, 4480, + 4401, 4322, 4242, 4162, 4080, 3998, 3916, 3832, + 3748, 3663, 3577, 3490, 3402, 3314, 3224, 3133, + 3041, 2948, 2854, 2758, 2661, 2562, 2461, 2359, + 2255, 2148, 2040, 1929, 1815, 1698, 1577, 1452, + 1323, 1187, 1045, 894, 731, 550, 339, 0, + 339, 550, 731, 894, 1045, 1187, 1323, 1452, + 1577, 1698, 1815, 1929, 2040, 2148, 2255, 2359, + 2461, 2562, 2661, 2758, 2854, 2948, 3041, 3133, + 3224, 3314, 3402, 3490, 3577, 3663, 3748, 3832, + 3916, 3998, 4080, 4162, 4242, 4322, 4401, 4480, + 4558, 4636, 4713, 4789, 4865, 4941, 5015, 5090, + 5164, 5237, 5311, 5383, 5456, 5527, 5599, 5670, + 5741, 5811, 5881, 5950, 6020, 6089, 6157, 6225, + 6293, 6361, 6428, 6495, 6562, 6628, 6695, 6760, + 6826, 6891, 6956, 7021, 7086, 7150, 7214, 7278, + 7341, 7405, 7468, 7531, 7593, 7656, 7718, 7780, + 7842, 7903, 7965, 8026, 8087, 8148, 8208, 8269, + 8329, 8389, 8449, 8508, 8568, 8627, 8686, 8745, + 8804, 8862, 8921, 8979, 9037, 9095, 9153, 9211, + 9268, 9326, 9383, 9440, 9497, 9553, 9610, 9666, + 9723, 9779, 9835, 9891, 9947, 10002, 10058, 10113, + 10168, 10224, 10279, 10333, 10388, 10443, 10497, 10552, + 10606, 10660, 10714, 10768, 10822, 10875, 10929, 10982, + 11036, 11089, 11142, 11195, 11248, 11301, 11353, 11406, + 11458, 11511, 11563, 11615, 11667, 11719, 11771, 11823, + 11875, 11926, 11978, 12029, 12080, 12132, 12183, 12234, + 12285, 12335, 12386, 12437, 12487, 12538, 12588, 12639, + 12689, 12739, 12789, 12839, 12889, 12939, 12988, 13038, + 13088, 13137, 13187, 13236, 13285, 13334, 13383, 13432, + 13481, 13530, 13579, 13628, 13676, 13725, 13773, 13822, + 13870, 13918, 13967, 14015, 14063, 14111, 14159, 14206, + 14254, 14302, 14350, 14397, 14445, 14492, 14539, 14587, + 14634, 14681, 14728, 14775, 14822, 14869, 14916, 14963, + 15010, 15056, 15103, 15149, 15196, 15242, 15289, 15335, + 15381, 15427, 15474, 15520, 15566, 15612, 15657, 15703, + 15749, 15795, 15840, 15886, 15932, 15977, 16022, 16068, + 16113, 16158, 16204, 16249, 16294, 16339, 16384, 16384, }; /* clang-format on */ diff --git a/av1/encoder/corner_detect.c b/av1/encoder/corner_detect.c index a9b96a49dd41ca981c3cacbe47145bbc6c0d9676..f08ff59773618166b21a833a879c5f01e08b4c24 100644 --- a/av1/encoder/corner_detect.c +++ b/av1/encoder/corner_detect.c @@ -20,7 +20,7 @@ #include "av1/encoder/corner_detect.h" // Fast_9 wrapper -#define FAST_BARRIER 40 +#define FAST_BARRIER 20 int fast_corner_detect(unsigned char *buf, int width, int height, int stride, int *points, int max_points) { int num_points; diff --git a/av1/encoder/corner_match.c b/av1/encoder/corner_match.c index ecdd8f48f4e3723006b21fada562236d191f0bbb..99368ee656009085f217f74ec3bc9418dfe7a759 100644 --- a/av1/encoder/corner_match.c +++ b/av1/encoder/corner_match.c @@ -16,7 +16,7 @@ #include "av1/encoder/corner_match.h" -#define MATCH_SZ 15 +#define MATCH_SZ 13 #define MATCH_SZ_BY2 ((MATCH_SZ - 1) / 2) #define MATCH_SZ_SQ (MATCH_SZ * MATCH_SZ) #define SEARCH_SZ 9