From 60caf2c378d4fa40395f38dd5a6b2861684b0e80 Mon Sep 17 00:00:00 2001 From: Marko Viitanen Date: Wed, 21 Jul 2021 13:44:25 +0300 Subject: [PATCH] [mts] fix 32x32 idst/idct --- src/strategies/avx2/dct-avx2.c | 4 ++-- tests/mts_tests.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/strategies/avx2/dct-avx2.c b/src/strategies/avx2/dct-avx2.c index c465641a..2095946b 100644 --- a/src/strategies/avx2/dct-avx2.c +++ b/src/strategies/avx2/dct-avx2.c @@ -1528,8 +1528,8 @@ static void mts_idct_32x32_avx2(const int16_t* input, int16_t* output, tr_type_t const int skip_width = (type_hor != DCT2) ? 16 : 0; const int skip_height = (type_ver != DCT2) ? 16 : 0; - mul_clip_matrix_32x32_mts_avx2(tdct, input, tmp, shift_1st, skip_width, skip_height); - mul_clip_matrix_32x32_mts_avx2(tmp, dct, output, shift_2nd, 0, skip_width); + mul_clip_matrix_32x32_mts_avx2(tdct, input, tmp, shift_1st, skip_height,0); + mul_clip_matrix_32x32_mts_avx2(tmp, dct, output, shift_2nd, 0, 0); } typedef void tr_func(const int16_t*, int16_t*, tr_type_t , tr_type_t , uint8_t); diff --git a/tests/mts_tests.c b/tests/mts_tests.c index ac68055a..e350c090 100644 --- a/tests/mts_tests.c +++ b/tests/mts_tests.c @@ -153,7 +153,7 @@ TEST dct(void) for (int i = 0; i < LCU_WIDTH * LCU_WIDTH; ++i) { ASSERT_EQm(testname, test_result[i], dct_result[trafo][blocksize][i]); } - fprintf(stderr, "PASS: %s\r\n", testname); + //fprintf(stderr, "PASS: %s\r\n", testname); } } @@ -178,7 +178,7 @@ TEST idct(void) for (int i = 0; i < LCU_WIDTH * LCU_WIDTH; ++i) { ASSERT_EQm(testname, test_result[i], idct_result[trafo][blocksize][i]); } - fprintf(stderr, "PASS: %s\r\n", testname); + //fprintf(stderr, "PASS: %s\r\n", testname); } } @@ -207,12 +207,12 @@ SUITE(mts_tests) // This allows for selecting a subset of tests with -t parameter. if (strcmp(strategy->type, "mts_dct") == 0) { - fprintf(stderr, "Test: %s\r\n", strategy->strategy_name); + //fprintf(stderr, "Test: %s\r\n", strategy->strategy_name); RUN_TEST(dct); } else if (strcmp(strategy->type, "mts_idct") == 0) { - fprintf(stderr, "Test: %s\r\n", strategy->strategy_name); + //fprintf(stderr, "Test: %s\r\n", strategy->strategy_name); RUN_TEST(idct); } }