remove aom_pixel_scale calls to this function were deleted in: d2e93b2774 RT: refactor av1_block_yrd function Bug: aomedia:3416 Change-Id: I4247c28dcef0be850ed0e34d0194d1b05a436b8d
diff --git a/aom_dsp/aom_dsp_rtcd_defs.pl b/aom_dsp/aom_dsp_rtcd_defs.pl index c8bf778..dae52e6 100755 --- a/aom_dsp/aom_dsp_rtcd_defs.pl +++ b/aom_dsp/aom_dsp_rtcd_defs.pl
@@ -1262,9 +1262,6 @@ add_proto qw/void aom_hadamard_lp_8x8_dual/, "const int16_t *src_diff, ptrdiff_t src_stride, int16_t *coeff"; specialize qw/aom_hadamard_lp_8x8_dual sse2 avx2 neon/; - add_proto qw/void aom_pixel_scale/, "const int16_t *src_diff, ptrdiff_t src_stride, int16_t *coeff, int log_scale, int h8, int w8"; - specialize qw/aom_pixel_scale sse2/; - if (aom_config("CONFIG_AV1_HIGHBITDEPTH") eq "yes") { add_proto qw/void aom_highbd_hadamard_8x8/, "const int16_t *src_diff, ptrdiff_t src_stride, tran_low_t *coeff"; specialize qw/aom_highbd_hadamard_8x8 avx2/;
diff --git a/aom_dsp/avg.c b/aom_dsp/avg.c index ceb1026..7043050 100644 --- a/aom_dsp/avg.c +++ b/aom_dsp/avg.c
@@ -99,14 +99,6 @@ } #endif // CONFIG_AV1_HIGHBITDEPTH -void aom_pixel_scale_c(const int16_t *src_diff, ptrdiff_t src_stride, - int16_t *coeff, int log_scale, int h8, int w8) { - for (int idy = 0; idy < h8 * 8; ++idy) - for (int idx = 0; idx < w8 * 8; ++idx) - coeff[idy * (h8 * 8) + idx] = src_diff[idy * src_stride + idx] - << log_scale; -} - static void hadamard_col4(const int16_t *src_diff, ptrdiff_t src_stride, int16_t *coeff) { int16_t b0 = (src_diff[0 * src_stride] + src_diff[1 * src_stride]) >> 1;
diff --git a/aom_dsp/x86/avg_intrin_sse2.c b/aom_dsp/x86/avg_intrin_sse2.c index 71e7028..2d94f0e 100644 --- a/aom_dsp/x86/avg_intrin_sse2.c +++ b/aom_dsp/x86/avg_intrin_sse2.c
@@ -344,56 +344,6 @@ hadamard_8x8_sse2(src_diff, src_stride, coeff, 1); } -void aom_pixel_scale_sse2(const int16_t *src_diff, ptrdiff_t src_stride, - int16_t *coeff, int log_scale, int h8, int w8) { - __m128i src[8]; - const int16_t *org_src_diff = src_diff; - int16_t *org_coeff = coeff; - int coeff_stride = w8 << 3; - for (int idy = 0; idy < h8; ++idy) { - for (int idx = 0; idx < w8; ++idx) { - src_diff = org_src_diff + (idx << 3); - coeff = org_coeff + (idx << 3); - - src[0] = _mm_load_si128((const __m128i *)src_diff); - src[1] = _mm_load_si128((const __m128i *)(src_diff += src_stride)); - src[2] = _mm_load_si128((const __m128i *)(src_diff += src_stride)); - src[3] = _mm_load_si128((const __m128i *)(src_diff += src_stride)); - src[4] = _mm_load_si128((const __m128i *)(src_diff += src_stride)); - src[5] = _mm_load_si128((const __m128i *)(src_diff += src_stride)); - src[6] = _mm_load_si128((const __m128i *)(src_diff += src_stride)); - src[7] = _mm_load_si128((const __m128i *)(src_diff + src_stride)); - - src[0] = _mm_slli_epi16(src[0], log_scale); - src[1] = _mm_slli_epi16(src[1], log_scale); - src[2] = _mm_slli_epi16(src[2], log_scale); - src[3] = _mm_slli_epi16(src[3], log_scale); - src[4] = _mm_slli_epi16(src[4], log_scale); - src[5] = _mm_slli_epi16(src[5], log_scale); - src[6] = _mm_slli_epi16(src[6], log_scale); - src[7] = _mm_slli_epi16(src[7], log_scale); - - _mm_store_si128((__m128i *)coeff, src[0]); - coeff += coeff_stride; - _mm_store_si128((__m128i *)coeff, src[1]); - coeff += coeff_stride; - _mm_store_si128((__m128i *)coeff, src[2]); - coeff += coeff_stride; - _mm_store_si128((__m128i *)coeff, src[3]); - coeff += coeff_stride; - _mm_store_si128((__m128i *)coeff, src[4]); - coeff += coeff_stride; - _mm_store_si128((__m128i *)coeff, src[5]); - coeff += coeff_stride; - _mm_store_si128((__m128i *)coeff, src[6]); - coeff += coeff_stride; - _mm_store_si128((__m128i *)coeff, src[7]); - } - org_src_diff += (src_stride << 3); - org_coeff += (coeff_stride << 3); - } -} - static INLINE void hadamard_lp_8x8_sse2(const int16_t *src_diff, ptrdiff_t src_stride, int16_t *coeff) { __m128i src[8];