Index: source/libvpx/vp9/vp9cx.mk |
diff --git a/source/libvpx/vp9/vp9cx.mk b/source/libvpx/vp9/vp9cx.mk |
index 2b3f8945a3aa18878975cc13c898aa8b50c004d5..7359b2de05d22caf576055b3f5e5e7a36d49afd0 100644 |
--- a/source/libvpx/vp9/vp9cx.mk |
+++ b/source/libvpx/vp9/vp9cx.mk |
@@ -34,6 +34,7 @@ VP9_CX_SRCS-yes += encoder/vp9_encodemv.c |
VP9_CX_SRCS-yes += encoder/vp9_ethread.h |
VP9_CX_SRCS-yes += encoder/vp9_ethread.c |
VP9_CX_SRCS-yes += encoder/vp9_extend.c |
+VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_fastssim.c |
VP9_CX_SRCS-yes += encoder/vp9_firstpass.c |
VP9_CX_SRCS-yes += encoder/vp9_block.h |
VP9_CX_SRCS-yes += encoder/vp9_writer.h |
@@ -62,12 +63,12 @@ VP9_CX_SRCS-yes += encoder/vp9_mcomp.c |
VP9_CX_SRCS-yes += encoder/vp9_encoder.c |
VP9_CX_SRCS-yes += encoder/vp9_picklpf.c |
VP9_CX_SRCS-yes += encoder/vp9_picklpf.h |
+VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_psnrhvs.c |
VP9_CX_SRCS-yes += encoder/vp9_quantize.c |
VP9_CX_SRCS-yes += encoder/vp9_ratectrl.c |
VP9_CX_SRCS-yes += encoder/vp9_rd.c |
VP9_CX_SRCS-yes += encoder/vp9_rdopt.c |
VP9_CX_SRCS-yes += encoder/vp9_pickmode.c |
-VP9_CX_SRCS-yes += encoder/vp9_sad.c |
VP9_CX_SRCS-yes += encoder/vp9_segmentation.c |
VP9_CX_SRCS-yes += encoder/vp9_segmentation.h |
VP9_CX_SRCS-yes += encoder/vp9_speed_features.c |
@@ -79,6 +80,8 @@ VP9_CX_SRCS-yes += encoder/vp9_resize.c |
VP9_CX_SRCS-yes += encoder/vp9_resize.h |
VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_ssim.c |
VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_ssim.h |
+VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_blockiness.c |
+ |
VP9_CX_SRCS-yes += encoder/vp9_tokenize.c |
VP9_CX_SRCS-yes += encoder/vp9_treewriter.c |
VP9_CX_SRCS-yes += encoder/vp9_variance.c |
@@ -100,15 +103,11 @@ VP9_CX_SRCS-yes += encoder/vp9_mbgraph.c |
VP9_CX_SRCS-yes += encoder/vp9_mbgraph.h |
VP9_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_variance_impl_intrin_avx2.c |
-VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad4d_sse2.asm |
VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_avg_intrin_sse2.c |
-VP9_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_sad4d_intrin_avx2.c |
VP9_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_subpel_variance_impl_intrin_avx2.c |
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_SSE2) += encoder/x86/vp9_quantize_sse2.c |
ifeq ($(CONFIG_VP9_HIGHBITDEPTH),yes) |
-VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_highbd_sad4d_sse2.asm |
VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_highbd_variance_impl_sse2.asm |
VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_highbd_quantize_intrin_sse2.c |
VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_highbd_block_error_intrin_sse2.c |
@@ -117,12 +116,10 @@ endif |
ifeq ($(CONFIG_USE_X86INC),yes) |
VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_dct_mmx.asm |
VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_error_sse2.asm |
-VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad_sse2.asm |
VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subtract_sse2.asm |
VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_variance_sse2.c |
VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subpel_variance.asm |
ifeq ($(CONFIG_VP9_HIGHBITDEPTH),yes) |
-VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_highbd_sad_sse2.asm |
VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_highbd_variance_sse2.c |
VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_highbd_subpel_variance.asm |
endif |
@@ -132,9 +129,6 @@ ifeq ($(ARCH_X86_64),yes) |
VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_quantize_ssse3_x86_64.asm |
VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_dct_ssse3_x86_64.asm |
endif |
-VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_sad_ssse3.asm |
-VP9_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/vp9_sad_sse4.asm |
-VP9_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_sad_intrin_avx2.c |
VP9_CX_SRCS-$(ARCH_X86_64) += encoder/x86/vp9_ssim_opt_x86_64.asm |
VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.c |
@@ -152,12 +146,12 @@ VP9_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_dct_avx2.c |
VP9_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_error_intrin_avx2.c |
VP9_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_variance_avx2.c |
-VP9_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_avg_neon.c |
-VP9_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_sad_neon.c |
-VP9_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_sad4d_neon.c |
+ifneq ($(CONFIG_VP9_HIGHBITDEPTH),yes) |
VP9_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_dct_neon.c |
-VP9_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_variance_neon.c |
+endif |
+VP9_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_avg_neon.c |
VP9_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_quantize_neon.c |
VP9_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_subtract_neon.c |
+VP9_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_variance_neon.c |
VP9_CX_SRCS-yes := $(filter-out $(VP9_CX_SRCS_REMOVE-yes),$(VP9_CX_SRCS-yes)) |