diff options
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/common/arm/armv6/vp8_sad16x16_armv6.asm (renamed from vp8/encoder/arm/armv6/vp8_sad16x16_armv6.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/arm/armv6/vp8_variance16x16_armv6.asm (renamed from vp8/encoder/arm/armv6/vp8_variance16x16_armv6.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/arm/armv6/vp8_variance8x8_armv6.asm (renamed from vp8/encoder/arm/armv6/vp8_variance8x8_armv6.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm (renamed from vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm (renamed from vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm (renamed from vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/arm/neon/sad16_neon.asm (renamed from vp8/encoder/arm/neon/sad16_neon.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/arm/neon/sad8_neon.asm (renamed from vp8/encoder/arm/neon/sad8_neon.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/arm/neon/variance_neon.asm (renamed from vp8/encoder/arm/neon/variance_neon.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/arm/neon/vp8_subpixelvariance16x16_neon.asm (renamed from vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/arm/neon/vp8_subpixelvariance16x16s_neon.asm (renamed from vp8/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/arm/neon/vp8_subpixelvariance8x8_neon.asm (renamed from vp8/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/arm/variance_arm.c (renamed from vp8/encoder/arm/variance_arm.c) | 2 | ||||
| -rw-r--r-- | vp8/common/postproc.c | 2 | ||||
| -rw-r--r-- | vp8/common/ppc/sad_altivec.asm (renamed from vp8/encoder/ppc/sad_altivec.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/ppc/variance_altivec.asm (renamed from vp8/encoder/ppc/variance_altivec.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/ppc/variance_subpixel_altivec.asm (renamed from vp8/encoder/ppc/variance_subpixel_altivec.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/sad_c.c (renamed from vp8/encoder/sad_c.c) | 0 | ||||
| -rw-r--r-- | vp8/common/variance.h (renamed from vp8/encoder/variance.h) | 0 | ||||
| -rw-r--r-- | vp8/common/variance_c.c (renamed from vp8/encoder/variance_c.c) | 2 | ||||
| -rw-r--r-- | vp8/common/x86/sad_mmx.asm (renamed from vp8/encoder/x86/sad_mmx.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/x86/sad_sse2.asm (renamed from vp8/encoder/x86/sad_sse2.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/x86/sad_sse3.asm (renamed from vp8/encoder/x86/sad_sse3.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/x86/sad_sse4.asm (renamed from vp8/encoder/x86/sad_sse4.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/x86/sad_ssse3.asm (renamed from vp8/encoder/x86/sad_ssse3.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/x86/variance_impl_mmx.asm (renamed from vp8/encoder/x86/variance_impl_mmx.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/x86/variance_impl_sse2.asm (renamed from vp8/encoder/x86/variance_impl_sse2.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/x86/variance_impl_ssse3.asm (renamed from vp8/encoder/x86/variance_impl_ssse3.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/x86/variance_mmx.c (renamed from vp8/encoder/x86/variance_mmx.c) | 2 | ||||
| -rw-r--r-- | vp8/common/x86/variance_sse2.c (renamed from vp8/encoder/x86/variance_sse2.c) | 2 | ||||
| -rw-r--r-- | vp8/common/x86/variance_ssse3.c (renamed from vp8/encoder/x86/variance_ssse3.c) | 2 | ||||
| -rw-r--r-- | vp8/encoder/firstpass.c | 2 | ||||
| -rw-r--r-- | vp8/encoder/mcomp.h | 2 | ||||
| -rw-r--r-- | vp8/encoder/onyx_int.h | 2 | ||||
| -rw-r--r-- | vp8/encoder/pickinter.c | 2 | ||||
| -rw-r--r-- | vp8/encoder/rdopt.c | 2 | ||||
| -rw-r--r-- | vp8/vp8_common.mk | 31 | ||||
| -rw-r--r-- | vp8/vp8cx.mk | 14 | ||||
| -rw-r--r-- | vp8/vp8cx_arm.mk | 13 |
39 files changed, 41 insertions, 39 deletions
diff --git a/vp8/encoder/arm/armv6/vp8_sad16x16_armv6.asm b/vp8/common/arm/armv6/vp8_sad16x16_armv6.asm index 1b4f5cf3b..1b4f5cf3b 100644 --- a/vp8/encoder/arm/armv6/vp8_sad16x16_armv6.asm +++ b/vp8/common/arm/armv6/vp8_sad16x16_armv6.asm diff --git a/vp8/encoder/arm/armv6/vp8_variance16x16_armv6.asm b/vp8/common/arm/armv6/vp8_variance16x16_armv6.asm index dc84c30da..dc84c30da 100644 --- a/vp8/encoder/arm/armv6/vp8_variance16x16_armv6.asm +++ b/vp8/common/arm/armv6/vp8_variance16x16_armv6.asm diff --git a/vp8/encoder/arm/armv6/vp8_variance8x8_armv6.asm b/vp8/common/arm/armv6/vp8_variance8x8_armv6.asm index adc353d20..adc353d20 100644 --- a/vp8/encoder/arm/armv6/vp8_variance8x8_armv6.asm +++ b/vp8/common/arm/armv6/vp8_variance8x8_armv6.asm diff --git a/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm b/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm index dd2ce685c..dd2ce685c 100644 --- a/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm +++ b/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm diff --git a/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm b/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm index f972d9b5b..f972d9b5b 100644 --- a/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm +++ b/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm diff --git a/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm b/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm index f5da9c09e..f5da9c09e 100644 --- a/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm +++ b/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm diff --git a/vp8/encoder/arm/neon/sad16_neon.asm b/vp8/common/arm/neon/sad16_neon.asm index d7c590e15..d7c590e15 100644 --- a/vp8/encoder/arm/neon/sad16_neon.asm +++ b/vp8/common/arm/neon/sad16_neon.asm diff --git a/vp8/encoder/arm/neon/sad8_neon.asm b/vp8/common/arm/neon/sad8_neon.asm index 23ba6df93..23ba6df93 100644 --- a/vp8/encoder/arm/neon/sad8_neon.asm +++ b/vp8/common/arm/neon/sad8_neon.asm diff --git a/vp8/encoder/arm/neon/variance_neon.asm b/vp8/common/arm/neon/variance_neon.asm index e3b48327d..e3b48327d 100644 --- a/vp8/encoder/arm/neon/variance_neon.asm +++ b/vp8/common/arm/neon/variance_neon.asm diff --git a/vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm b/vp8/common/arm/neon/vp8_subpixelvariance16x16_neon.asm index d753ad129..d753ad129 100644 --- a/vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm +++ b/vp8/common/arm/neon/vp8_subpixelvariance16x16_neon.asm diff --git a/vp8/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm b/vp8/common/arm/neon/vp8_subpixelvariance16x16s_neon.asm index 155be4fc5..155be4fc5 100644 --- a/vp8/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm +++ b/vp8/common/arm/neon/vp8_subpixelvariance16x16s_neon.asm diff --git a/vp8/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm b/vp8/common/arm/neon/vp8_subpixelvariance8x8_neon.asm index cc7ae52c9..cc7ae52c9 100644 --- a/vp8/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm +++ b/vp8/common/arm/neon/vp8_subpixelvariance8x8_neon.asm diff --git a/vp8/encoder/arm/variance_arm.c b/vp8/common/arm/variance_arm.c index 052a2578a..41d5eb352 100644 --- a/vp8/encoder/arm/variance_arm.c +++ b/vp8/common/arm/variance_arm.c @@ -10,7 +10,7 @@ #include "vpx_config.h" #include "vpx_rtcd.h" -#include "vp8/encoder/variance.h" +#include "vp8/common/variance.h" #include "vp8/common/filter.h" #if HAVE_MEDIA diff --git a/vp8/common/postproc.c b/vp8/common/postproc.c index 401989ba5..280ce0294 100644 --- a/vp8/common/postproc.c +++ b/vp8/common/postproc.c @@ -17,7 +17,7 @@ #include "vpx_scale/yv12extend.h" #include "vpx_scale/vpxscale.h" #include "systemdependent.h" -#include "../encoder/variance.h" +#include "variance.h" #include <limits.h> #include <math.h> diff --git a/vp8/encoder/ppc/sad_altivec.asm b/vp8/common/ppc/sad_altivec.asm index e5f26380f..e5f26380f 100644 --- a/vp8/encoder/ppc/sad_altivec.asm +++ b/vp8/common/ppc/sad_altivec.asm diff --git a/vp8/encoder/ppc/variance_altivec.asm b/vp8/common/ppc/variance_altivec.asm index fb8d5bb1d..fb8d5bb1d 100644 --- a/vp8/encoder/ppc/variance_altivec.asm +++ b/vp8/common/ppc/variance_altivec.asm diff --git a/vp8/encoder/ppc/variance_subpixel_altivec.asm b/vp8/common/ppc/variance_subpixel_altivec.asm index 2308373a1..2308373a1 100644 --- a/vp8/encoder/ppc/variance_subpixel_altivec.asm +++ b/vp8/common/ppc/variance_subpixel_altivec.asm diff --git a/vp8/encoder/sad_c.c b/vp8/common/sad_c.c index f745bbd3d..f745bbd3d 100644 --- a/vp8/encoder/sad_c.c +++ b/vp8/common/sad_c.c diff --git a/vp8/encoder/variance.h b/vp8/common/variance.h index b77aa28f4..b77aa28f4 100644 --- a/vp8/encoder/variance.h +++ b/vp8/common/variance.h diff --git a/vp8/encoder/variance_c.c b/vp8/common/variance_c.c index dbcbc7a01..996404dd6 100644 --- a/vp8/encoder/variance_c.c +++ b/vp8/common/variance_c.c @@ -10,7 +10,7 @@ #include "variance.h" -#include "vp8/common/filter.h" +#include "filter.h" unsigned int vp8_get_mb_ss_c diff --git a/vp8/encoder/x86/sad_mmx.asm b/vp8/common/x86/sad_mmx.asm index 407b39979..407b39979 100644 --- a/vp8/encoder/x86/sad_mmx.asm +++ b/vp8/common/x86/sad_mmx.asm diff --git a/vp8/encoder/x86/sad_sse2.asm b/vp8/common/x86/sad_sse2.asm index 0b01d7b61..0b01d7b61 100644 --- a/vp8/encoder/x86/sad_sse2.asm +++ b/vp8/common/x86/sad_sse2.asm diff --git a/vp8/encoder/x86/sad_sse3.asm b/vp8/common/x86/sad_sse3.asm index c2af3c86f..c2af3c86f 100644 --- a/vp8/encoder/x86/sad_sse3.asm +++ b/vp8/common/x86/sad_sse3.asm diff --git a/vp8/encoder/x86/sad_sse4.asm b/vp8/common/x86/sad_sse4.asm index 03ecec4b3..03ecec4b3 100644 --- a/vp8/encoder/x86/sad_sse4.asm +++ b/vp8/common/x86/sad_sse4.asm diff --git a/vp8/encoder/x86/sad_ssse3.asm b/vp8/common/x86/sad_ssse3.asm index 95b6c89e6..95b6c89e6 100644 --- a/vp8/encoder/x86/sad_ssse3.asm +++ b/vp8/common/x86/sad_ssse3.asm diff --git a/vp8/encoder/x86/variance_impl_mmx.asm b/vp8/common/x86/variance_impl_mmx.asm index 2be8bbeb3..2be8bbeb3 100644 --- a/vp8/encoder/x86/variance_impl_mmx.asm +++ b/vp8/common/x86/variance_impl_mmx.asm diff --git a/vp8/encoder/x86/variance_impl_sse2.asm b/vp8/common/x86/variance_impl_sse2.asm index 762922091..762922091 100644 --- a/vp8/encoder/x86/variance_impl_sse2.asm +++ b/vp8/common/x86/variance_impl_sse2.asm diff --git a/vp8/encoder/x86/variance_impl_ssse3.asm b/vp8/common/x86/variance_impl_ssse3.asm index 97e8b0e2e..97e8b0e2e 100644 --- a/vp8/encoder/x86/variance_impl_ssse3.asm +++ b/vp8/common/x86/variance_impl_ssse3.asm diff --git a/vp8/encoder/x86/variance_mmx.c b/vp8/common/x86/variance_mmx.c index 2d07df94c..0c4dd4a98 100644 --- a/vp8/encoder/x86/variance_mmx.c +++ b/vp8/common/x86/variance_mmx.c @@ -9,7 +9,7 @@ */ #include "vpx_config.h" -#include "vp8/encoder/variance.h" +#include "vp8/common/variance.h" #include "vp8/common/pragmas.h" #include "vpx_ports/mem.h" #include "vp8/common/x86/filter_x86.h" diff --git a/vp8/encoder/x86/variance_sse2.c b/vp8/common/x86/variance_sse2.c index da0bd4800..2769a302b 100644 --- a/vp8/encoder/x86/variance_sse2.c +++ b/vp8/common/x86/variance_sse2.c @@ -9,7 +9,7 @@ */ #include "vpx_config.h" -#include "vp8/encoder/variance.h" +#include "vp8/common/variance.h" #include "vp8/common/pragmas.h" #include "vpx_ports/mem.h" #include "vp8/common/x86/filter_x86.h" diff --git a/vp8/encoder/x86/variance_ssse3.c b/vp8/common/x86/variance_ssse3.c index 8b8b87e2d..1be0d929d 100644 --- a/vp8/encoder/x86/variance_ssse3.c +++ b/vp8/common/x86/variance_ssse3.c @@ -9,7 +9,7 @@ */ #include "vpx_config.h" -#include "vp8/encoder/variance.h" +#include "vp8/common/variance.h" #include "vp8/common/pragmas.h" #include "vpx_ports/mem.h" diff --git a/vp8/encoder/firstpass.c b/vp8/encoder/firstpass.c index c7b0a27af..cb8fd3e89 100644 --- a/vp8/encoder/firstpass.c +++ b/vp8/encoder/firstpass.c @@ -12,7 +12,7 @@ #include "limits.h" #include "block.h" #include "onyx_int.h" -#include "variance.h" +#include "vp8/common/variance.h" #include "encodeintra.h" #include "vp8/common/setupintrarecon.h" #include "mcomp.h" diff --git a/vp8/encoder/mcomp.h b/vp8/encoder/mcomp.h index e6ab1648c..cdb0cb63c 100644 --- a/vp8/encoder/mcomp.h +++ b/vp8/encoder/mcomp.h @@ -13,7 +13,7 @@ #define __INC_MCOMP_H #include "block.h" -#include "variance.h" +#include "vp8/common/variance.h" #ifdef ENTROPY_STATS extern void init_mv_ref_counts(); diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h index e17d8ead0..e9e2ee52e 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h @@ -18,7 +18,7 @@ #include "treewriter.h" #include "tokenize.h" #include "vp8/common/onyxc_int.h" -#include "variance.h" +#include "vp8/common/variance.h" #include "encodemb.h" #include "quantize.h" #include "vp8/common/entropy.h" diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index 236cb2326..65e6c1294 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -20,7 +20,7 @@ #include "encodemb.h" #include "vp8/common/reconinter.h" #include "vp8/common/reconintra4x4.h" -#include "variance.h" +#include "vp8/common/variance.h" #include "mcomp.h" #include "rdopt.h" #include "vpx_mem/vpx_mem.h" diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index fdc7213f3..f8f160e7a 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -28,7 +28,7 @@ #include "vp8/common/quant_common.h" #include "encodemb.h" #include "quantize.h" -#include "variance.h" +#include "vp8/common/variance.h" #include "mcomp.h" #include "rdopt.h" #include "vpx_mem/vpx_mem.h" diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk index a200b2265..f68d007c1 100644 --- a/vp8/vp8_common.mk +++ b/vp8/vp8_common.mk @@ -64,8 +64,11 @@ VP8_COMMON_SRCS-yes += common/quant_common.c VP8_COMMON_SRCS-yes += common/reconinter.c VP8_COMMON_SRCS-yes += common/reconintra.c VP8_COMMON_SRCS-yes += common/reconintra4x4.c +VP8_COMMON_SRCS-yes += common/sad_c.c VP8_COMMON_SRCS-yes += common/setupintrarecon.c VP8_COMMON_SRCS-yes += common/swapyv12buffer.c +VP8_COMMON_SRCS-yes += common/variance_c.c +VP8_COMMON_SRCS-yes += common/variance.h @@ -83,22 +86,35 @@ VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/idct_blk_mmx.c VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/idctllm_mmx.asm VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/idctllm_mmx_test.cc VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/iwalsh_mmx.asm +VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/loopfilter_mmx.asm VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/recon_mmx.asm +VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/sad_mmx.asm VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/subpixel_mmx.asm -VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/loopfilter_mmx.asm +VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/variance_mmx.c +VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/variance_impl_mmx.asm VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/idct_blk_sse2.c VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/idctllm_sse2.asm VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/recon_sse2.asm VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/recon_wrapper_sse2.c +VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/sad_sse2.asm VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/subpixel_sse2.asm VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/loopfilter_sse2.asm VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/iwalsh_sse2.asm +VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/variance_sse2.c +VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/variance_impl_sse2.asm +VP8_COMMON_SRCS-$(HAVE_SSE3) += common/x86/sad_sse3.asm +VP8_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/sad_ssse3.asm VP8_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/subpixel_ssse3.asm +VP8_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/variance_ssse3.c +VP8_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/variance_impl_ssse3.asm +VP8_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/sad_sse4.asm + ifeq ($(CONFIG_POSTPROC),yes) VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/postproc_x86.c VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/postproc_mmx.asm VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/postproc_sse2.asm endif + ifeq ($(ARCH_X86_64),yes) VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/loopfilter_block_sse2.asm endif @@ -108,6 +124,7 @@ VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/filter_arm.c VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/loopfilter_arm.c VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/reconintra_arm.c VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/dequantize_arm.c +VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/variance_arm.c # common (media) VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/bilinearfilter_arm.c @@ -127,6 +144,12 @@ VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/armv6/intra4x4_predict_v6$(ASM) VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/armv6/dequant_idct_v6$(ASM) VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/armv6/dequantize_v6$(ASM) VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/armv6/idct_blk_v6.c +VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/armv6/vp8_sad16x16_armv6$(ASM) +VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/armv6/vp8_variance8x8_armv6$(ASM) +VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/armv6/vp8_variance16x16_armv6$(ASM) +VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6$(ASM) +VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6$(ASM) +VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6$(ASM) # common (neon) VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/bilinearpredict4x4_neon$(ASM) @@ -143,6 +166,8 @@ VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/loopfiltersimplehorizontaledge_ VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/loopfiltersimpleverticaledge_neon$(ASM) VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/mbloopfilter_neon$(ASM) VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/shortidct4x4llm_neon$(ASM) +VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/sad8_neon$(ASM) +VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/sad16_neon$(ASM) VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/sixtappredict4x4_neon$(ASM) VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/sixtappredict8x4_neon$(ASM) VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/sixtappredict8x8_neon$(ASM) @@ -154,3 +179,7 @@ VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/idct_dequant_full_2x_neon$(ASM) VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/idct_dequant_0_2x_neon$(ASM) VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/dequantizeb_neon$(ASM) VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/idct_blk_neon.c +VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/variance_neon$(ASM) +VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp8_subpixelvariance8x8_neon$(ASM) +VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp8_subpixelvariance16x16_neon$(ASM) +VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp8_subpixelvariance16x16s_neon$(ASM) diff --git a/vp8/vp8cx.mk b/vp8/vp8cx.mk index b96c9adab..aad847a72 100644 --- a/vp8/vp8cx.mk +++ b/vp8/vp8cx.mk @@ -63,7 +63,6 @@ VP8_CX_SRCS-yes += encoder/ratectrl.h VP8_CX_SRCS-yes += encoder/rdopt.h VP8_CX_SRCS-yes += encoder/tokenize.h VP8_CX_SRCS-yes += encoder/treewriter.h -VP8_CX_SRCS-yes += encoder/variance.h VP8_CX_SRCS-yes += encoder/mcomp.c VP8_CX_SRCS-yes += encoder/modecosts.c VP8_CX_SRCS-yes += encoder/onyx_if.c @@ -73,13 +72,11 @@ VP8_CX_SRCS-yes += encoder/psnr.c VP8_CX_SRCS-yes += encoder/quantize.c VP8_CX_SRCS-yes += encoder/ratectrl.c VP8_CX_SRCS-yes += encoder/rdopt.c -VP8_CX_SRCS-yes += encoder/sad_c.c VP8_CX_SRCS-yes += encoder/segmentation.c VP8_CX_SRCS-yes += encoder/segmentation.h VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/ssim.c VP8_CX_SRCS-yes += encoder/tokenize.c VP8_CX_SRCS-yes += encoder/treewriter.c -VP8_CX_SRCS-yes += encoder/variance_c.c VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.h VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.c VP8_CX_SRCS-yes += encoder/temporal_filter.c @@ -91,27 +88,16 @@ VP8_CX_SRCS_REMOVE-yes += encoder/firstpass.c VP8_CX_SRCS_REMOVE-yes += encoder/temporal_filter.c endif -VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/variance_mmx.c -VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/variance_impl_mmx.asm -VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/sad_mmx.asm VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/dct_mmx.asm VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/subtract_mmx.asm VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp8_enc_stubs_mmx.c VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/dct_sse2.asm -VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/variance_sse2.c -VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/variance_impl_sse2.asm -VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/sad_sse2.asm VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/fwalsh_sse2.asm VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.asm VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/subtract_sse2.asm VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp8_enc_stubs_sse2.c -VP8_CX_SRCS-$(HAVE_SSE3) += encoder/x86/sad_sse3.asm -VP8_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/sad_ssse3.asm -VP8_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/variance_ssse3.c -VP8_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/variance_impl_ssse3.asm VP8_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/quantize_ssse3.asm -VP8_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/sad_sse4.asm VP8_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/quantize_sse4.asm VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/quantize_mmx.asm VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/encodeopt.asm diff --git a/vp8/vp8cx_arm.mk b/vp8/vp8cx_arm.mk index 11ebb58aa..b16615d1b 100644 --- a/vp8/vp8cx_arm.mk +++ b/vp8/vp8cx_arm.mk @@ -15,7 +15,6 @@ # encoder VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/dct_arm.c VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/quantize_arm.c -VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/variance_arm.c #File list for edsp # encoder @@ -31,27 +30,15 @@ VP8_CX_SRCS-$(HAVE_EDSP) += encoder/arm/armv5te/vp8_packtokens_partitions_armv5 VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/vp8_subtract_armv6$(ASM) VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/vp8_short_fdct4x4_armv6$(ASM) VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/vp8_fast_quantize_b_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/vp8_sad16x16_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/vp8_variance16x16_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6$(ASM) VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/vp8_mse16x16_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/vp8_variance8x8_armv6$(ASM) VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/walsh_v6$(ASM) #File list for neon # encoder VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/fastquantizeb_neon$(ASM) VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/picklpf_arm.c -VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/sad8_neon$(ASM) -VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/sad16_neon$(ASM) VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/shortfdct_neon$(ASM) VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/subtract_neon$(ASM) -VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/variance_neon$(ASM) VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp8_mse16x16_neon$(ASM) -VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp8_subpixelvariance8x8_neon$(ASM) -VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp8_subpixelvariance16x16_neon$(ASM) -VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp8_subpixelvariance16x16s_neon$(ASM) VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp8_memcpy_neon$(ASM) VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp8_shortwalsh4x4_neon$(ASM) |