From 4a42b5cbc490dd2f74e951f82312557ab1ca45d5 Mon Sep 17 00:00:00 2001 From: Marko Viitanen Date: Mon, 8 Nov 2021 10:11:17 +0200 Subject: [PATCH] [cleanup] Remove HMVP debug code and extra arrays in intra coding --- src/inter.c | 12 --------- src/strategies/avx2/intra-avx2.c | 35 +------------------------- src/strategies/generic/intra-generic.c | 35 +------------------------- 3 files changed, 2 insertions(+), 80 deletions(-) diff --git a/src/inter.c b/src/inter.c index 24e2bfd0..4d260622 100644 --- a/src/inter.c +++ b/src/inter.c @@ -1445,18 +1445,6 @@ void kvz_hmvp_add_mv(const encoder_state_t* const state, uint32_t pic_x, uint32_ if(add_row && state->frame->hmvp_size[ctu_row] < MAX_NUM_HMVP_CANDS) { state->frame->hmvp_size[ctu_row]++; } - - static FILE* lut = NULL; - if (lut == NULL) lut = fopen("uvg_lut.txt", "w"); - static int val = 0; - - fprintf(lut, "%d: (%d,%d) Block (%d,%d) -> %d,%d\n", val++, pic_x, pic_y, block_width, block_height, cu->inter.mv[0][0]*4, cu->inter.mv[0][1]*4); - - for (int i = 0; i < state->frame->hmvp_size[ctu_row]; i++) - { - fprintf(lut, "(%d,%d), ", state->frame->hmvp_lut[ctu_row_mul_five + i].inter.mv[0][0]*4, state->frame->hmvp_lut[ctu_row_mul_five + i].inter.mv[0][1]*4); - } - fprintf(lut, "\n"); } } } diff --git a/src/strategies/avx2/intra-avx2.c b/src/strategies/avx2/intra-avx2.c index afe30ac5..bc9c4455 100644 --- a/src/strategies/avx2/intra-avx2.c +++ b/src/strategies/avx2/intra-avx2.c @@ -82,40 +82,7 @@ static void kvz_angular_pred_avx2( static const int16_t modedisp2sampledisp[32] = { 0, 1, 2, 3, 4, 6, 8, 10, 12, 14, 16, 18, 20, 23, 26, 29, 32, 35, 39, 45, 51, 57, 64, 73, 86, 102, 128, 171, 256, 341, 512, 1024 }; static const int16_t modedisp2invsampledisp[32] = { 0, 16384, 8192, 5461, 4096, 2731, 2048, 1638, 1365, 1170, 1024, 910, 819, 712, 630, 565, 512, 468, 420, 364, 321, 287, 256, 224, 191, 161, 128, 96, 64, 48, 32, 16 }; // (512 * 32) / sampledisp static const int32_t pre_scale[] = { 8, 7, 6, 5, 5, 4, 4, 4, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 0, 0, 0, -1, -1, -2, -3 }; - static const int16_t intraGaussFilter[32][4] = { - { 16, 32, 16, 0 }, - { 15, 29, 17, 3 }, - { 15, 29, 17, 3 }, - { 14, 29, 18, 3 }, - { 13, 29, 18, 4 }, - { 13, 28, 19, 4 }, - { 13, 28, 19, 4 }, - { 12, 28, 20, 4 }, - { 11, 28, 20, 5 }, - { 11, 27, 21, 5 }, - { 10, 27, 22, 5 }, - { 9, 27, 22, 6 }, - { 9, 26, 23, 6 }, - { 9, 26, 23, 6 }, - { 8, 25, 24, 7 }, - { 8, 25, 24, 7 }, - { 8, 24, 24, 8 }, - { 7, 24, 25, 8 }, - { 7, 24, 25, 8 }, - { 6, 23, 26, 9 }, - { 6, 23, 26, 9 }, - { 6, 22, 27, 9 }, - { 5, 22, 27, 10 }, - { 5, 21, 27, 11 }, - { 5, 20, 28, 11 }, - { 4, 20, 28, 12 }, - { 4, 19, 28, 13 }, - { 4, 19, 28, 13 }, - { 4, 18, 29, 13 }, - { 3, 18, 29, 14 }, - { 3, 17, 29, 15 }, - { 3, 17, 29, 15 } - }; + static const int16_t cubic_filter[32][4] = { { 0, 64, 0, 0 }, diff --git a/src/strategies/generic/intra-generic.c b/src/strategies/generic/intra-generic.c index 89facdcf..d8e85ca2 100644 --- a/src/strategies/generic/intra-generic.c +++ b/src/strategies/generic/intra-generic.c @@ -51,40 +51,7 @@ static void kvz_angular_pred_generic( static const int16_t modedisp2sampledisp[32] = { 0, 1, 2, 3, 4, 6, 8, 10, 12, 14, 16, 18, 20, 23, 26, 29, 32, 35, 39, 45, 51, 57, 64, 73, 86, 102, 128, 171, 256, 341, 512, 1024 }; static const int16_t modedisp2invsampledisp[32] = { 0, 16384, 8192, 5461, 4096, 2731, 2048, 1638, 1365, 1170, 1024, 910, 819, 712, 630, 565, 512, 468, 420, 364, 321, 287, 256, 224, 191, 161, 128, 96, 64, 48, 32, 16 }; // (512 * 32) / sampledisp static const int32_t pre_scale[] = { 8, 7, 6, 5, 5, 4, 4, 4, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 0, 0, 0, -1, -1, -2, -3 }; - static const int16_t intraGaussFilter[32][4] = { - { 16, 32, 16, 0 }, - { 15, 29, 17, 3 }, - { 15, 29, 17, 3 }, - { 14, 29, 18, 3 }, - { 13, 29, 18, 4 }, - { 13, 28, 19, 4 }, - { 13, 28, 19, 4 }, - { 12, 28, 20, 4 }, - { 11, 28, 20, 5 }, - { 11, 27, 21, 5 }, - { 10, 27, 22, 5 }, - { 9, 27, 22, 6 }, - { 9, 26, 23, 6 }, - { 9, 26, 23, 6 }, - { 8, 25, 24, 7 }, - { 8, 25, 24, 7 }, - { 8, 24, 24, 8 }, - { 7, 24, 25, 8 }, - { 7, 24, 25, 8 }, - { 6, 23, 26, 9 }, - { 6, 23, 26, 9 }, - { 6, 22, 27, 9 }, - { 5, 22, 27, 10 }, - { 5, 21, 27, 11 }, - { 5, 20, 28, 11 }, - { 4, 20, 28, 12 }, - { 4, 19, 28, 13 }, - { 4, 19, 28, 13 }, - { 4, 18, 29, 13 }, - { 3, 18, 29, 14 }, - { 3, 17, 29, 15 }, - { 3, 17, 29, 15 } - }; + static const int16_t cubic_filter[32][4] = { { 0, 64, 0, 0 },