Index: source/libvpx/vp9/common/x86/vp9_asm_stubs.c |
=================================================================== |
--- source/libvpx/vp9/common/x86/vp9_asm_stubs.c (revision 292072) |
+++ source/libvpx/vp9/common/x86/vp9_asm_stubs.c (working copy) |
@@ -139,25 +139,172 @@ |
filter_x, x_step_q4, filter_y, y_step_q4, w, h); \ |
} \ |
} |
-#if HAVE_AVX2 |
+ |
+#if CONFIG_VP9_HIGHBITDEPTH |
+ |
+typedef void high_filter8_1dfunction ( |
+ const uint16_t *src_ptr, |
+ const ptrdiff_t src_pitch, |
+ uint16_t *output_ptr, |
+ ptrdiff_t out_pitch, |
+ unsigned int output_height, |
+ const int16_t *filter, |
+ int bd |
+); |
+ |
+#define HIGH_FUN_CONV_1D(name, step_q4, filter, dir, src_start, avg, opt) \ |
+ void vp9_high_convolve8_##name##_##opt(const uint8_t *src8, \ |
+ ptrdiff_t src_stride, \ |
+ uint8_t *dst8, ptrdiff_t dst_stride, \ |
+ const int16_t *filter_x, \ |
+ int x_step_q4, \ |
+ const int16_t *filter_y, \ |
+ int y_step_q4, \ |
+ int w, int h, int bd) { \ |
+ if (step_q4 == 16 && filter[3] != 128) { \ |
+ uint16_t *src = CONVERT_TO_SHORTPTR(src8); \ |
+ uint16_t *dst = CONVERT_TO_SHORTPTR(dst8); \ |
+ if (filter[0] || filter[1] || filter[2]) { \ |
+ while (w >= 16) { \ |
+ vp9_high_filter_block1d16_##dir##8_##avg##opt(src_start, \ |
+ src_stride, \ |
+ dst, \ |
+ dst_stride, \ |
+ h, \ |
+ filter, \ |
+ bd); \ |
+ src += 16; \ |
+ dst += 16; \ |
+ w -= 16; \ |
+ } \ |
+ while (w >= 8) { \ |
+ vp9_high_filter_block1d8_##dir##8_##avg##opt(src_start, \ |
+ src_stride, \ |
+ dst, \ |
+ dst_stride, \ |
+ h, \ |
+ filter, \ |
+ bd); \ |
+ src += 8; \ |
+ dst += 8; \ |
+ w -= 8; \ |
+ } \ |
+ while (w >= 4) { \ |
+ vp9_high_filter_block1d4_##dir##8_##avg##opt(src_start, \ |
+ src_stride, \ |
+ dst, \ |
+ dst_stride, \ |
+ h, \ |
+ filter, \ |
+ bd); \ |
+ src += 4; \ |
+ dst += 4; \ |
+ w -= 4; \ |
+ } \ |
+ } else { \ |
+ while (w >= 16) { \ |
+ vp9_high_filter_block1d16_##dir##2_##avg##opt(src, \ |
+ src_stride, \ |
+ dst, \ |
+ dst_stride, \ |
+ h, \ |
+ filter, \ |
+ bd); \ |
+ src += 16; \ |
+ dst += 16; \ |
+ w -= 16; \ |
+ } \ |
+ while (w >= 8) { \ |
+ vp9_high_filter_block1d8_##dir##2_##avg##opt(src, \ |
+ src_stride, \ |
+ dst, \ |
+ dst_stride, \ |
+ h, \ |
+ filter, \ |
+ bd); \ |
+ src += 8; \ |
+ dst += 8; \ |
+ w -= 8; \ |
+ } \ |
+ while (w >= 4) { \ |
+ vp9_high_filter_block1d4_##dir##2_##avg##opt(src, \ |
+ src_stride, \ |
+ dst, \ |
+ dst_stride, \ |
+ h, \ |
+ filter, \ |
+ bd); \ |
+ src += 4; \ |
+ dst += 4; \ |
+ w -= 4; \ |
+ } \ |
+ } \ |
+ } \ |
+ if (w) { \ |
+ vp9_high_convolve8_##name##_c(src8, src_stride, dst8, dst_stride, \ |
+ filter_x, x_step_q4, filter_y, y_step_q4, \ |
+ w, h, bd); \ |
+ } \ |
+} |
+ |
+#define HIGH_FUN_CONV_2D(avg, opt) \ |
+void vp9_high_convolve8_##avg##opt(const uint8_t *src, ptrdiff_t src_stride, \ |
+ uint8_t *dst, ptrdiff_t dst_stride, \ |
+ const int16_t *filter_x, int x_step_q4, \ |
+ const int16_t *filter_y, int y_step_q4, \ |
+ int w, int h, int bd) { \ |
+ assert(w <= 64); \ |
+ assert(h <= 64); \ |
+ if (x_step_q4 == 16 && y_step_q4 == 16) { \ |
+ if (filter_x[0] || filter_x[1] || filter_x[2] || filter_x[3] == 128 || \ |
+ filter_y[0] || filter_y[1] || filter_y[2] || filter_y[3] == 128) { \ |
+ DECLARE_ALIGNED_ARRAY(16, uint16_t, fdata2, 64 * 71); \ |
+ vp9_high_convolve8_horiz_##opt(src - 3 * src_stride, src_stride, \ |
+ CONVERT_TO_BYTEPTR(fdata2), 64, \ |
+ filter_x, x_step_q4, filter_y, y_step_q4, \ |
+ w, h + 7, bd); \ |
+ vp9_high_convolve8_##avg##vert_##opt(CONVERT_TO_BYTEPTR(fdata2) + 192, \ |
+ 64, dst, dst_stride, \ |
+ filter_x, x_step_q4, filter_y, \ |
+ y_step_q4, w, h, bd); \ |
+ } else { \ |
+ DECLARE_ALIGNED_ARRAY(16, uint16_t, fdata2, 64 * 65); \ |
+ vp9_high_convolve8_horiz_##opt(src, src_stride, \ |
+ CONVERT_TO_BYTEPTR(fdata2), 64, \ |
+ filter_x, x_step_q4, filter_y, y_step_q4, \ |
+ w, h + 1, bd); \ |
+ vp9_high_convolve8_##avg##vert_##opt(CONVERT_TO_BYTEPTR(fdata2), 64, \ |
+ dst, dst_stride, \ |
+ filter_x, x_step_q4, filter_y, \ |
+ y_step_q4, w, h, bd); \ |
+ } \ |
+ } else { \ |
+ vp9_high_convolve8_##avg##c(src, src_stride, dst, dst_stride, \ |
+ filter_x, x_step_q4, filter_y, y_step_q4, w, \ |
+ h, bd); \ |
+ } \ |
+} |
+#endif // CONFIG_VP9_HIGHBITDEPTH |
+ |
+#if HAVE_AVX2 && HAVE_SSSE3 |
filter8_1dfunction vp9_filter_block1d16_v8_avx2; |
filter8_1dfunction vp9_filter_block1d16_h8_avx2; |
filter8_1dfunction vp9_filter_block1d4_v8_ssse3; |
-#if (ARCH_X86_64) |
+#if ARCH_X86_64 |
filter8_1dfunction vp9_filter_block1d8_v8_intrin_ssse3; |
filter8_1dfunction vp9_filter_block1d8_h8_intrin_ssse3; |
filter8_1dfunction vp9_filter_block1d4_h8_intrin_ssse3; |
#define vp9_filter_block1d8_v8_avx2 vp9_filter_block1d8_v8_intrin_ssse3 |
#define vp9_filter_block1d8_h8_avx2 vp9_filter_block1d8_h8_intrin_ssse3 |
#define vp9_filter_block1d4_h8_avx2 vp9_filter_block1d4_h8_intrin_ssse3 |
-#else |
+#else // ARCH_X86 |
filter8_1dfunction vp9_filter_block1d8_v8_ssse3; |
filter8_1dfunction vp9_filter_block1d8_h8_ssse3; |
filter8_1dfunction vp9_filter_block1d4_h8_ssse3; |
#define vp9_filter_block1d8_v8_avx2 vp9_filter_block1d8_v8_ssse3 |
#define vp9_filter_block1d8_h8_avx2 vp9_filter_block1d8_h8_ssse3 |
#define vp9_filter_block1d4_h8_avx2 vp9_filter_block1d4_h8_ssse3 |
-#endif |
+#endif // ARCH_X86_64 / ARCH_X86 |
filter8_1dfunction vp9_filter_block1d16_v2_ssse3; |
filter8_1dfunction vp9_filter_block1d16_h2_ssse3; |
filter8_1dfunction vp9_filter_block1d8_v2_ssse3; |
@@ -190,9 +337,9 @@ |
// const int16_t *filter_y, int y_step_q4, |
// int w, int h); |
FUN_CONV_2D(, avx2); |
-#endif |
+#endif // HAVE_AX2 && HAVE_SSSE3 |
#if HAVE_SSSE3 |
-#if (ARCH_X86_64) |
+#if ARCH_X86_64 |
filter8_1dfunction vp9_filter_block1d16_v8_intrin_ssse3; |
filter8_1dfunction vp9_filter_block1d16_h8_intrin_ssse3; |
filter8_1dfunction vp9_filter_block1d8_v8_intrin_ssse3; |
@@ -204,14 +351,14 @@ |
#define vp9_filter_block1d8_v8_ssse3 vp9_filter_block1d8_v8_intrin_ssse3 |
#define vp9_filter_block1d8_h8_ssse3 vp9_filter_block1d8_h8_intrin_ssse3 |
#define vp9_filter_block1d4_h8_ssse3 vp9_filter_block1d4_h8_intrin_ssse3 |
-#else |
+#else // ARCH_X86 |
filter8_1dfunction vp9_filter_block1d16_v8_ssse3; |
filter8_1dfunction vp9_filter_block1d16_h8_ssse3; |
filter8_1dfunction vp9_filter_block1d8_v8_ssse3; |
filter8_1dfunction vp9_filter_block1d8_h8_ssse3; |
filter8_1dfunction vp9_filter_block1d4_v8_ssse3; |
filter8_1dfunction vp9_filter_block1d4_h8_ssse3; |
-#endif |
+#endif // ARCH_X86_64 / ARCH_X86 |
filter8_1dfunction vp9_filter_block1d16_v8_avg_ssse3; |
filter8_1dfunction vp9_filter_block1d16_h8_avg_ssse3; |
filter8_1dfunction vp9_filter_block1d8_v8_avg_ssse3; |
@@ -270,7 +417,7 @@ |
// int w, int h); |
FUN_CONV_2D(, ssse3); |
FUN_CONV_2D(avg_ , ssse3); |
-#endif |
+#endif // HAVE_SSSE3 |
#if HAVE_SSE2 |
filter8_1dfunction vp9_filter_block1d16_v8_sse2; |
@@ -336,4 +483,75 @@ |
// int w, int h); |
FUN_CONV_2D(, sse2); |
FUN_CONV_2D(avg_ , sse2); |
-#endif |
+ |
+#if CONFIG_VP9_HIGHBITDEPTH && ARCH_X86_64 |
+high_filter8_1dfunction vp9_high_filter_block1d16_v8_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d16_h8_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d8_v8_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d8_h8_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d4_v8_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d4_h8_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d16_v8_avg_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d16_h8_avg_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d8_v8_avg_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d8_h8_avg_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d4_v8_avg_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d4_h8_avg_sse2; |
+ |
+high_filter8_1dfunction vp9_high_filter_block1d16_v2_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d16_h2_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d8_v2_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d8_h2_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d4_v2_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d4_h2_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d16_v2_avg_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d16_h2_avg_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d8_v2_avg_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d8_h2_avg_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d4_v2_avg_sse2; |
+high_filter8_1dfunction vp9_high_filter_block1d4_h2_avg_sse2; |
+ |
+// void vp9_high_convolve8_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, |
+// uint8_t *dst, ptrdiff_t dst_stride, |
+// const int16_t *filter_x, int x_step_q4, |
+// const int16_t *filter_y, int y_step_q4, |
+// int w, int h, int bd); |
+// void vp9_high_convolve8_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, |
+// uint8_t *dst, ptrdiff_t dst_stride, |
+// const int16_t *filter_x, int x_step_q4, |
+// const int16_t *filter_y, int y_step_q4, |
+// int w, int h, int bd); |
+// void vp9_high_convolve8_avg_horiz_sse2(const uint8_t *src, |
+// ptrdiff_t src_stride, |
+// uint8_t *dst, ptrdiff_t dst_stride, |
+// const int16_t *filter_x, |
+// int x_step_q4, |
+// const int16_t *filter_y, |
+// int y_step_q4, |
+// int w, int h, int bd); |
+// void vp9_high_convolve8_avg_vert_sse2(const uint8_t *src, |
+// ptrdiff_t src_stride, |
+// uint8_t *dst, ptrdiff_t dst_stride, |
+// const int16_t *filter_x, int x_step_q4, |
+// const int16_t *filter_y, int y_step_q4, |
+// int w, int h, int bd); |
+HIGH_FUN_CONV_1D(horiz, x_step_q4, filter_x, h, src, , sse2); |
+HIGH_FUN_CONV_1D(vert, y_step_q4, filter_y, v, src - src_stride * 3, , sse2); |
+HIGH_FUN_CONV_1D(avg_horiz, x_step_q4, filter_x, h, src, avg_, sse2); |
+HIGH_FUN_CONV_1D(avg_vert, y_step_q4, filter_y, v, src - src_stride * 3, avg_, |
+ sse2); |
+ |
+// void vp9_high_convolve8_sse2(const uint8_t *src, ptrdiff_t src_stride, |
+// uint8_t *dst, ptrdiff_t dst_stride, |
+// const int16_t *filter_x, int x_step_q4, |
+// const int16_t *filter_y, int y_step_q4, |
+// int w, int h, int bd); |
+// void vp9_high_convolve8_avg_sse2(const uint8_t *src, ptrdiff_t src_stride, |
+// uint8_t *dst, ptrdiff_t dst_stride, |
+// const int16_t *filter_x, int x_step_q4, |
+// const int16_t *filter_y, int y_step_q4, |
+// int w, int h, int bd); |
+HIGH_FUN_CONV_2D(, sse2); |
+HIGH_FUN_CONV_2D(avg_ , sse2); |
+#endif // CONFIG_VP9_HIGHBITDEPTH && ARCH_X86_64 |
+#endif // HAVE_SSE2 |