Namespace selfguided filter functions BUG=aomedia:1540 Change-Id: I4f35fae9b4855d7f6ad911b852c31c69b116ab97
diff --git a/av1/common/arm/selfguided_neon.c b/av1/common/arm/selfguided_neon.c index b3a37c4..f335f9f 100644 --- a/av1/common/arm/selfguided_neon.c +++ b/av1/common/arm/selfguided_neon.c
@@ -1380,11 +1380,11 @@ return 0; } -void apply_selfguided_restoration_neon(const uint8_t *dat8, int width, - int height, int stride, int eps, - const int *xqd, uint8_t *dst8, - int dst_stride, int32_t *tmpbuf, - int bit_depth, int highbd) { +void av1_apply_selfguided_restoration_neon(const uint8_t *dat8, int width, + int height, int stride, int eps, + const int *xqd, uint8_t *dst8, + int dst_stride, int32_t *tmpbuf, + int bit_depth, int highbd) { int32_t *flt0 = tmpbuf; int32_t *flt1 = flt0 + RESTORATION_UNITPELS_MAX; assert(width * height <= RESTORATION_UNITPELS_MAX);
diff --git a/av1/common/av1_rtcd_defs.pl b/av1/common/av1_rtcd_defs.pl index f4cdfa5..14f67c8f 100644 --- a/av1/common/av1_rtcd_defs.pl +++ b/av1/common/av1_rtcd_defs.pl
@@ -347,8 +347,8 @@ # LOOP_RESTORATION functions -add_proto qw/void apply_selfguided_restoration/, "const uint8_t *dat, int width, int height, int stride, int eps, const int *xqd, uint8_t *dst, int dst_stride, int32_t *tmpbuf, int bit_depth, int highbd"; -specialize qw/apply_selfguided_restoration sse4_1 avx2 neon/; +add_proto qw/void av1_apply_selfguided_restoration/, "const uint8_t *dat, int width, int height, int stride, int eps, const int *xqd, uint8_t *dst, int dst_stride, int32_t *tmpbuf, int bit_depth, int highbd"; +specialize qw/av1_apply_selfguided_restoration sse4_1 avx2 neon/; add_proto qw/int av1_selfguided_restoration/, "const uint8_t *dgd8, int width, int height, int dgd_stride, int32_t *flt0, int32_t *flt1, int flt_stride,
diff --git a/av1/common/restoration.c b/av1/common/restoration.c index 69d898f..d8af61f 100644 --- a/av1/common/restoration.c +++ b/av1/common/restoration.c
@@ -899,11 +899,11 @@ return 0; } -void apply_selfguided_restoration_c(const uint8_t *dat8, int width, int height, - int stride, int eps, const int *xqd, - uint8_t *dst8, int dst_stride, - int32_t *tmpbuf, int bit_depth, - int highbd) { +void av1_apply_selfguided_restoration_c(const uint8_t *dat8, int width, + int height, int stride, int eps, + const int *xqd, uint8_t *dst8, + int dst_stride, int32_t *tmpbuf, + int bit_depth, int highbd) { int32_t *flt0 = tmpbuf; int32_t *flt1 = flt0 + RESTORATION_UNITPELS_MAX; assert(width * height <= RESTORATION_UNITPELS_MAX); @@ -950,9 +950,9 @@ for (int j = 0; j < stripe_width; j += procunit_width) { int w = AOMMIN(procunit_width, stripe_width - j); - apply_selfguided_restoration(src + j, w, stripe_height, src_stride, - rui->sgrproj_info.ep, rui->sgrproj_info.xqd, - dst + j, dst_stride, tmpbuf, bit_depth, 0); + av1_apply_selfguided_restoration( + src + j, w, stripe_height, src_stride, rui->sgrproj_info.ep, + rui->sgrproj_info.xqd, dst + j, dst_stride, tmpbuf, bit_depth, 0); } } @@ -984,9 +984,9 @@ int32_t *tmpbuf, int bit_depth) { for (int j = 0; j < stripe_width; j += procunit_width) { int w = AOMMIN(procunit_width, stripe_width - j); - apply_selfguided_restoration(src8 + j, w, stripe_height, src_stride, - rui->sgrproj_info.ep, rui->sgrproj_info.xqd, - dst8 + j, dst_stride, tmpbuf, bit_depth, 1); + av1_apply_selfguided_restoration( + src8 + j, w, stripe_height, src_stride, rui->sgrproj_info.ep, + rui->sgrproj_info.xqd, dst8 + j, dst_stride, tmpbuf, bit_depth, 1); } }
diff --git a/av1/common/x86/selfguided_avx2.c b/av1/common/x86/selfguided_avx2.c index 0aaf1f4..9d0f67b 100644 --- a/av1/common/x86/selfguided_avx2.c +++ b/av1/common/x86/selfguided_avx2.c
@@ -630,11 +630,11 @@ return 0; } -void apply_selfguided_restoration_avx2(const uint8_t *dat8, int width, - int height, int stride, int eps, - const int *xqd, uint8_t *dst8, - int dst_stride, int32_t *tmpbuf, - int bit_depth, int highbd) { +void av1_apply_selfguided_restoration_avx2(const uint8_t *dat8, int width, + int height, int stride, int eps, + const int *xqd, uint8_t *dst8, + int dst_stride, int32_t *tmpbuf, + int bit_depth, int highbd) { int32_t *flt0 = tmpbuf; int32_t *flt1 = flt0 + RESTORATION_UNITPELS_MAX; assert(width * height <= RESTORATION_UNITPELS_MAX);
diff --git a/av1/common/x86/selfguided_sse4.c b/av1/common/x86/selfguided_sse4.c index ea3f6d9..b21ddc4 100644 --- a/av1/common/x86/selfguided_sse4.c +++ b/av1/common/x86/selfguided_sse4.c
@@ -580,11 +580,11 @@ return 0; } -void apply_selfguided_restoration_sse4_1(const uint8_t *dat8, int width, - int height, int stride, int eps, - const int *xqd, uint8_t *dst8, - int dst_stride, int32_t *tmpbuf, - int bit_depth, int highbd) { +void av1_apply_selfguided_restoration_sse4_1(const uint8_t *dat8, int width, + int height, int stride, int eps, + const int *xqd, uint8_t *dst8, + int dst_stride, int32_t *tmpbuf, + int bit_depth, int highbd) { int32_t *flt0 = tmpbuf; int32_t *flt1 = flt0 + RESTORATION_UNITPELS_MAX; assert(width * height <= RESTORATION_UNITPELS_MAX);
diff --git a/test/selfguided_filter_test.cc b/test/selfguided_filter_test.cc index 464a58f..1eff1d8 100644 --- a/test/selfguided_filter_test.cc +++ b/test/selfguided_filter_test.cc
@@ -88,8 +88,9 @@ int h = AOMMIN(pu_height, height - k); uint8_t *input_p = input + k * stride + j; uint8_t *output_p = output + k * out_stride + j; - apply_selfguided_restoration_c(input_p, w, h, stride, eps, xqd, - output_p, out_stride, tmpbuf, 8, 0); + av1_apply_selfguided_restoration_c(input_p, w, h, stride, eps, xqd, + output_p, out_stride, tmpbuf, 8, + 0); } } aom_usec_timer_mark(&ref_timer); @@ -175,8 +176,9 @@ uint8_t *output2_p = output2 + k * out_stride + j; tst_fun_(input_p, w, h, stride, eps, xqd, output_p, out_stride, tmpbuf, 8, 0); - apply_selfguided_restoration_c(input_p, w, h, stride, eps, xqd, - output2_p, out_stride, tmpbuf, 8, 0); + av1_apply_selfguided_restoration_c(input_p, w, h, stride, eps, xqd, + output2_p, out_stride, tmpbuf, 8, + 0); } for (j = 0; j < test_h; ++j) @@ -199,18 +201,21 @@ TEST_P(AV1SelfguidedFilterTest, CorrectnessTest) { RunCorrectnessTest(); } #if HAVE_SSE4_1 -INSTANTIATE_TEST_CASE_P(SSE4_1, AV1SelfguidedFilterTest, - ::testing::Values(apply_selfguided_restoration_sse4_1)); +INSTANTIATE_TEST_CASE_P( + SSE4_1, AV1SelfguidedFilterTest, + ::testing::Values(av1_apply_selfguided_restoration_sse4_1)); #endif #if HAVE_AVX2 -INSTANTIATE_TEST_CASE_P(AVX2, AV1SelfguidedFilterTest, - ::testing::Values(apply_selfguided_restoration_avx2)); +INSTANTIATE_TEST_CASE_P( + AVX2, AV1SelfguidedFilterTest, + ::testing::Values(av1_apply_selfguided_restoration_avx2)); #endif #if HAVE_NEON -INSTANTIATE_TEST_CASE_P(NEON, AV1SelfguidedFilterTest, - ::testing::Values(apply_selfguided_restoration_neon)); +INSTANTIATE_TEST_CASE_P( + NEON, AV1SelfguidedFilterTest, + ::testing::Values(av1_apply_selfguided_restoration_neon)); #endif // Test parameter list: @@ -269,7 +274,7 @@ int h = AOMMIN(pu_height, height - k); uint16_t *input_p = input + k * stride + j; uint16_t *output_p = output + k * out_stride + j; - apply_selfguided_restoration_c( + av1_apply_selfguided_restoration_c( CONVERT_TO_BYTEPTR(input_p), w, h, stride, eps, xqd, CONVERT_TO_BYTEPTR(output_p), out_stride, tmpbuf, bit_depth, 1); } @@ -362,7 +367,7 @@ tst_fun_(CONVERT_TO_BYTEPTR(input_p), w, h, stride, eps, xqd, CONVERT_TO_BYTEPTR(output_p), out_stride, tmpbuf, bit_depth, 1); - apply_selfguided_restoration_c( + av1_apply_selfguided_restoration_c( CONVERT_TO_BYTEPTR(input_p), w, h, stride, eps, xqd, CONVERT_TO_BYTEPTR(output2_p), out_stride, tmpbuf, bit_depth, 1); } @@ -389,22 +394,23 @@ const int highbd_params_sse4_1[] = { 8, 10, 12 }; INSTANTIATE_TEST_CASE_P( SSE4_1, AV1HighbdSelfguidedFilterTest, - ::testing::Combine(::testing::Values(apply_selfguided_restoration_sse4_1), - ::testing::ValuesIn(highbd_params_sse4_1))); + ::testing::Combine( + ::testing::Values(av1_apply_selfguided_restoration_sse4_1), + ::testing::ValuesIn(highbd_params_sse4_1))); #endif #if HAVE_AVX2 const int highbd_params_avx2[] = { 8, 10, 12 }; INSTANTIATE_TEST_CASE_P( AVX2, AV1HighbdSelfguidedFilterTest, - ::testing::Combine(::testing::Values(apply_selfguided_restoration_avx2), + ::testing::Combine(::testing::Values(av1_apply_selfguided_restoration_avx2), ::testing::ValuesIn(highbd_params_avx2))); #endif #if HAVE_NEON const int highbd_params_neon[] = { 8, 10, 12 }; INSTANTIATE_TEST_CASE_P( NEON, AV1HighbdSelfguidedFilterTest, - ::testing::Combine(::testing::Values(apply_selfguided_restoration_neon), + ::testing::Combine(::testing::Values(av1_apply_selfguided_restoration_neon), ::testing::ValuesIn(highbd_params_neon))); #endif } // namespace