Rename compute_stats rename compute_stats related function. Change-Id: If6b8e3796a8ee04c294ba3d1ec0db52a18321766
diff --git a/av1/common/av1_rtcd_defs.pl b/av1/common/av1_rtcd_defs.pl index c1eb1d0..0bff779 100755 --- a/av1/common/av1_rtcd_defs.pl +++ b/av1/common/av1_rtcd_defs.pl
@@ -251,8 +251,8 @@ add_proto qw/uint32_t av1_get_crc32c_value/, "void *crc_calculator, uint8_t *p, int length"; specialize qw/av1_get_crc32c_value sse4_2/; - add_proto qw/void compute_stats/, "int wiener_win, const uint8_t *dgd8, const uint8_t *src8, int h_start, int h_end, int v_start, int v_end, int dgd_stride, int src_stride, double *M, double *H"; - specialize qw/compute_stats sse4_1 avx2/; + add_proto qw/void av1_compute_stats/, "int wiener_win, const uint8_t *dgd8, const uint8_t *src8, int h_start, int h_end, int v_start, int v_end, int dgd_stride, int src_stride, double *M, double *H"; + specialize qw/av1_compute_stats sse4_1 avx2/; } # end encoder functions
diff --git a/av1/encoder/pickrst.c b/av1/encoder/pickrst.c index 3b4831b..86bfe04 100644 --- a/av1/encoder/pickrst.c +++ b/av1/encoder/pickrst.c
@@ -588,9 +588,9 @@ if (cost_sgr < cost_none) rsc->sgrproj = rusi->sgrproj; } -void compute_stats_c(int wiener_win, const uint8_t *dgd, const uint8_t *src, - int h_start, int h_end, int v_start, int v_end, - int dgd_stride, int src_stride, double *M, double *H) { +void av1_compute_stats_c(int wiener_win, const uint8_t *dgd, const uint8_t *src, + int h_start, int h_end, int v_start, int v_end, + int dgd_stride, int src_stride, double *M, double *H) { int i, j, k, l; double Y[WIENER_WIN2]; const int wiener_win2 = wiener_win * wiener_win; @@ -1059,9 +1059,9 @@ limits->h_start, limits->h_end, limits->v_start, limits->v_end, rsc->dgd_stride, rsc->src_stride, M, H); } else { - compute_stats(wiener_win, rsc->dgd_buffer, rsc->src_buffer, limits->h_start, - limits->h_end, limits->v_start, limits->v_end, - rsc->dgd_stride, rsc->src_stride, M, H); + av1_compute_stats(wiener_win, rsc->dgd_buffer, rsc->src_buffer, + limits->h_start, limits->h_end, limits->v_start, + limits->v_end, rsc->dgd_stride, rsc->src_stride, M, H); } const MACROBLOCK *const x = rsc->x;
diff --git a/av1/encoder/x86/pickrst_avx2.c b/av1/encoder/x86/pickrst_avx2.c index cd970c0..31a063b 100644 --- a/av1/encoder/x86/pickrst_avx2.c +++ b/av1/encoder/x86/pickrst_avx2.c
@@ -212,9 +212,10 @@ } } -void compute_stats_avx2(int wiener_win, const uint8_t *dgd, const uint8_t *src, - int h_start, int h_end, int v_start, int v_end, - int dgd_stride, int src_stride, double *M, double *H) { +void av1_compute_stats_avx2(int wiener_win, const uint8_t *dgd, + const uint8_t *src, int h_start, int h_end, + int v_start, int v_end, int dgd_stride, + int src_stride, double *M, double *H) { if (wiener_win == WIENER_WIN) { compute_stats_win7_opt_avx2(dgd, src, h_start, h_end, v_start, v_end, dgd_stride, src_stride, M, H); @@ -222,7 +223,7 @@ compute_stats_win5_opt_avx2(dgd, src, h_start, h_end, v_start, v_end, dgd_stride, src_stride, M, H); } else { - compute_stats_c(wiener_win, dgd, src, h_start, h_end, v_start, v_end, - dgd_stride, src_stride, M, H); + av1_compute_stats_c(wiener_win, dgd, src, h_start, h_end, v_start, v_end, + dgd_stride, src_stride, M, H); } }
diff --git a/av1/encoder/x86/pickrst_sse4.c b/av1/encoder/x86/pickrst_sse4.c index 383aeef..4f6cde0 100644 --- a/av1/encoder/x86/pickrst_sse4.c +++ b/av1/encoder/x86/pickrst_sse4.c
@@ -215,10 +215,10 @@ } } } -void compute_stats_sse4_1(int wiener_win, const uint8_t *dgd, - const uint8_t *src, int h_start, int h_end, - int v_start, int v_end, int dgd_stride, - int src_stride, double *M, double *H) { +void av1_compute_stats_sse4_1(int wiener_win, const uint8_t *dgd, + const uint8_t *src, int h_start, int h_end, + int v_start, int v_end, int dgd_stride, + int src_stride, double *M, double *H) { if (wiener_win == WIENER_WIN) { compute_stats_win7_opt_sse4_1(dgd, src, h_start, h_end, v_start, v_end, dgd_stride, src_stride, M, H); @@ -226,7 +226,7 @@ compute_stats_win5_opt_sse4_1(dgd, src, h_start, h_end, v_start, v_end, dgd_stride, src_stride, M, H); } else { - compute_stats_c(wiener_win, dgd, src, h_start, h_end, v_start, v_end, - dgd_stride, src_stride, M, H); + av1_compute_stats_c(wiener_win, dgd, src, h_start, h_end, v_start, v_end, + dgd_stride, src_stride, M, H); } }
diff --git a/test/wiener_test.cc b/test/wiener_test.cc index 139271f..36fd3bf 100644 --- a/test/wiener_test.cc +++ b/test/wiener_test.cc
@@ -157,8 +157,8 @@ compute_stats_win5_opt_c(dgd, src, h_start, h_end, v_start, v_end, dgd_stride, src_stride, M, H); } else { - compute_stats_c(wiener_win, dgd, src, h_start, h_end, v_start, v_end, - dgd_stride, src_stride, M, H); + av1_compute_stats_c(wiener_win, dgd, src, h_start, h_end, v_start, v_end, + dgd_stride, src_stride, M, H); } } @@ -217,8 +217,8 @@ aom_usec_timer timer; aom_usec_timer_start(&timer); for (int i = 0; i < run_times; ++i) { - compute_stats_c(wiener_win, dgd, src, h_start, h_end, v_start, v_end, - dgd_stride, src_stride, M_ref, H_ref); + av1_compute_stats_c(wiener_win, dgd, src, h_start, h_end, v_start, v_end, + dgd_stride, src_stride, M_ref, H_ref); } aom_usec_timer_mark(&timer); const double time1 = static_cast<double>(aom_usec_timer_elapsed(&timer)); @@ -280,8 +280,8 @@ uint8_t *dgd = dgd_buf + wiener_halfwin * MAX_DATA_BLOCK + wiener_halfwin; uint8_t *src = src_buf; - compute_stats_c(wiener_win, dgd, src, h_start, h_end, v_start, v_end, - dgd_stride, src_stride, M_ref, H_ref); + av1_compute_stats_c(wiener_win, dgd, src, h_start, h_end, v_start, v_end, + dgd_stride, src_stride, M_ref, H_ref); target_func_(wiener_win, dgd, src, h_start, h_end, v_start, v_end, dgd_stride, src_stride, M_test, H_test); @@ -327,13 +327,13 @@ #if HAVE_SSE4_1 INSTANTIATE_TEST_CASE_P(SSE4_1, WienerTest, - ::testing::Values(compute_stats_sse4_1)); + ::testing::Values(av1_compute_stats_sse4_1)); #endif // HAVE_SSE4_1 #if HAVE_AVX2 INSTANTIATE_TEST_CASE_P(AVX2, WienerTest, - ::testing::Values(compute_stats_avx2)); + ::testing::Values(av1_compute_stats_avx2)); #endif // HAVE_AVX2 } // namespace