Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(332)

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

Issue 11974002: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years, 11 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 13 matching lines...) Expand all
24 #INCLUDES += common 24 #INCLUDES += common
25 #INCLUDES += algo/vpx_ref/cpu_id/include 25 #INCLUDES += algo/vpx_ref/cpu_id/include
26 #INCLUDES += common 26 #INCLUDES += common
27 #INCLUDES += encoder 27 #INCLUDES += encoder
28 28
29 VP9_CX_SRCS-yes += encoder/vp9_asm_enc_offsets.c 29 VP9_CX_SRCS-yes += encoder/vp9_asm_enc_offsets.c
30 VP9_CX_SRCS-yes += encoder/vp9_bitstream.c 30 VP9_CX_SRCS-yes += encoder/vp9_bitstream.c
31 VP9_CX_SRCS-yes += encoder/vp9_boolhuff.c 31 VP9_CX_SRCS-yes += encoder/vp9_boolhuff.c
32 VP9_CX_SRCS-yes += encoder/vp9_dct.c 32 VP9_CX_SRCS-yes += encoder/vp9_dct.c
33 VP9_CX_SRCS-yes += encoder/vp9_encodeframe.c 33 VP9_CX_SRCS-yes += encoder/vp9_encodeframe.c
34 VP9_CX_SRCS-yes += encoder/vp9_encodeframe.h
34 VP9_CX_SRCS-yes += encoder/vp9_encodeintra.c 35 VP9_CX_SRCS-yes += encoder/vp9_encodeintra.c
35 VP9_CX_SRCS-yes += encoder/vp9_encodemb.c 36 VP9_CX_SRCS-yes += encoder/vp9_encodemb.c
36 VP9_CX_SRCS-yes += encoder/vp9_encodemv.c 37 VP9_CX_SRCS-yes += encoder/vp9_encodemv.c
37 VP9_CX_SRCS-yes += encoder/vp9_firstpass.c 38 VP9_CX_SRCS-yes += encoder/vp9_firstpass.c
38 VP9_CX_SRCS-yes += encoder/vp9_block.h 39 VP9_CX_SRCS-yes += encoder/vp9_block.h
39 VP9_CX_SRCS-yes += encoder/vp9_boolhuff.h 40 VP9_CX_SRCS-yes += encoder/vp9_boolhuff.h
40 VP9_CX_SRCS-yes += encoder/vp9_bitstream.h 41 VP9_CX_SRCS-yes += encoder/vp9_bitstream.h
41 VP9_CX_SRCS-yes += encoder/vp9_encodeintra.h 42 VP9_CX_SRCS-yes += encoder/vp9_encodeintra.h
42 VP9_CX_SRCS-yes += encoder/vp9_encodemb.h 43 VP9_CX_SRCS-yes += encoder/vp9_encodemb.h
43 VP9_CX_SRCS-yes += encoder/vp9_encodemv.h 44 VP9_CX_SRCS-yes += encoder/vp9_encodemv.h
44 VP9_CX_SRCS-yes += encoder/vp9_firstpass.h 45 VP9_CX_SRCS-yes += encoder/vp9_firstpass.h
45 VP9_CX_SRCS-yes += encoder/vp9_lookahead.c 46 VP9_CX_SRCS-yes += encoder/vp9_lookahead.c
46 VP9_CX_SRCS-yes += encoder/vp9_lookahead.h 47 VP9_CX_SRCS-yes += encoder/vp9_lookahead.h
47 VP9_CX_SRCS-yes += encoder/vp9_mcomp.h 48 VP9_CX_SRCS-yes += encoder/vp9_mcomp.h
48 VP9_CX_SRCS-yes += encoder/vp9_modecosts.h 49 VP9_CX_SRCS-yes += encoder/vp9_modecosts.h
49 VP9_CX_SRCS-yes += encoder/vp9_onyx_int.h 50 VP9_CX_SRCS-yes += encoder/vp9_onyx_int.h
50 VP9_CX_SRCS-yes += encoder/vp9_psnr.h 51 VP9_CX_SRCS-yes += encoder/vp9_psnr.h
51 VP9_CX_SRCS-yes += encoder/vp9_quantize.h 52 VP9_CX_SRCS-yes += encoder/vp9_quantize.h
52 VP9_CX_SRCS-yes += encoder/vp9_ratectrl.h 53 VP9_CX_SRCS-yes += encoder/vp9_ratectrl.h
53 VP9_CX_SRCS-yes += encoder/vp9_rdopt.h 54 VP9_CX_SRCS-yes += encoder/vp9_rdopt.h
54 VP9_CX_SRCS-yes += encoder/vp9_tokenize.h 55 VP9_CX_SRCS-yes += encoder/vp9_tokenize.h
55 VP9_CX_SRCS-yes += encoder/vp9_treewriter.h 56 VP9_CX_SRCS-yes += encoder/vp9_treewriter.h
56 VP9_CX_SRCS-yes += encoder/vp9_variance.h 57 VP9_CX_SRCS-yes += encoder/vp9_variance.h
57 VP9_CX_SRCS-yes += encoder/vp9_mcomp.c 58 VP9_CX_SRCS-yes += encoder/vp9_mcomp.c
58 VP9_CX_SRCS-yes += encoder/vp9_modecosts.c 59 VP9_CX_SRCS-yes += encoder/vp9_modecosts.c
59 VP9_CX_SRCS-yes += encoder/vp9_onyx_if.c 60 VP9_CX_SRCS-yes += encoder/vp9_onyx_if.c
60 VP9_CX_SRCS-yes += encoder/vp9_picklpf.c 61 VP9_CX_SRCS-yes += encoder/vp9_picklpf.c
62 VP9_CX_SRCS-yes += encoder/vp9_picklpf.h
61 VP9_CX_SRCS-yes += encoder/vp9_psnr.c 63 VP9_CX_SRCS-yes += encoder/vp9_psnr.c
62 VP9_CX_SRCS-yes += encoder/vp9_quantize.c 64 VP9_CX_SRCS-yes += encoder/vp9_quantize.c
63 VP9_CX_SRCS-yes += encoder/vp9_ratectrl.c 65 VP9_CX_SRCS-yes += encoder/vp9_ratectrl.c
64 VP9_CX_SRCS-yes += encoder/vp9_rdopt.c 66 VP9_CX_SRCS-yes += encoder/vp9_rdopt.c
65 VP9_CX_SRCS-yes += encoder/vp9_sad_c.c 67 VP9_CX_SRCS-yes += encoder/vp9_sad_c.c
66 VP9_CX_SRCS-yes += encoder/vp9_satd_c.c 68 VP9_CX_SRCS-yes += encoder/vp9_satd_c.c
67 VP9_CX_SRCS-yes += encoder/vp9_segmentation.c 69 VP9_CX_SRCS-yes += encoder/vp9_segmentation.c
68 VP9_CX_SRCS-yes += encoder/vp9_segmentation.h 70 VP9_CX_SRCS-yes += encoder/vp9_segmentation.h
69 VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_ssim.c 71 VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_ssim.c
70 VP9_CX_SRCS-yes += encoder/vp9_tokenize.c 72 VP9_CX_SRCS-yes += encoder/vp9_tokenize.c
71 VP9_CX_SRCS-yes += encoder/vp9_treewriter.c 73 VP9_CX_SRCS-yes += encoder/vp9_treewriter.c
72 VP9_CX_SRCS-yes += encoder/vp9_variance_c.c 74 VP9_CX_SRCS-yes += encoder/vp9_variance_c.c
73 ifeq ($(CONFIG_POSTPROC),yes) 75 ifeq ($(CONFIG_POSTPROC),yes)
74 VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/vp9_postproc.h 76 VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/vp9_postproc.h
75 VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/vp9_postproc.c 77 VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/vp9_postproc.c
76 endif 78 endif
77 VP9_CX_SRCS-yes += encoder/vp9_temporal_filter.c 79 VP9_CX_SRCS-yes += encoder/vp9_temporal_filter.c
78 VP9_CX_SRCS-yes += encoder/vp9_temporal_filter.h 80 VP9_CX_SRCS-yes += encoder/vp9_temporal_filter.h
79 VP9_CX_SRCS-yes += encoder/vp9_mbgraph.c 81 VP9_CX_SRCS-yes += encoder/vp9_mbgraph.c
80 VP9_CX_SRCS-yes += encoder/vp9_mbgraph.h 82 VP9_CX_SRCS-yes += encoder/vp9_mbgraph.h
81 83
82 84
83 VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_mcomp_x86.h 85 VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_mcomp_x86.h
84 VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_quantize_x86.h 86 VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_quantize_x86.h
85 VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_x86_csystemdependent.c 87 VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_x86_csystemdependent.c
86 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_variance_mmx.c 88 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_variance_mmx.c
87 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_variance_impl_mmx.asm 89 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_variance_impl_mmx.asm
88 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_sad_mmx.asm 90 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_sad_mmx.asm
89 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_dct_mmx.asm 91 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_dct_mmx.asm
92 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_dct_mmx.h
90 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_subtract_mmx.asm 93 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_subtract_mmx.asm
91 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.asm 94 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.asm
92 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_variance_sse2.c 95 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_variance_sse2.c
93 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_variance_impl_sse2.asm 96 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_variance_impl_sse2.asm
94 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad_sse2.asm 97 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad_sse2.asm
95 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_fwalsh_sse2.asm 98 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_fwalsh_sse2.asm
96 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_quantize_sse2.asm 99 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_quantize_sse2.asm
97 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subtract_sse2.asm 100 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subtract_sse2.asm
98 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_temporal_filter_apply_sse2.asm 101 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_temporal_filter_apply_sse2.asm
99 VP9_CX_SRCS-$(HAVE_SSE3) += encoder/x86/vp9_sad_sse3.asm 102 VP9_CX_SRCS-$(HAVE_SSE3) += encoder/x86/vp9_sad_sse3.asm
100 VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_sad_ssse3.asm 103 VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_sad_ssse3.asm
101 VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_variance_ssse3.c 104 VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_variance_ssse3.c
102 VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_variance_impl_ssse3.asm 105 VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_variance_impl_ssse3.asm
103 VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_quantize_ssse3.asm 106 VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_quantize_ssse3.asm
104 VP9_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/vp9_sad_sse4.asm 107 VP9_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/vp9_sad_sse4.asm
105 VP9_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/vp9_quantize_sse4.asm 108 VP9_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/vp9_quantize_sse4.asm
106 VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_quantize_mmx.asm 109 VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_quantize_mmx.asm
107 VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_encodeopt.asm 110 VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_encodeopt.asm
108 VP9_CX_SRCS-$(ARCH_X86_64) += encoder/x86/vp9_ssim_opt.asm 111 VP9_CX_SRCS-$(ARCH_X86_64) += encoder/x86/vp9_ssim_opt.asm
109 112
110 113
111 VP9_CX_SRCS-yes := $(filter-out $(VP9_CX_SRCS_REMOVE-yes),$(VP9_CX_SRCS-yes)) 114 VP9_CX_SRCS-yes := $(filter-out $(VP9_CX_SRCS_REMOVE-yes),$(VP9_CX_SRCS-yes))
112 115
113 $(eval $(call asm_offsets_template,\ 116 $(eval $(call asm_offsets_template,\
114 vp9_asm_enc_offsets.asm, $(VP9_PREFIX)encoder/vp9_asm_enc_offsets.c)) 117 vp9_asm_enc_offsets.asm, $(VP9_PREFIX)encoder/vp9_asm_enc_offsets.c))
OLDNEW
« no previous file with comments | « source/libvpx/vp9/vp9_dx_iface.c ('k') | source/libvpx/vp9/vp9dx.mk » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698