source/libvpx/vp8/vp8cx.mk - Issue 1302353004: libvpx: Pull from upstream

Side by Side Diff: source/libvpx/vp8/vp8cx.mk

Issue 1302353004: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master

Patch Set: Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « source/libvpx/vp8/vp8_dx_iface.c ('k') | source/libvpx/vp9/common/arm/neon/vp9_save_reg_neon.asm » ('j') | no next file with comments »

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

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
58 VP8_CX_SRCS-yes += encoder/mcomp.c	58 VP8_CX_SRCS-yes += encoder/mcomp.c

59 VP8_CX_SRCS-yes += encoder/modecosts.c	59 VP8_CX_SRCS-yes += encoder/modecosts.c

60 VP8_CX_SRCS-yes += encoder/onyx_if.c	60 VP8_CX_SRCS-yes += encoder/onyx_if.c

61 VP8_CX_SRCS-yes += encoder/pickinter.c	61 VP8_CX_SRCS-yes += encoder/pickinter.c

62 VP8_CX_SRCS-yes += encoder/picklpf.c	62 VP8_CX_SRCS-yes += encoder/picklpf.c

63 VP8_CX_SRCS-yes += encoder/vp8_quantize.c	63 VP8_CX_SRCS-yes += encoder/vp8_quantize.c

64 VP8_CX_SRCS-yes += encoder/ratectrl.c	64 VP8_CX_SRCS-yes += encoder/ratectrl.c

65 VP8_CX_SRCS-yes += encoder/rdopt.c	65 VP8_CX_SRCS-yes += encoder/rdopt.c

66 VP8_CX_SRCS-yes += encoder/segmentation.c	66 VP8_CX_SRCS-yes += encoder/segmentation.c

67 VP8_CX_SRCS-yes += encoder/segmentation.h	67 VP8_CX_SRCS-yes += encoder/segmentation.h

68 VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/ssim.c

69 VP8_CX_SRCS-yes += encoder/tokenize.c	68 VP8_CX_SRCS-yes += encoder/tokenize.c

70 VP8_CX_SRCS-yes += encoder/dct_value_cost.h	69 VP8_CX_SRCS-yes += encoder/dct_value_cost.h

71 VP8_CX_SRCS-yes += encoder/dct_value_tokens.h	70 VP8_CX_SRCS-yes += encoder/dct_value_tokens.h

72 VP8_CX_SRCS-yes += encoder/treewriter.c	71 VP8_CX_SRCS-yes += encoder/treewriter.c

73 VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.h	72 VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.h

74 VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.c	73 VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.c

75 VP8_CX_SRCS-yes += encoder/temporal_filter.c	74 VP8_CX_SRCS-yes += encoder/temporal_filter.c

76 VP8_CX_SRCS-$(CONFIG_MULTI_RES_ENCODING) += encoder/mr_dissim.c	75 VP8_CX_SRCS-$(CONFIG_MULTI_RES_ENCODING) += encoder/mr_dissim.c

77 VP8_CX_SRCS-$(CONFIG_MULTI_RES_ENCODING) += encoder/mr_dissim.h	76 VP8_CX_SRCS-$(CONFIG_MULTI_RES_ENCODING) += encoder/mr_dissim.h

78	77

(...skipping 11 matching lines...) Expand all Loading...
90 VP8_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/quantize_sse4.c	89 VP8_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/quantize_sse4.c

91	90

92 ifeq ($(CONFIG_TEMPORAL_DENOISING),yes)	91 ifeq ($(CONFIG_TEMPORAL_DENOISING),yes)

93 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/denoising_sse2.c	92 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/denoising_sse2.c

94 endif	93 endif

95	94

96 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm	95 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm

97 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp8_enc_stubs_sse2.c	96 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp8_enc_stubs_sse2.c

98 VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/quantize_mmx.asm	97 VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/quantize_mmx.asm

99 VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/encodeopt.asm	98 VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/encodeopt.asm

100 VP8_CX_SRCS-$(ARCH_X86_64) += encoder/x86/ssim_opt_x86_64.asm

101	99

102 ifeq ($(CONFIG_REALTIME_ONLY),yes)	100 ifeq ($(CONFIG_REALTIME_ONLY),yes)

103 VP8_CX_SRCS_REMOVE-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm	101 VP8_CX_SRCS_REMOVE-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm

104 endif	102 endif

105	103

106 VP8_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/dct_msa.c	104 VP8_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/dct_msa.c

107 VP8_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/encodeopt_msa.c	105 VP8_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/encodeopt_msa.c

108 VP8_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/quantize_msa.c	106 VP8_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/quantize_msa.c

109 VP8_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/temporal_filter_msa.c	107 VP8_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/temporal_filter_msa.c

110	108

	109 ifeq ($(CONFIG_TEMPORAL_DENOISING),yes)

	110 VP8_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/denoising_msa.c

	111 endif

	112

111 ifeq ($(CONFIG_REALTIME_ONLY),yes)	113 ifeq ($(CONFIG_REALTIME_ONLY),yes)

112 VP8_CX_SRCS_REMOVE-$(HAVE_MSA) += encoder/mips/msa/temporal_filter_msa.c	114 VP8_CX_SRCS_REMOVE-$(HAVE_MSA) += encoder/mips/msa/temporal_filter_msa.c

113 endif	115 endif

114	116

115 VP8_CX_SRCS-yes := $(filter-out $(VP8_CX_SRCS_REMOVE-yes),$(VP8_CX_SRCS-yes))	117 VP8_CX_SRCS-yes := $(filter-out $(VP8_CX_SRCS_REMOVE-yes),$(VP8_CX_SRCS-yes))

OLD	NEW