diff --git a/build/kvazaar_tests/kvazaar_tests.vcxproj b/build/kvazaar_tests/kvazaar_tests.vcxproj index b2904ed9..9539c123 100644 --- a/build/kvazaar_tests/kvazaar_tests.vcxproj +++ b/build/kvazaar_tests/kvazaar_tests.vcxproj @@ -98,7 +98,7 @@ - + diff --git a/build/kvazaar_tests/kvazaar_tests.vcxproj.filters b/build/kvazaar_tests/kvazaar_tests.vcxproj.filters index 7a560fae..27c049ab 100644 --- a/build/kvazaar_tests/kvazaar_tests.vcxproj.filters +++ b/build/kvazaar_tests/kvazaar_tests.vcxproj.filters @@ -42,7 +42,7 @@ Source Files - + Source Files diff --git a/src/strategies/avx2/picture-avx2.c b/src/strategies/avx2/picture-avx2.c index fbd0c752..412a7a20 100644 --- a/src/strategies/avx2/picture-avx2.c +++ b/src/strategies/avx2/picture-avx2.c @@ -932,12 +932,6 @@ static void inter_recon_bipred_avx2(const int hi_prec_luma_rec0, temp_epi8 = _mm256_packus_epi16(temp_y_epi16, temp_y_epi16); lcu->rec.y[(y_in_lcu)* LCU_WIDTH + x_in_lcu] = _mm256_extract_epi32(temp_epi8, 0); - /* - lcu->rec.y[(y_in_lcu)* LCU_WIDTH + x_in_lcu + 0] = _mm256_extract_epi8(temp_epi8, 0); - lcu->rec.y[(y_in_lcu)* LCU_WIDTH + x_in_lcu + 1] = _mm256_extract_epi8(temp_epi8, 1); - lcu->rec.y[(y_in_lcu)* LCU_WIDTH + x_in_lcu + 2] = _mm256_extract_epi8(temp_epi8, 2); - lcu->rec.y[(y_in_lcu)* LCU_WIDTH + x_in_lcu + 3] = _mm256_extract_epi8(temp_epi8, 3); - */ break; diff --git a/tests/bipred_generic_tests.c b/tests/inter_recon_bipred_tests.c similarity index 80% rename from tests/bipred_generic_tests.c rename to tests/inter_recon_bipred_tests.c index f12bbedf..a9e1515c 100644 --- a/tests/bipred_generic_tests.c +++ b/tests/inter_recon_bipred_tests.c @@ -89,11 +89,11 @@ static void setup() int shift = 15 - KVZ_BIT_DEPTH; int offset = 1 << (shift - 1); - hi_prec_luma_rec0 = mv_param[0][0] & 3 || mv_param[0][1] & 3; - hi_prec_luma_rec1 = mv_param[1][0] & 3 || mv_param[1][1] & 3; + hi_prec_luma_rec0 = 0; //mv_param[0][0] & 3 || mv_param[0][1] & 3; + hi_prec_luma_rec1 = 0; //mv_param[1][0] & 3 || mv_param[1][1] & 3; - hi_prec_chroma_rec0 = mv_param[0][0] & 7 || mv_param[0][1] & 7; - hi_prec_chroma_rec1 = mv_param[1][0] & 7 || mv_param[1][1] & 7; + hi_prec_chroma_rec0 = 0; //mv_param[0][0] & 7 || mv_param[0][1] & 7; + hi_prec_chroma_rec1 = 0; //mv_param[1][0] & 7 || mv_param[1][1] & 7; if (hi_prec_chroma_rec0) high_precision_rec0 = kvz_hi_prec_buf_t_alloc(LCU_WIDTH*LCU_WIDTH); if (hi_prec_chroma_rec1) high_precision_rec1 = kvz_hi_prec_buf_t_alloc(LCU_WIDTH*LCU_WIDTH); @@ -130,7 +130,7 @@ static void setup() } -TEST test_inter_recon_bipred_generic() +TEST test_inter_recon_bipred() { memset(result.rec.y, 0, sizeof(kvz_pixel) * 64 * 64); @@ -142,47 +142,9 @@ TEST test_inter_recon_bipred_generic() memcpy(result.rec.u, lcu1.rec.u, sizeof(kvz_pixel) * 32 * 32); memcpy(result.rec.v, lcu1.rec.v, sizeof(kvz_pixel) * 32 * 32); - - for (temp_y = 0; temp_y < height; ++temp_y) { - int y_in_lcu = ((ypos + temp_y) & ((LCU_WIDTH)-1)); - for (temp_x = 0; temp_x < width; ++temp_x) { - int x_in_lcu = ((xpos + temp_x) & ((LCU_WIDTH)-1)); - printf("%d ", (expected_test_result.rec.y[y_in_lcu * LCU_WIDTH + x_in_lcu])); - } - } - printf("\n"); - /* - for (temp_y = 0; temp_y < height; ++temp_y) { - int y_in_lcu = (((ypos >> 1) + temp_y) & (LCU_WIDTH_C - 1)); - for (temp_x = 0; temp_x < width >> 1; ++temp_x) { - int x_in_lcu = ((xpos + temp_x) & ((LCU_WIDTH_C)-1)); - printf("%d ", (expected_test_result.rec.u[y_in_lcu * LCU_WIDTH_C + x_in_lcu])); - } - } - printf("\n");*/ - kvz_inter_recon_bipred_generic(hi_prec_luma_rec0, hi_prec_luma_rec1, hi_prec_chroma_rec0, hi_prec_chroma_rec1, width, height, xpos, ypos, high_precision_rec0, high_precision_rec1, &result, temp_lcu_y, temp_lcu_u, temp_lcu_v); - /* - for (temp_y = 0; temp_y < height; ++temp_y) { - int y_in_lcu = (((ypos >> 1) + temp_y) & (LCU_WIDTH_C - 1)); - for (temp_x = 0; temp_x < width >> 1; ++temp_x) { - int x_in_lcu = ((xpos + temp_x) & ((LCU_WIDTH_C)-1)); - printf("%d ", (result.rec.u[y_in_lcu * LCU_WIDTH_C + x_in_lcu])); - } - } - printf("\n");*/ - - for (temp_y = 0; temp_y < height; ++temp_y) { - int y_in_lcu = ((ypos + temp_y) & ((LCU_WIDTH)-1)); - for (temp_x = 0; temp_x < width; ++temp_x) { - int x_in_lcu = ((xpos + temp_x) & ((LCU_WIDTH)-1)); - printf("%d ", (result.rec.y[y_in_lcu * LCU_WIDTH + x_in_lcu])); - } - } - printf("\n"); - for (temp_y = 0; temp_y < height; ++temp_y) { int y_in_lcu = ((ypos + temp_y) & ((LCU_WIDTH)-1)); for (temp_x = 0; temp_x < width; ++temp_x) { @@ -203,7 +165,7 @@ TEST test_inter_recon_bipred_generic() PASS(); } -SUITE(bipred_generic_tests) +SUITE(inter_recon_bipred_tests) { setup(); @@ -213,6 +175,6 @@ SUITE(bipred_generic_tests) } kvz_inter_recon_bipred_generic = strategies.strategies[i].fptr; - RUN_TEST(test_inter_recon_bipred_generic); + RUN_TEST(test_inter_recon_bipred); } } diff --git a/tests/tests_main.c b/tests/tests_main.c index c54fe241..c6c94b6b 100644 --- a/tests/tests_main.c +++ b/tests/tests_main.c @@ -32,7 +32,7 @@ extern SUITE(dct_tests); extern SUITE(coeff_sum_tests); extern SUITE(mv_cand_tests); -extern SUITE(bipred_generic_tests); +extern SUITE(inter_recon_bipred_tests); int main(int argc, char **argv) { @@ -58,7 +58,7 @@ int main(int argc, char **argv) RUN_SUITE(mv_cand_tests); - //RUN_SUITE(bipred_generic_tests); + RUN_SUITE(inter_recon_bipred_tests); GREATEST_MAIN_END(); }