| OLD | NEW |
| 1 ## | 1 ## |
| 2 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. | 2 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. |
| 3 ## | 3 ## |
| 4 ## Use of this source code is governed by a BSD-style license | 4 ## Use of this source code is governed by a BSD-style license |
| 5 ## that can be found in the LICENSE file in the root of the source | 5 ## that can be found in the LICENSE file in the root of the source |
| 6 ## tree. An additional intellectual property rights grant can be found | 6 ## tree. An additional intellectual property rights grant can be found |
| 7 ## in the file PATENTS. All contributing project authors may | 7 ## in the file PATENTS. All contributing project authors may |
| 8 ## be found in the AUTHORS file in the root of the source tree. | 8 ## be found in the AUTHORS file in the root of the source tree. |
| 9 ## | 9 ## |
| 10 | 10 |
| 11 | 11 |
| 12 VP8_CX_EXPORTS += exports_enc | 12 VP8_CX_EXPORTS += exports_enc |
| 13 | 13 |
| 14 VP8_CX_SRCS-yes += $(VP8_COMMON_SRCS-yes) | 14 VP8_CX_SRCS-yes += $(VP8_COMMON_SRCS-yes) |
| 15 VP8_CX_SRCS-no += $(VP8_COMMON_SRCS-no) | 15 VP8_CX_SRCS-no += $(VP8_COMMON_SRCS-no) |
| 16 VP8_CX_SRCS_REMOVE-yes += $(VP8_COMMON_SRCS_REMOVE-yes) | 16 VP8_CX_SRCS_REMOVE-yes += $(VP8_COMMON_SRCS_REMOVE-yes) |
| 17 VP8_CX_SRCS_REMOVE-no += $(VP8_COMMON_SRCS_REMOVE-no) | 17 VP8_CX_SRCS_REMOVE-no += $(VP8_COMMON_SRCS_REMOVE-no) |
| 18 | 18 |
| 19 ifeq ($(ARCH_ARM),yes) | 19 ifeq ($(ARCH_ARM),yes) |
| 20 include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8cx_arm.mk | 20 include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8cx_arm.mk |
| 21 endif | 21 endif |
| 22 | 22 |
| 23 VP8_CX_SRCS-yes += vp8cx.mk | 23 VP8_CX_SRCS-yes += vp8cx.mk |
| 24 | 24 |
| 25 VP8_CX_SRCS-yes += vp8_cx_iface.c | 25 VP8_CX_SRCS-yes += vp8_cx_iface.c |
| 26 | 26 |
| 27 VP8_CX_SRCS-yes += encoder/asm_enc_offsets.c | |
| 28 VP8_CX_SRCS-yes += encoder/defaultcoefcounts.h | 27 VP8_CX_SRCS-yes += encoder/defaultcoefcounts.h |
| 29 VP8_CX_SRCS-yes += encoder/bitstream.c | 28 VP8_CX_SRCS-yes += encoder/bitstream.c |
| 30 VP8_CX_SRCS-yes += encoder/boolhuff.c | 29 VP8_CX_SRCS-yes += encoder/boolhuff.c |
| 31 VP8_CX_SRCS-yes += encoder/dct.c | 30 VP8_CX_SRCS-yes += encoder/dct.c |
| 32 VP8_CX_SRCS-yes += encoder/encodeframe.c | 31 VP8_CX_SRCS-yes += encoder/encodeframe.c |
| 33 VP8_CX_SRCS-yes += encoder/encodeframe.h | 32 VP8_CX_SRCS-yes += encoder/encodeframe.h |
| 34 VP8_CX_SRCS-yes += encoder/encodeintra.c | 33 VP8_CX_SRCS-yes += encoder/encodeintra.c |
| 35 VP8_CX_SRCS-yes += encoder/encodemb.c | 34 VP8_CX_SRCS-yes += encoder/encodemb.c |
| 36 VP8_CX_SRCS-yes += encoder/encodemv.c | 35 VP8_CX_SRCS-yes += encoder/encodemv.c |
| 37 VP8_CX_SRCS-$(CONFIG_MULTITHREAD) += encoder/ethreading.c | 36 VP8_CX_SRCS-$(CONFIG_MULTITHREAD) += encoder/ethreading.c |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/ssim.c | 70 VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/ssim.c |
| 72 VP8_CX_SRCS-yes += encoder/tokenize.c | 71 VP8_CX_SRCS-yes += encoder/tokenize.c |
| 73 VP8_CX_SRCS-yes += encoder/dct_value_cost.h | 72 VP8_CX_SRCS-yes += encoder/dct_value_cost.h |
| 74 VP8_CX_SRCS-yes += encoder/dct_value_tokens.h | 73 VP8_CX_SRCS-yes += encoder/dct_value_tokens.h |
| 75 VP8_CX_SRCS-yes += encoder/treewriter.c | 74 VP8_CX_SRCS-yes += encoder/treewriter.c |
| 76 VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.h | 75 VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.h |
| 77 VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.c | 76 VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.c |
| 78 VP8_CX_SRCS-yes += encoder/temporal_filter.c | 77 VP8_CX_SRCS-yes += encoder/temporal_filter.c |
| 79 VP8_CX_SRCS-$(CONFIG_MULTI_RES_ENCODING) += encoder/mr_dissim.c | 78 VP8_CX_SRCS-$(CONFIG_MULTI_RES_ENCODING) += encoder/mr_dissim.c |
| 80 VP8_CX_SRCS-$(CONFIG_MULTI_RES_ENCODING) += encoder/mr_dissim.h | 79 VP8_CX_SRCS-$(CONFIG_MULTI_RES_ENCODING) += encoder/mr_dissim.h |
| 80 VP8_CX_SRCS-yes += encoder/vp8_asm_enc_offsets.c |
| 81 | 81 |
| 82 ifeq ($(CONFIG_REALTIME_ONLY),yes) | 82 ifeq ($(CONFIG_REALTIME_ONLY),yes) |
| 83 VP8_CX_SRCS_REMOVE-yes += encoder/firstpass.c | 83 VP8_CX_SRCS_REMOVE-yes += encoder/firstpass.c |
| 84 VP8_CX_SRCS_REMOVE-yes += encoder/temporal_filter.c | 84 VP8_CX_SRCS_REMOVE-yes += encoder/temporal_filter.c |
| 85 endif | 85 endif |
| 86 | 86 |
| 87 VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/dct_mmx.asm | 87 VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/dct_mmx.asm |
| 88 VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/subtract_mmx.asm | 88 VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/subtract_mmx.asm |
| 89 VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp8_enc_stubs_mmx.c | 89 VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp8_enc_stubs_mmx.c |
| 90 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/dct_sse2.asm | 90 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/dct_sse2.asm |
| 91 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/fwalsh_sse2.asm | 91 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/fwalsh_sse2.asm |
| 92 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.asm | 92 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.c |
| 93 |
| 94 # TODO(johann) make this generic |
| 95 ifeq ($(HAVE_SSE2),yes) |
| 96 vp8/encoder/x86/quantize_sse2.c.o: CFLAGS += -msse2 |
| 97 vp8/encoder/x86/quantize_sse2.c.d: CFLAGS += -msse2 |
| 98 endif |
| 93 | 99 |
| 94 ifeq ($(CONFIG_TEMPORAL_DENOISING),yes) | 100 ifeq ($(CONFIG_TEMPORAL_DENOISING),yes) |
| 95 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/denoising_sse2.c | 101 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/denoising_sse2.c |
| 96 ifeq ($(HAVE_SSE2),yes) | 102 ifeq ($(HAVE_SSE2),yes) |
| 97 vp8/encoder/x86/denoising_sse2.c.o: CFLAGS += -msse2 | 103 vp8/encoder/x86/denoising_sse2.c.o: CFLAGS += -msse2 |
| 98 vp8/encoder/x86/denoising_sse2.c.d: CFLAGS += -msse2 | 104 vp8/encoder/x86/denoising_sse2.c.d: CFLAGS += -msse2 |
| 99 endif | 105 endif |
| 100 endif | 106 endif |
| 101 | 107 |
| 102 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/subtract_sse2.asm | 108 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/subtract_sse2.asm |
| 103 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm | 109 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm |
| 104 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp8_enc_stubs_sse2.c | 110 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp8_enc_stubs_sse2.c |
| 105 VP8_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/quantize_ssse3.asm | 111 VP8_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/quantize_ssse3.asm |
| 106 VP8_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/quantize_sse4.asm | 112 VP8_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/quantize_sse4.asm |
| 107 VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/quantize_mmx.asm | 113 VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/quantize_mmx.asm |
| 108 VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/encodeopt.asm | 114 VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/encodeopt.asm |
| 109 VP8_CX_SRCS-$(ARCH_X86_64) += encoder/x86/ssim_opt.asm | 115 VP8_CX_SRCS-$(ARCH_X86_64) += encoder/x86/ssim_opt.asm |
| 110 | 116 |
| 111 ifeq ($(CONFIG_REALTIME_ONLY),yes) | 117 ifeq ($(CONFIG_REALTIME_ONLY),yes) |
| 112 VP8_CX_SRCS_REMOVE-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm | 118 VP8_CX_SRCS_REMOVE-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm |
| 113 endif | 119 endif |
| 114 | 120 |
| 115 | |
| 116 VP8_CX_SRCS-yes := $(filter-out $(VP8_CX_SRCS_REMOVE-yes),$(VP8_CX_SRCS-yes)) | 121 VP8_CX_SRCS-yes := $(filter-out $(VP8_CX_SRCS_REMOVE-yes),$(VP8_CX_SRCS-yes)) |
| 117 | 122 |
| 118 $(eval $(call asm_offsets_template,\ | 123 $(eval $(call asm_offsets_template,\ |
| 119 vp8_asm_enc_offsets.asm, $(VP8_PREFIX)encoder/asm_enc_offsets.c)) | 124 vp8_asm_enc_offsets.asm, $(VP8_PREFIX)encoder/vp8_asm_enc_offsets.c)) |
| OLD | NEW |