diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-06-17 16:54:09 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-06-17 16:54:09 -0700 |
| commit | d9fc451666c9895a0614df2f5a7ec60839a1c717 (patch) | |
| tree | 89f12cd55f82cb3001098950025dfecd789e99a7 | |
| parent | a2f33e2505adab7543447d9017f0def0a901a0de (diff) | |
| download | libvpx-d9fc451666c9895a0614df2f5a7ec60839a1c717.tar libvpx-d9fc451666c9895a0614df2f5a7ec60839a1c717.tar.gz libvpx-d9fc451666c9895a0614df2f5a7ec60839a1c717.tar.bz2 libvpx-d9fc451666c9895a0614df2f5a7ec60839a1c717.zip | |
Move subpixel variance function from common/ to encoder/.
This seems to only be used in the encoder. Also remove an empty wrapper
file that contained forward declarations for this function, but didn't
actually define any actual functions.
Change-Id: Ifc561eef7ebe374a7d03698055e51e105f6d614b
| -rw-r--r-- | vp9/common/x86/vp9_subpixel_variance_sse2.c | 45 | ||||
| -rw-r--r-- | vp9/encoder/x86/vp9_subpel_variance_impl_sse2.asm (renamed from vp9/common/x86/vp9_subpel_variance_impl_sse2.asm) | 0 | ||||
| -rw-r--r-- | vp9/vp9_common.mk | 2 | ||||
| -rw-r--r-- | vp9/vp9cx.mk | 1 |
4 files changed, 1 insertions, 47 deletions
diff --git a/vp9/common/x86/vp9_subpixel_variance_sse2.c b/vp9/common/x86/vp9_subpixel_variance_sse2.c deleted file mode 100644 index c20b9fbe9..000000000 --- a/vp9/common/x86/vp9_subpixel_variance_sse2.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2010 The WebM project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#define HALFNDX 8 - -void vp9_half_horiz_variance16x_h_sse2(const unsigned char *ref_ptr, - int ref_pixels_per_line, - const unsigned char *src_ptr, - int src_pixels_per_line, - unsigned int Height, - int *sum, - unsigned int *sumsquared); - -void vp9_half_vert_variance16x_h_sse2(const unsigned char *ref_ptr, - int ref_pixels_per_line, - const unsigned char *src_ptr, - int src_pixels_per_line, - unsigned int Height, - int *sum, - unsigned int *sumsquared); - -void vp9_half_horiz_vert_variance16x_h_sse2(const unsigned char *ref_ptr, - int ref_pixels_per_line, - const unsigned char *src_ptr, - int src_pixels_per_line, - unsigned int Height, - int *sum, - unsigned int *sumsquared); - -void vp9_filter_block2d_bil_var_sse2(const unsigned char *ref_ptr, - int ref_pixels_per_line, - const unsigned char *src_ptr, - int src_pixels_per_line, - unsigned int Height, - int xoffset, - int yoffset, - int *sum, - unsigned int *sumsquared); diff --git a/vp9/common/x86/vp9_subpel_variance_impl_sse2.asm b/vp9/encoder/x86/vp9_subpel_variance_impl_sse2.asm index 8a2a471f5..8a2a471f5 100644 --- a/vp9/common/x86/vp9_subpel_variance_impl_sse2.asm +++ b/vp9/encoder/x86/vp9_subpel_variance_impl_sse2.asm diff --git a/vp9/vp9_common.mk b/vp9/vp9_common.mk index b6d50f8ef..1a1fba9a0 100644 --- a/vp9/vp9_common.mk +++ b/vp9/vp9_common.mk @@ -87,8 +87,6 @@ VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_iwalsh_sse2.asm VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_loopfilter_sse2.asm VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_recon_sse2.asm VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_recon_wrapper_sse2.c -VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_subpel_variance_impl_sse2.asm -VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_subpixel_variance_sse2.c VP9_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/vp9_subpixel_8t_ssse3.asm ifeq ($(CONFIG_POSTPROC),yes) VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/vp9_postproc_mmx.asm diff --git a/vp9/vp9cx.mk b/vp9/vp9cx.mk index 86fd08850..4bed6c0d7 100644 --- a/vp9/vp9cx.mk +++ b/vp9/vp9cx.mk @@ -86,6 +86,7 @@ VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad_sse2.asm VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad4d_sse2.asm VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_fwalsh_sse2.asm VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subtract_sse2.asm +VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subpel_variance_impl_sse2.asm VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_temporal_filter_apply_sse2.asm VP9_CX_SRCS-$(HAVE_SSE3) += encoder/x86/vp9_sad_sse3.asm VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_sad_ssse3.asm |