Skip to content

Commit e7a4df6

Browse files
sorccusorccu
committed
Merge branch 'BeiKeJieDeLiuLangMao-develop'
2 parents 46be77d + cd69e9a commit e7a4df6

File tree

624 files changed

+96935
-110914
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

624 files changed

+96935
-110914
lines changed

‎jni/vendor/libjpeg-turbo/Android.mk‎

Lines changed: 89 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
33

44
LOCAL_MODULE := libjpeg-turbo
55

6-
SOURCE_PATH := libjpeg-turbo-1.4.1
6+
SOURCE_PATH := libjpeg-turbo-2.0.1
77

88
ifneq ($(filter $(TARGET_ARCH_ABI), armeabi-v7a armeabi-v7a-hard x86),)
99
LOCAL_ARM_NEON := true
@@ -14,22 +14,35 @@ LOCAL_ASMFLAGS += -DELF
1414

1515
ifeq ($(TARGET_ARCH_ABI),x86_64)
1616
LOCAL_SRC_FILES += \
17-
$(SOURCE_PATH)/simd/jsimd_x86_64.c \
18-
$(SOURCE_PATH)/simd/jfdctflt-sse-64.asm \
19-
$(SOURCE_PATH)/simd/jccolor-sse2-64.asm \
20-
$(SOURCE_PATH)/simd/jcgray-sse2-64.asm \
21-
$(SOURCE_PATH)/simd/jcsample-sse2-64.asm \
22-
$(SOURCE_PATH)/simd/jdcolor-sse2-64.asm \
23-
$(SOURCE_PATH)/simd/jdmerge-sse2-64.asm \
24-
$(SOURCE_PATH)/simd/jdsample-sse2-64.asm \
25-
$(SOURCE_PATH)/simd/jfdctfst-sse2-64.asm \
26-
$(SOURCE_PATH)/simd/jfdctint-sse2-64.asm \
27-
$(SOURCE_PATH)/simd/jidctflt-sse2-64.asm \
28-
$(SOURCE_PATH)/simd/jidctfst-sse2-64.asm \
29-
$(SOURCE_PATH)/simd/jidctint-sse2-64.asm \
30-
$(SOURCE_PATH)/simd/jidctred-sse2-64.asm \
31-
$(SOURCE_PATH)/simd/jquantf-sse2-64.asm \
32-
$(SOURCE_PATH)/simd/jquanti-sse2-64.asm \
17+
$(SOURCE_PATH)/simd/x86_64/jsimd.c \
18+
$(SOURCE_PATH)/simd/x86_64/jfdctflt-sse.asm \
19+
$(SOURCE_PATH)/simd/x86_64/jfdctfst-sse2.asm \
20+
$(SOURCE_PATH)/simd/x86_64/jfdctint-avx2.asm \
21+
$(SOURCE_PATH)/simd/x86_64/jfdctint-sse2.asm \
22+
$(SOURCE_PATH)/simd/x86_64/jidctflt-sse2.asm \
23+
$(SOURCE_PATH)/simd/x86_64/jidctfst-sse2.asm \
24+
$(SOURCE_PATH)/simd/x86_64/jidctint-avx2.asm \
25+
$(SOURCE_PATH)/simd/x86_64/jidctint-sse2.asm \
26+
$(SOURCE_PATH)/simd/x86_64/jidctred-sse2.asm \
27+
$(SOURCE_PATH)/simd/x86_64/jccolor-sse2.asm \
28+
$(SOURCE_PATH)/simd/x86_64/jccolor-avx2.asm \
29+
$(SOURCE_PATH)/simd/x86_64/jcgray-avx2.asm \
30+
$(SOURCE_PATH)/simd/x86_64/jcgray-sse2.asm \
31+
$(SOURCE_PATH)/simd/x86_64/jcsample-avx2.asm \
32+
$(SOURCE_PATH)/simd/x86_64/jcsample-sse2.asm \
33+
$(SOURCE_PATH)/simd/x86_64/jdcolor-avx2.asm \
34+
$(SOURCE_PATH)/simd/x86_64/jdcolor-sse2.asm \
35+
$(SOURCE_PATH)/simd/x86_64/jdmerge-avx2.asm \
36+
$(SOURCE_PATH)/simd/x86_64/jdmerge-sse2.asm \
37+
$(SOURCE_PATH)/simd/x86_64/jdsample-avx2.asm \
38+
$(SOURCE_PATH)/simd/x86_64/jdsample-sse2.asm \
39+
$(SOURCE_PATH)/simd/x86_64/jquantf-sse2.asm \
40+
$(SOURCE_PATH)/simd/x86_64/jquanti-avx2.asm \
41+
$(SOURCE_PATH)/simd/x86_64/jquanti-sse2.asm \
42+
$(SOURCE_PATH)/simd/x86_64/jsimdcpu.asm \
43+
$(SOURCE_PATH)/simd/x86_64/jchuff-sse2.asm \
44+
$(SOURCE_PATH)/simd/x86_64/jcphuff-sse2.asm \
45+
3346

3447
LOCAL_CFLAGS += \
3548
-DSIZEOF_SIZE_T=8 \
@@ -38,40 +51,51 @@ LOCAL_ASMFLAGS += -D__x86_64__
3851

3952
else ifeq ($(TARGET_ARCH_ABI),x86)
4053
LOCAL_SRC_FILES += \
41-
$(SOURCE_PATH)/simd/jsimd_i386.c \
42-
$(SOURCE_PATH)/simd/jsimdcpu.asm \
43-
$(SOURCE_PATH)/simd/jfdctflt-3dn.asm \
44-
$(SOURCE_PATH)/simd/jidctflt-3dn.asm \
45-
$(SOURCE_PATH)/simd/jquant-3dn.asm \
46-
$(SOURCE_PATH)/simd/jccolor-mmx.asm \
47-
$(SOURCE_PATH)/simd/jcgray-mmx.asm \
48-
$(SOURCE_PATH)/simd/jcsample-mmx.asm \
49-
$(SOURCE_PATH)/simd/jdcolor-mmx.asm \
50-
$(SOURCE_PATH)/simd/jdmerge-mmx.asm \
51-
$(SOURCE_PATH)/simd/jdsample-mmx.asm \
52-
$(SOURCE_PATH)/simd/jfdctfst-mmx.asm \
53-
$(SOURCE_PATH)/simd/jfdctint-mmx.asm \
54-
$(SOURCE_PATH)/simd/jidctfst-mmx.asm \
55-
$(SOURCE_PATH)/simd/jidctint-mmx.asm \
56-
$(SOURCE_PATH)/simd/jidctred-mmx.asm \
57-
$(SOURCE_PATH)/simd/jquant-mmx.asm \
58-
$(SOURCE_PATH)/simd/jfdctflt-sse.asm \
59-
$(SOURCE_PATH)/simd/jidctflt-sse.asm \
60-
$(SOURCE_PATH)/simd/jquant-sse.asm \
61-
$(SOURCE_PATH)/simd/jccolor-sse2.asm \
62-
$(SOURCE_PATH)/simd/jcgray-sse2.asm \
63-
$(SOURCE_PATH)/simd/jcsample-sse2.asm \
64-
$(SOURCE_PATH)/simd/jdcolor-sse2.asm \
65-
$(SOURCE_PATH)/simd/jdmerge-sse2.asm \
66-
$(SOURCE_PATH)/simd/jdsample-sse2.asm \
67-
$(SOURCE_PATH)/simd/jfdctfst-sse2.asm \
68-
$(SOURCE_PATH)/simd/jfdctint-sse2.asm \
69-
$(SOURCE_PATH)/simd/jidctflt-sse2.asm \
70-
$(SOURCE_PATH)/simd/jidctfst-sse2.asm \
71-
$(SOURCE_PATH)/simd/jidctint-sse2.asm \
72-
$(SOURCE_PATH)/simd/jidctred-sse2.asm \
73-
$(SOURCE_PATH)/simd/jquantf-sse2.asm \
74-
$(SOURCE_PATH)/simd/jquanti-sse2.asm \
54+
$(SOURCE_PATH)/simd/i386/jsimd.c \
55+
$(SOURCE_PATH)/simd/i386/jsimdcpu.asm \
56+
$(SOURCE_PATH)/simd/i386/jccolor-avx2.asm \
57+
$(SOURCE_PATH)/simd/i386/jccolor-mmx.asm \
58+
$(SOURCE_PATH)/simd/i386/jccolor-sse2.asm \
59+
$(SOURCE_PATH)/simd/i386/jcgray-avx2.asm \
60+
$(SOURCE_PATH)/simd/i386/jcgray-mmx.asm \
61+
$(SOURCE_PATH)/simd/i386/jcgray-sse2.asm \
62+
$(SOURCE_PATH)/simd/i386/jchuff-sse2.asm \
63+
$(SOURCE_PATH)/simd/i386/jcphuff-sse2.asm \
64+
$(SOURCE_PATH)/simd/i386/jcsample-avx2.asm \
65+
$(SOURCE_PATH)/simd/i386/jcsample-mmx.asm \
66+
$(SOURCE_PATH)/simd/i386/jcsample-sse2.asm \
67+
$(SOURCE_PATH)/simd/i386/jdcolor-avx2.asm \
68+
$(SOURCE_PATH)/simd/i386/jdcolor-mmx.asm \
69+
$(SOURCE_PATH)/simd/i386/jdcolor-sse2.asm \
70+
$(SOURCE_PATH)/simd/i386/jdmerge-avx2.asm \
71+
$(SOURCE_PATH)/simd/i386/jdmerge-mmx.asm \
72+
$(SOURCE_PATH)/simd/i386/jdmerge-sse2.asm \
73+
$(SOURCE_PATH)/simd/i386/jdsample-avx2.asm \
74+
$(SOURCE_PATH)/simd/i386/jdsample-mmx.asm \
75+
$(SOURCE_PATH)/simd/i386/jdsample-sse2.asm \
76+
$(SOURCE_PATH)/simd/i386/jfdctflt-3dn.asm \
77+
$(SOURCE_PATH)/simd/i386/jfdctflt-sse.asm \
78+
$(SOURCE_PATH)/simd/i386/jfdctfst-mmx.asm \
79+
$(SOURCE_PATH)/simd/i386/jfdctfst-sse2.asm \
80+
$(SOURCE_PATH)/simd/i386/jfdctint-avx2.asm \
81+
$(SOURCE_PATH)/simd/i386/jfdctint-mmx.asm \
82+
$(SOURCE_PATH)/simd/i386/jfdctint-sse2.asm \
83+
$(SOURCE_PATH)/simd/i386/jidctflt-3dn.asm \
84+
$(SOURCE_PATH)/simd/i386/jidctflt-sse.asm \
85+
$(SOURCE_PATH)/simd/i386/jidctflt-sse2.asm \
86+
$(SOURCE_PATH)/simd/i386/jidctfst-mmx.asm \
87+
$(SOURCE_PATH)/simd/i386/jidctfst-sse2.asm \
88+
$(SOURCE_PATH)/simd/i386/jidctint-avx2.asm \
89+
$(SOURCE_PATH)/simd/i386/jidctint-mmx.asm \
90+
$(SOURCE_PATH)/simd/i386/jidctint-sse2.asm \
91+
$(SOURCE_PATH)/simd/i386/jidctred-mmx.asm \
92+
$(SOURCE_PATH)/simd/i386/jidctred-sse2.asm \
93+
$(SOURCE_PATH)/simd/i386/jquant-3dn.asm \
94+
$(SOURCE_PATH)/simd/i386/jquant-mmx.asm \
95+
$(SOURCE_PATH)/simd/i386/jquant-sse.asm \
96+
$(SOURCE_PATH)/simd/i386/jquantf-sse2.asm \
97+
$(SOURCE_PATH)/simd/i386/jquanti-avx2.asm \
98+
$(SOURCE_PATH)/simd/i386/jquanti-sse2.asm \
7599

76100
LOCAL_CFLAGS += \
77101
-DSIZEOF_SIZE_T=4 \
@@ -80,8 +104,8 @@ LOCAL_ASMFLAGS += -DPIC
80104

81105
else ifneq ($(filter $(TARGET_ARCH_ABI), armeabi-v7a armeabi-v7a-hard),)
82106
LOCAL_SRC_FILES += \
83-
$(SOURCE_PATH)/simd/jsimd_arm.c \
84-
$(SOURCE_PATH)/simd/jsimd_arm_neon.S \
107+
$(SOURCE_PATH)/simd/arm/jsimd.c \
108+
$(SOURCE_PATH)/simd/arm/jsimd_neon.S \
85109

86110
LOCAL_CFLAGS += \
87111
-DSIZEOF_SIZE_T=4 \
@@ -92,8 +116,8 @@ LOCAL_CFLAGS += \
92116

93117
else ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
94118
LOCAL_SRC_FILES += \
95-
$(SOURCE_PATH)/simd/jsimd_arm64.c \
96-
$(SOURCE_PATH)/simd/jsimd_arm64_neon.S \
119+
$(SOURCE_PATH)/simd/arm64/jsimd.c \
120+
$(SOURCE_PATH)/simd/arm64/jsimd_neon.S \
97121

98122
LOCAL_CFLAGS += \
99123
-DSIZEOF_SIZE_T=8 \
@@ -166,14 +190,22 @@ LOCAL_C_INCLUDES += \
166190
$(LOCAL_PATH)/include \
167191

168192
LOCAL_C_INCLUDES += \
169-
$(LOCAL_PATH)/$(SOURCE_PATH)/simd \
193+
$(LOCAL_PATH)/$(SOURCE_PATH)/simd \
194+
$(LOCAL_PATH)/$(SOURCE_PATH)/simd/nasm \
195+
$(LOCAL_PATH)/$(SOURCE_PATH)/simd/loongson \
196+
$(LOCAL_PATH)/$(SOURCE_PATH)/simd/mips \
197+
$(LOCAL_PATH)/$(SOURCE_PATH)/simd/powerpc \
170198
$(LOCAL_PATH)/$(SOURCE_PATH) \
171199

172200
LOCAL_EXPORT_C_INCLUDES := \
173201
$(LOCAL_PATH)/$(SOURCE_PATH) \
174202

175203
LOCAL_CFLAGS += \
176-
-DBUILD="20141110" \
204+
-DBUILD="\"20181112\"" \
205+
-DPACKAGE_NAME="\"libjpeg-turbo\"" \
206+
-DVERSION="\"2.0.1\"" \
207+
-DLIBJPEG_TURBO_VERSION="2.0.1" \
208+
-DJPEG_LIB_VERSION=62 \
177209
-DC_ARITH_CODING_SUPPORTED=1 \
178210
-DD_ARITH_CODING_SUPPORTED=1 \
179211
-DBITS_IN_JSAMPLE=8 \
@@ -194,8 +226,6 @@ LOCAL_CFLAGS += \
194226
-DHAVE_UNSIGNED_CHAR=1 \
195227
-DHAVE_UNSIGNED_SHORT=1 \
196228
-DINLINE="inline __attribute__((always_inline))" \
197-
-DJPEG_LIB_VERSION=62 \
198-
-DLIBJPEG_TURBO_VERSION="1.3.90" \
199229
-DMEM_SRCDST_SUPPORTED=1 \
200230
-DNEED_SYS_TYPES_H=1 \
201231
-DSTDC_HEADERS=1 \

0 commit comments

Comments
 (0)