source/libvpx/vp9/vp9cx.mk - Issue 23600008: libvpx: Pull from upstream

Side by Side Diff: source/libvpx/vp9/vp9cx.mk

Issue 23600008: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/

Patch Set: Created 7 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 | Annotate | Revision Log

« no previous file with comments | « source/libvpx/vp9/vp9_dx_iface.c ('k') | source/libvpx/vp9/vp9dx.mk » ('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 60 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
71 VP9_CX_SRCS-yes += encoder/vp9_temporal_filter.c	71 VP9_CX_SRCS-yes += encoder/vp9_temporal_filter.c

72 VP9_CX_SRCS-yes += encoder/vp9_temporal_filter.h	72 VP9_CX_SRCS-yes += encoder/vp9_temporal_filter.h

73 VP9_CX_SRCS-yes += encoder/vp9_mbgraph.c	73 VP9_CX_SRCS-yes += encoder/vp9_mbgraph.c

74 VP9_CX_SRCS-yes += encoder/vp9_mbgraph.h	74 VP9_CX_SRCS-yes += encoder/vp9_mbgraph.h

75	75

76	76

77 VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_mcomp_x86.h	77 VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_mcomp_x86.h

78 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_variance_mmx.c	78 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_variance_mmx.c

79 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_variance_impl_mmx.asm	79 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_variance_impl_mmx.asm

80 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_sad_mmx.asm	80 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_sad_mmx.asm

81 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_variance_sse2.c

82 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_variance_impl_sse2.asm	81 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_variance_impl_sse2.asm

83 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad_sse2.asm

84 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad4d_sse2.asm	82 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad4d_sse2.asm

85 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subpel_variance.asm

86 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subtract_sse2.asm

87 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_error_sse2.asm

88 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subpel_variance_impl_sse2.asm	83 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subpel_variance_impl_sse2.asm

89 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_temporal_filter_apply_sse2.asm	84 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_temporal_filter_apply_sse2.asm

90 VP9_CX_SRCS-$(HAVE_SSE3) += encoder/x86/vp9_sad_sse3.asm	85 VP9_CX_SRCS-$(HAVE_SSE3) += encoder/x86/vp9_sad_sse3.asm

	86

	87 ifeq ($(USE_X86INC),yes)

	88 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_error_sse2.asm

	89 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad_sse2.asm

	90 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subtract_sse2.asm

	91 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_variance_sse2.c

	92 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subpel_variance.asm

	93 endif

	94

91 ifeq ($(ARCH_X86_64),yes)	95 ifeq ($(ARCH_X86_64),yes)

92 VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_quantize_ssse3.asm	96 VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_quantize_ssse3.asm

93 endif	97 endif

94 VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_sad_ssse3.asm	98 VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_sad_ssse3.asm

95 VP9_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/vp9_sad_sse4.asm	99 VP9_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/vp9_sad_sse4.asm

96 VP9_CX_SRCS-$(ARCH_X86_64) += encoder/x86/vp9_ssim_opt.asm	100 VP9_CX_SRCS-$(ARCH_X86_64) += encoder/x86/vp9_ssim_opt.asm

97	101

98 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.c	102 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.c

	103 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct32x32_sse2.c

99	104

100 VP9_CX_SRCS-yes := $(filter-out $(VP9_CX_SRCS_REMOVE-yes),$(VP9_CX_SRCS-yes))	105 VP9_CX_SRCS-yes := $(filter-out $(VP9_CX_SRCS_REMOVE-yes),$(VP9_CX_SRCS-yes))

OLD	NEW