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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gyp/libjpeg-turbo.gyp

Issue 1530933003: Use possible read_partial_scanlines() API in SkJpegCodec (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Response to comments and further testing Created 5 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/codec.gyp ('k') | src/codec/SkCodec.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/libjpeg-turbo.gyp
diff --git a/gyp/libjpeg-turbo.gyp b/gyp/libjpeg-turbo.gyp
index 407fccaff018ca1d478c4b08b9d79f93fa5a1ec0..222290529c9e7e13832835a2f495f10515ba2d8c 100644
--- a/gyp/libjpeg-turbo.gyp
+++ b/gyp/libjpeg-turbo.gyp
@@ -32,7 +32,7 @@
'target_name': 'libjpeg-turbo',
'type': 'static_library',
'include_dirs': [
- '../third_party/externals/libjpeg-turbo/',
+ '../turbo/libjpeg-turbo/',
],
'defines': [
'WITH_SIMD',
@@ -53,63 +53,63 @@
],
},
'sources': [
- '../third_party/externals/libjpeg-turbo/jcapimin.c',
- '../third_party/externals/libjpeg-turbo/jcapistd.c',
- '../third_party/externals/libjpeg-turbo/jccoefct.c',
- '../third_party/externals/libjpeg-turbo/jccolor.c',
- '../third_party/externals/libjpeg-turbo/jcdctmgr.c',
- '../third_party/externals/libjpeg-turbo/jchuff.c',
- '../third_party/externals/libjpeg-turbo/jchuff.h',
- '../third_party/externals/libjpeg-turbo/jcinit.c',
- '../third_party/externals/libjpeg-turbo/jcmainct.c',
- '../third_party/externals/libjpeg-turbo/jcmarker.c',
- '../third_party/externals/libjpeg-turbo/jcmaster.c',
- '../third_party/externals/libjpeg-turbo/jcomapi.c',
- '../third_party/externals/libjpeg-turbo/jconfig.h',
- '../third_party/externals/libjpeg-turbo/jcparam.c',
- '../third_party/externals/libjpeg-turbo/jcphuff.c',
- '../third_party/externals/libjpeg-turbo/jcprepct.c',
- '../third_party/externals/libjpeg-turbo/jcsample.c',
- '../third_party/externals/libjpeg-turbo/jdapimin.c',
- '../third_party/externals/libjpeg-turbo/jdapistd.c',
- '../third_party/externals/libjpeg-turbo/jdcoefct.c',
- '../third_party/externals/libjpeg-turbo/jdcolor.c',
- '../third_party/externals/libjpeg-turbo/jdct.h',
- '../third_party/externals/libjpeg-turbo/jddctmgr.c',
- '../third_party/externals/libjpeg-turbo/jdhuff.c',
- '../third_party/externals/libjpeg-turbo/jdhuff.h',
- '../third_party/externals/libjpeg-turbo/jdinput.c',
- '../third_party/externals/libjpeg-turbo/jdmainct.c',
- '../third_party/externals/libjpeg-turbo/jdmarker.c',
- '../third_party/externals/libjpeg-turbo/jdmaster.c',
- '../third_party/externals/libjpeg-turbo/jdmerge.c',
- '../third_party/externals/libjpeg-turbo/jdphuff.c',
- '../third_party/externals/libjpeg-turbo/jdpostct.c',
- '../third_party/externals/libjpeg-turbo/jdsample.c',
- '../third_party/externals/libjpeg-turbo/jerror.c',
- '../third_party/externals/libjpeg-turbo/jerror.h',
- '../third_party/externals/libjpeg-turbo/jfdctflt.c',
- '../third_party/externals/libjpeg-turbo/jfdctfst.c',
- '../third_party/externals/libjpeg-turbo/jfdctint.c',
- '../third_party/externals/libjpeg-turbo/jidctflt.c',
- '../third_party/externals/libjpeg-turbo/jidctfst.c',
- '../third_party/externals/libjpeg-turbo/jidctint.c',
- '../third_party/externals/libjpeg-turbo/jidctred.c',
- '../third_party/externals/libjpeg-turbo/jinclude.h',
- '../third_party/externals/libjpeg-turbo/jmemmgr.c',
- '../third_party/externals/libjpeg-turbo/jmemnobs.c',
- '../third_party/externals/libjpeg-turbo/jmemsys.h',
- '../third_party/externals/libjpeg-turbo/jmorecfg.h',
- '../third_party/externals/libjpeg-turbo/jpegint.h',
- '../third_party/externals/libjpeg-turbo/jpeglib.h',
- '../third_party/externals/libjpeg-turbo/jquant1.c',
- '../third_party/externals/libjpeg-turbo/jquant2.c',
- '../third_party/externals/libjpeg-turbo/jutils.c',
- '../third_party/externals/libjpeg-turbo/jversion.h',
+ '../turbo/libjpeg-turbo/jcapimin.c',
+ '../turbo/libjpeg-turbo/jcapistd.c',
+ '../turbo/libjpeg-turbo/jccoefct.c',
+ '../turbo/libjpeg-turbo/jccolor.c',
+ '../turbo/libjpeg-turbo/jcdctmgr.c',
+ '../turbo/libjpeg-turbo/jchuff.c',
+ '../turbo/libjpeg-turbo/jchuff.h',
+ '../turbo/libjpeg-turbo/jcinit.c',
+ '../turbo/libjpeg-turbo/jcmainct.c',
+ '../turbo/libjpeg-turbo/jcmarker.c',
+ '../turbo/libjpeg-turbo/jcmaster.c',
+ '../turbo/libjpeg-turbo/jcomapi.c',
+ '../turbo/libjpeg-turbo/jconfig.h',
+ '../turbo/libjpeg-turbo/jcparam.c',
+ '../turbo/libjpeg-turbo/jcphuff.c',
+ '../turbo/libjpeg-turbo/jcprepct.c',
+ '../turbo/libjpeg-turbo/jcsample.c',
+ '../turbo/libjpeg-turbo/jdapimin.c',
+ '../turbo/libjpeg-turbo/jdapistd.c',
+ '../turbo/libjpeg-turbo/jdcoefct.c',
+ '../turbo/libjpeg-turbo/jdcolor.c',
+ '../turbo/libjpeg-turbo/jdct.h',
+ '../turbo/libjpeg-turbo/jddctmgr.c',
+ '../turbo/libjpeg-turbo/jdhuff.c',
+ '../turbo/libjpeg-turbo/jdhuff.h',
+ '../turbo/libjpeg-turbo/jdinput.c',
+ '../turbo/libjpeg-turbo/jdmainct.c',
+ '../turbo/libjpeg-turbo/jdmarker.c',
+ '../turbo/libjpeg-turbo/jdmaster.c',
+ '../turbo/libjpeg-turbo/jdmerge.c',
+ '../turbo/libjpeg-turbo/jdphuff.c',
+ '../turbo/libjpeg-turbo/jdpostct.c',
+ '../turbo/libjpeg-turbo/jdsample.c',
+ '../turbo/libjpeg-turbo/jerror.c',
+ '../turbo/libjpeg-turbo/jerror.h',
+ '../turbo/libjpeg-turbo/jfdctflt.c',
+ '../turbo/libjpeg-turbo/jfdctfst.c',
+ '../turbo/libjpeg-turbo/jfdctint.c',
+ '../turbo/libjpeg-turbo/jidctflt.c',
+ '../turbo/libjpeg-turbo/jidctfst.c',
+ '../turbo/libjpeg-turbo/jidctint.c',
+ '../turbo/libjpeg-turbo/jidctred.c',
+ '../turbo/libjpeg-turbo/jinclude.h',
+ '../turbo/libjpeg-turbo/jmemmgr.c',
+ '../turbo/libjpeg-turbo/jmemnobs.c',
+ '../turbo/libjpeg-turbo/jmemsys.h',
+ '../turbo/libjpeg-turbo/jmorecfg.h',
+ '../turbo/libjpeg-turbo/jpegint.h',
+ '../turbo/libjpeg-turbo/jpeglib.h',
+ '../turbo/libjpeg-turbo/jquant1.c',
+ '../turbo/libjpeg-turbo/jquant2.c',
+ '../turbo/libjpeg-turbo/jutils.c',
+ '../turbo/libjpeg-turbo/jversion.h',
],
'direct_dependent_settings': {
'include_dirs': [
- '../third_party/externals/libjpeg-turbo/',
+ '../turbo/libjpeg-turbo/',
],
},
'msvs_disabled_warnings': [4018, 4101],
@@ -123,83 +123,84 @@
# TODO (msarett): Is it possible to enable cross compiling for Android on other platforms?
[ 'skia_os == "android" and host_os != "linux" and "x86" in skia_arch_type', {
'sources': [
- '../third_party/externals/libjpeg-turbo/jsimd_none.c',
+ '../turbo/libjpeg-turbo/jsimd_none.c',
],
}],
[ 'skia_arch_type == "x86" and (skia_os != "android" or host_os == "linux")', {
'sources': [
- '../third_party/externals/libjpeg-turbo/simd/jsimd_i386.c',
- '../third_party/externals/libjpeg-turbo/simd/jccolor-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jcgray-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jcsample-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdcolor-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdcolor-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdmerge-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdmerge-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdsample-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdsample-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctflt-3dn.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctflt-sse.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctfst-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctfst-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctint-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctint-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctflt-3dn.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctflt-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctflt-sse.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctfst-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctfst-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctint-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctint-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctred-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctred-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jquant-3dn.asm',
- '../third_party/externals/libjpeg-turbo/simd/jquantf-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jquanti-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jquant-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jquant-sse.asm',
- '../third_party/externals/libjpeg-turbo/simd/jsimdcpu.asm',
+ '../turbo/libjpeg-turbo/simd/jsimd_i386.c',
+ '../turbo/libjpeg-turbo/simd/jccolor-mmx.asm',
+ '../turbo/libjpeg-turbo/simd/jccolor-sse2.asm',
+ '../turbo/libjpeg-turbo/simd/jcgray-mmx.asm',
+ '../turbo/libjpeg-turbo/simd/jcgray-sse2.asm',
+ '../turbo/libjpeg-turbo/simd/jcsample-mmx.asm',
+ '../turbo/libjpeg-turbo/simd/jcsample-sse2.asm',
+ '../turbo/libjpeg-turbo/simd/jdcolor-mmx.asm',
+ '../turbo/libjpeg-turbo/simd/jdcolor-sse2.asm',
+ '../turbo/libjpeg-turbo/simd/jdmerge-mmx.asm',
+ '../turbo/libjpeg-turbo/simd/jdmerge-sse2.asm',
+ '../turbo/libjpeg-turbo/simd/jdsample-mmx.asm',
+ '../turbo/libjpeg-turbo/simd/jdsample-sse2.asm',
+ '../turbo/libjpeg-turbo/simd/jfdctflt-3dn.asm',
+ '../turbo/libjpeg-turbo/simd/jfdctflt-sse.asm',
+ '../turbo/libjpeg-turbo/simd/jfdctfst-mmx.asm',
+ '../turbo/libjpeg-turbo/simd/jfdctfst-sse2.asm',
+ '../turbo/libjpeg-turbo/simd/jfdctint-mmx.asm',
+ '../turbo/libjpeg-turbo/simd/jfdctint-sse2.asm',
+ '../turbo/libjpeg-turbo/simd/jidctflt-3dn.asm',
+ '../turbo/libjpeg-turbo/simd/jidctflt-sse2.asm',
+ '../turbo/libjpeg-turbo/simd/jidctflt-sse.asm',
+ '../turbo/libjpeg-turbo/simd/jidctfst-mmx.asm',
+ '../turbo/libjpeg-turbo/simd/jidctfst-sse2.asm',
+ '../turbo/libjpeg-turbo/simd/jidctint-mmx.asm',
+ '../turbo/libjpeg-turbo/simd/jidctint-sse2.asm',
+ '../turbo/libjpeg-turbo/simd/jidctred-mmx.asm',
+ '../turbo/libjpeg-turbo/simd/jidctred-sse2.asm',
+ '../turbo/libjpeg-turbo/simd/jquant-3dn.asm',
+ '../turbo/libjpeg-turbo/simd/jquantf-sse2.asm',
+ '../turbo/libjpeg-turbo/simd/jquanti-sse2.asm',
+ '../turbo/libjpeg-turbo/simd/jquant-mmx.asm',
+ '../turbo/libjpeg-turbo/simd/jquant-sse.asm',
+ '../turbo/libjpeg-turbo/simd/jsimdcpu.asm',
],
}],
[ 'skia_arch_type == "x86_64" and (skia_os != "android" or host_os == "linux")', {
'sources': [
- '../third_party/externals/libjpeg-turbo/simd/jsimd_x86_64.c',
- '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdcolor-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdmerge-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdsample-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctflt-sse-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctfst-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctint-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctflt-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctfst-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctint-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctred-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jquantf-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jquanti-sse2-64.asm',
+ '../turbo/libjpeg-turbo/simd/jsimd_x86_64.c',
+ #'../turbo/libjpeg-turbo/jsimd_none.c',
+ '../turbo/libjpeg-turbo/simd/jccolor-sse2-64.asm',
+ '../turbo/libjpeg-turbo/simd/jcgray-sse2-64.asm',
+ '../turbo/libjpeg-turbo/simd/jcsample-sse2-64.asm',
+ '../turbo/libjpeg-turbo/simd/jdcolor-sse2-64.asm',
+ '../turbo/libjpeg-turbo/simd/jdmerge-sse2-64.asm',
+ '../turbo/libjpeg-turbo/simd/jdsample-sse2-64.asm',
+ '../turbo/libjpeg-turbo/simd/jfdctflt-sse-64.asm',
+ '../turbo/libjpeg-turbo/simd/jfdctfst-sse2-64.asm',
+ '../turbo/libjpeg-turbo/simd/jfdctint-sse2-64.asm',
+ '../turbo/libjpeg-turbo/simd/jidctflt-sse2-64.asm',
+ '../turbo/libjpeg-turbo/simd/jidctfst-sse2-64.asm',
+ '../turbo/libjpeg-turbo/simd/jidctint-sse2-64.asm',
+ '../turbo/libjpeg-turbo/simd/jidctred-sse2-64.asm',
+ '../turbo/libjpeg-turbo/simd/jquantf-sse2-64.asm',
+ '../turbo/libjpeg-turbo/simd/jquanti-sse2-64.asm',
],
}],
[ 'skia_arch_type == "arm64"', {
'sources': [
- '../third_party/externals/libjpeg-turbo/simd/jsimd_arm64.c',
- '../third_party/externals/libjpeg-turbo/simd/jsimd_arm64_neon.S',
+ '../turbo/libjpeg-turbo/simd/jsimd_arm64.c',
+ '../turbo/libjpeg-turbo/simd/jsimd_arm64_neon.S',
],
}],
[ 'skia_arch_type == "arm"', {
'conditions': [
[ 'arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', {
'sources': [
- '../third_party/externals/libjpeg-turbo/simd/jsimd_arm.c',
- '../third_party/externals/libjpeg-turbo/simd/jsimd_arm_neon.S',
+ '../turbo/libjpeg-turbo/simd/jsimd_arm.c',
+ '../turbo/libjpeg-turbo/simd/jsimd_arm_neon.S',
],
}, {
'sources': [
- '../third_party/externals/libjpeg-turbo/jsimd_none.c',
+ '../turbo/libjpeg-turbo/jsimd_none.c',
],
}],
],
@@ -208,7 +209,7 @@
# choose to update our copy of libjpeg-turbo we can enable mips simd.
[ '"mips" in skia_arch_type', {
'sources': [
- '../third_party/externals/libjpeg-turbo/jsimd_none.c',
+ '../turbo/libjpeg-turbo/jsimd_none.c',
],
}],
@@ -334,7 +335,7 @@
'<@(yasm_flags)',
'-DRGBX_FILLER_0XFF',
'-DSTRICT_MEMORY_ACCESS',
- '-Isimd/',
+ '-I../turbo/libjpeg-turbo/simd/',
'-o', '<(shared_generated_dir)/<(RULE_INPUT_ROOT).<(object_suffix)',
'<(RULE_INPUT_PATH)',
],
« no previous file with comments | « gyp/codec.gyp ('k') | src/codec/SkCodec.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698