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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: gyp/libjpeg-turbo.gyp

Issue 1180983002: Switch SkJpegCode to libjpeg-turbo (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase 2 Created 5 years, 6 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 | « gyp/codec.gyp ('k') | src/codec/SkJpegCodec.h » ('j') | src/codec/SkJpegCodec.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
scroggo 2015/06/19 16:11:25 I started to correct this with a Skia copyright (w
msarett 2015/06/22 22:36:04 Yeah I'm certainly adding modifications, but I thi
2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file.
4
5 {
6 # This file is not used when use_system_libjpeg==1. Settings for building with
scroggo 2015/06/19 16:11:25 When do we ever want to build with the system libj
msarett 2015/06/22 22:36:04 I don't think we ever do. I need to remove this c
7 # the system libjpeg is in third_party/libjpeg/libjpeg.gyp.
8 'variables': {
9 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turb o',
10 'conditions': [
11 [ 'OS=="win"', {
12 'object_suffix': 'obj',
13 }, {
14 'object_suffix': 'o',
15 }],
16 ],
17 },
18 'targets': [
19 {
20 'target_name': 'libjpeg-turbo',
21 'type': 'static_library',
22 'include_dirs': [
23 '../third_party/libjpeg-turbo/libjpeg-turbo-code/',
24 ],
25 'defines': [
26 'WITH_SIMD',
27 'MOTION_JPEG_SUPPORTED',
28 'NO_GETENV',
29 ],
30 'cflags': [
31 '-w', # supresses warnings
32 ],
33 'sources': [
34 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jaricom.c',
35 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jcapimin.c',
36 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jcapistd.c',
37 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jcarith.c',
38 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jccoefct.c',
39 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jccolor.c',
40 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jcdctmgr.c',
41 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jchuff.c',
42 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jchuff.h',
43 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jcinit.c',
44 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jcmainct.c',
45 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jcmarker.c',
46 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jcmaster.c',
47 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jcomapi.c',
48 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jconfig.h',
49 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jcparam.c',
50 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jcphuff.c',
51 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jcprepct.c',
52 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jcsample.c',
53 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jdapimin.c',
54 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jdapistd.c',
55 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jdarith.c',
56 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jdatadst.c',
57 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jdatasrc.c',
58 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jdcoefct.c',
59 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jdcolor.c',
60 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jdct.h',
61 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jddctmgr.c',
62 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jdhuff.c',
63 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jdhuff.h',
64 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jdinput.c',
65 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jdmainct.c',
66 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jdmarker.c',
67 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jdmaster.c',
68 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jdmerge.c',
69 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jdphuff.c',
70 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jdpostct.c',
71 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jdsample.c',
72 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jerror.c',
73 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jerror.h',
74 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jfdctflt.c',
75 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jfdctfst.c',
76 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jfdctint.c',
77 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jidctflt.c',
78 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jidctfst.c',
79 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jidctint.c',
80 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jidctred.c',
81 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jinclude.h',
82 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jmemmgr.c',
83 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jmemnobs.c',
84 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jmemsys.h',
85 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jmorecfg.h',
86 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jpegint.h',
87 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jpeglib.h',
88 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jpeglibmangler.h',
89 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jquant1.c',
90 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jquant2.c',
91 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jutils.c',
92 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jversion.h',
93 ],
94 'direct_dependent_settings': {
95 'include_dirs': [
96 '../third_party/libjpeg-turbo/libjpeg-turbo-code/',
97 ],
98 },
99 'msvs_disabled_warnings': [4018, 4101],
100 # VS2010 does not correctly incrementally link obj files generated
101 # from asm files. This flag disables UseLibraryDependencyInputs to
102 # avoid this problem.
103 'msvs_2010_disable_uldi_when_referenced': 1,
104 'conditions': [
105 [ 'OS!="win"', {'product_name': 'jpeg_turbo'}],
106 # Add target-specific source files.
107 [ 'skia_arch_type=="x86"', {
108 'sources': [
109 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jsimd_i386.c',
110 #'../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jccolext-mmx. asm',
111 #'../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jccolext-sse2 .asm',
112 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jccolor-mmx.as m',
113 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jccolor-sse2.a sm',
114 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jcgray-mmx.asm ',
115 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jcgray-sse2.as m',
116 #'../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jcgryext-mmx. asm',
117 #'../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jcgryext-sse2 .asm',
118 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jcsample-mmx.a sm',
119 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jcsample-sse2. asm',
120 #'../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jdcolext-mmx. asm',
121 #'../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jdcolext-sse2 .asm',
122 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jdcolor-mmx.as m',
123 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jdcolor-sse2.a sm',
124 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jdmerge-mmx.as m',
125 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jdmerge-sse2.a sm',
126 #'../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jdmrgext-mmx. asm',
127 #'../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jdmrgext-sse2 .asm',
128 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jdsample-mmx.a sm',
129 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jdsample-sse2. asm',
130 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jfdctflt-3dn.a sm',
131 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jfdctflt-sse.a sm',
132 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jfdctfst-mmx.a sm',
133 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jfdctfst-sse2. asm',
134 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jfdctint-mmx.a sm',
135 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jfdctint-sse2. asm',
136 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jidctflt-3dn.a sm',
137 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jidctflt-sse2. asm',
138 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jidctflt-sse.a sm',
139 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jidctfst-mmx.a sm',
140 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jidctfst-sse2. asm',
141 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jidctint-mmx.a sm',
142 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jidctint-sse2. asm',
143 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jidctred-mmx.a sm',
144 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jidctred-sse2. asm',
145 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jquant-3dn.asm ',
146 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jquantf-sse2.a sm',
147 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jquanti-sse2.a sm',
148 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jquant-mmx.asm ',
149 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jquant-sse.asm ',
150 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jsimdcpu.asm',
151 ],
152 }],
153 [ 'skia_arch_type=="x86_64"', {
154 'sources': [
155 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jsimd_x86_64.c ',
156 #'../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jccolext-sse2 -64.asm',
157 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jccolor-sse2-6 4.asm',
158 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jcgray-sse2-64 .asm',
159 #'../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jcgryext-sse2 -64.asm',
160 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jcsample-sse2- 64.asm',
161 #'../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jdcolext-sse2 -64.asm',
162 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jdcolor-sse2-6 4.asm',
163 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jdmerge-sse2-6 4.asm',
164 #'../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jdmrgext-sse2 -64.asm',
165 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jdsample-sse2- 64.asm',
166 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jfdctflt-sse-6 4.asm',
167 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jfdctfst-sse2- 64.asm',
168 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jfdctint-sse2- 64.asm',
169 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jidctflt-sse2- 64.asm',
170 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jidctfst-sse2- 64.asm',
171 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jidctint-sse2- 64.asm',
172 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jidctred-sse2- 64.asm',
173 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jquantf-sse2-6 4.asm',
174 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jquanti-sse2-6 4.asm',
175 ],
176 }],
177 # The ARM SIMD implementation can be used for devices that support
178 # the NEON instruction set. This can safely be done dynamically by
179 # probing CPU features at runtime, if you wish.
180 [ 'skia_arch_type=="arm"', {
181 'conditions': [
182 [ 'arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', {
183 'sources': [
184 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jsimd_arm. c',
185 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jsimd_arm_ neon.S',
186 ],
187 }, {
188 'sources': [
189 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jsimd_none.c',
190 ],
191 }]
192 ],
193 }],
194 [ 'skia_arch_type=="arm64"', {
195 'sources': [
196 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jsimd_arm64.c' ,
197 '../third_party/libjpeg-turbo/libjpeg-turbo-code/simd/jsimd_arm64_ne on.S',
198 ],
199 }],
200 [ 'skia_arch_type=="mipsel" or skia_arch_type=="mips64el"', {
201 'sources': [
202 '../third_party/libjpeg-turbo/libjpeg-turbo-code/jsimd_none.c',
203 ],
204 }],
205 ],
206 'variables': {
207 'yasm_path': '<!(which yasm)',
208 'conditions': [
209 [ 'skia_arch_type=="x86"', {
210 'yasm_format': '-felf',
211 'yasm_flags': [
212 '-D__x86__',
213 '-DELF',
214 '-Ilinux/'
215 ],
216 }, {
217 'yasm_format': '-felf64',
218 'yasm_flags': [
219 '-D__x86_64__',
220 '-DELF',
221 '-Ilinux/'
222 ],
223 }],
224 ],
225 },
226 'rules': [
227 {
228 'rule_name': 'assemble',
229 'extension': 'asm',
230 'conditions': [
231 [ 'skia_arch_type=="x86" or skia_arch_type=="x86_64"', {
232 'inputs': [ '<(yasm_path)', ],
233 'outputs': [
234 '<(shared_generated_dir)/<(RULE_INPUT_ROOT).<(object_suffix)',
235 ],
236 'action': [
237 '<(yasm_path)',
238 '<(yasm_format)',
239 '<@(yasm_flags)',
240 '-DRGBX_FILLER_0XFF',
241 '-DSTRICT_MEMORY_ACCESS',
242 '-Isimd/',
243 '-o', '<(shared_generated_dir)/<(RULE_INPUT_ROOT).<(object_suffi x)',
244 '<(RULE_INPUT_PATH)',
245 ],
246 'process_outputs_as_sources': 1,
247 'message': 'Building <(RULE_INPUT_ROOT).<(object_suffix)',
248 }],
249 ]
250 },
251 ],
252 },
253 ],
254 }
OLDNEW
« no previous file with comments | « gyp/codec.gyp ('k') | src/codec/SkJpegCodec.h » ('j') | src/codec/SkJpegCodec.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698