Skip to content

Commit 268593c

Browse files
hiteshsondhi88hiteshsondhi88
committed
Merge branch 'release/v0.2.3'
2 parents 9cbc442 + a5cd862 commit 268593c

29 files changed

+474
-46
lines changed

‎.travis.yml

+6-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
language: android
22
android:
3+
update_sdk: true
34
components:
45
- platform-tools
56
- tools
@@ -9,16 +10,12 @@ android:
910

1011
# The SDK version used to compile your project
1112
- android-16
13+
- android-L
1214

1315
- sys-img-x86-android-16
14-
before_install:
15-
- echo no | android create avd -c 50M --force -n testx86 -t android-16 --abi x86
16-
- emulator -avd testx86 -no-skin -no-audio -no-window -gpu on &
17-
18-
before_script:
19-
# Make sure the emulator has started before running tests
20-
- android-wait-for-emulator
21-
- adb shell input keyevent 82 &
16+
- sys-img-armeabi-v7a-android-16
17+
- sys-img-armeabi-v7a-android-l
18+
- sys-img-x86-android-l
2219

2320
script:
24-
- ./gradlew --info build connectedAndroidTest
21+
- ./runTests.sh || exit 1

‎FFmpegAndroid/assets/armeabi-v7a-neon/ffmpeg

-28.1 KB
Binary file not shown.

‎FFmpegAndroid/assets/armeabi-v7a/ffmpeg

-28.1 KB
Binary file not shown.

‎FFmpegAndroid/assets/x86/ffmpeg

-252 KB
Binary file not shown.

‎FFmpegAndroid/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "com.github.hiteshsondhi88.libffmpeg"
99
minSdkVersion 16
1010
targetSdkVersion 16
11-
versionCode 22
12-
versionName "0.2.2"
11+
versionCode 23
12+
versionName "0.2.3"
1313
}
1414

1515
sourceSets.main {

‎FFmpegAndroid/jni/Application.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Build for arm only
2-
APP_ABI := armeabi armeabi-v7a
2+
APP_ABI := armeabi armeabi-v7a x86
33

44
APP_PLATFORM := android-14

‎FFmpegAndroid/libs/x86/libARM_ARCH.so

9.11 KB
Binary file not shown.

‎FFmpegAndroid/obj/local/x86/libARM_ARCH.so

47.6 KB
Binary file not shown.

‎FFmpegAndroid/obj/local/x86/libcpufeatures.a

23.2 KB
Binary file not shown.

‎FFmpegAndroid/obj/local/x86/objs/ARM_ARCH/armArch.o

25.3 KB
Binary file not shown.

‎FFmpegAndroid/obj/local/x86/objs/ARM_ARCH/armArch.o.d

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
obj/local/x86/objs/ARM_ARCH/armArch.o: jni/armArch.c \
2+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/jni.h \
3+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs.h \
4+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs_elf.h \
5+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/android/api-level.h \
6+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdio.h \
7+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/types.h \
8+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdint.h \
9+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_types.h \
10+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/_types.h \
11+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_wchar_limits.h \
12+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/posix_types.h \
13+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/stddef.h \
14+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/compiler.h \
15+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types.h \
16+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types_32.h \
17+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/types.h \
18+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/types.h \
19+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/kernel.h \
20+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/sysmacros.h \
21+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdlib.h \
22+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/string.h \
23+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/malloc.h \
24+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/alloca.h \
25+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/strings.h \
26+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/memory.h \
27+
/Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.h
28+
29+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/jni.h:
30+
31+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs.h:
32+
33+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs_elf.h:
34+
35+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/android/api-level.h:
36+
37+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdio.h:
38+
39+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/types.h:
40+
41+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdint.h:
42+
43+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_types.h:
44+
45+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/_types.h:
46+
47+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_wchar_limits.h:
48+
49+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/posix_types.h:
50+
51+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/stddef.h:
52+
53+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/compiler.h:
54+
55+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types.h:
56+
57+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types_32.h:
58+
59+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/types.h:
60+
61+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/types.h:
62+
63+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/kernel.h:
64+
65+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/sysmacros.h:
66+
67+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdlib.h:
68+
69+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/string.h:
70+
71+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/malloc.h:
72+
73+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/alloca.h:
74+
75+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/strings.h:
76+
77+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/memory.h:
78+
79+
/Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.h:

‎FFmpegAndroid/obj/local/x86/objs/cpufeatures/cpu-features.o

22.9 KB
Binary file not shown.

‎FFmpegAndroid/obj/local/x86/objs/cpufeatures/cpu-features.o.d

+182
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,182 @@
1+
obj/local/x86/objs/cpufeatures/cpu-features.o: \
2+
/Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.c \
3+
/Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.h \
4+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs.h \
5+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs_elf.h \
6+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/android/api-level.h \
7+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdint.h \
8+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_types.h \
9+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/_types.h \
10+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_wchar_limits.h \
11+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/dlfcn.h \
12+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/errno.h \
13+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/errno.h \
14+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/errno.h \
15+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/errno.h \
16+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/errno-base.h \
17+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/fcntl.h \
18+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/types.h \
19+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/posix_types.h \
20+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/stddef.h \
21+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/compiler.h \
22+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types.h \
23+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types_32.h \
24+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/types.h \
25+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/types.h \
26+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/kernel.h \
27+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/sysmacros.h \
28+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/fcntl.h \
29+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/fcntl.h \
30+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/fcntl.h \
31+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/unistd.h \
32+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/select.h \
33+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/time.h \
34+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/time.h \
35+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/signal.h \
36+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/limits.h \
37+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/limits.h \
38+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/limits.h \
39+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/internal_types.h \
40+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/limits.h \
41+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/syslimits.h \
42+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/page.h \
43+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/page_32.h \
44+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/string.h \
45+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/malloc.h \
46+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/signal.h \
47+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/signal.h \
48+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/sigcontext.h \
49+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/siginfo.h \
50+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/siginfo.h \
51+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/sysconf.h \
52+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/capability.h \
53+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/pathconf.h \
54+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/pthread.h \
55+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/time.h \
56+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sched.h \
57+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdio.h \
58+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdlib.h \
59+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/alloca.h \
60+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/strings.h \
61+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/memory.h \
62+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/system_properties.h
63+
64+
/Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.h:
65+
66+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs.h:
67+
68+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs_elf.h:
69+
70+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/android/api-level.h:
71+
72+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdint.h:
73+
74+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_types.h:
75+
76+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/_types.h:
77+
78+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_wchar_limits.h:
79+
80+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/dlfcn.h:
81+
82+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/errno.h:
83+
84+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/errno.h:
85+
86+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/errno.h:
87+
88+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/errno.h:
89+
90+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/errno-base.h:
91+
92+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/fcntl.h:
93+
94+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/types.h:
95+
96+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/posix_types.h:
97+
98+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/stddef.h:
99+
100+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/compiler.h:
101+
102+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types.h:
103+
104+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types_32.h:
105+
106+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/types.h:
107+
108+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/types.h:
109+
110+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/kernel.h:
111+
112+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/sysmacros.h:
113+
114+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/fcntl.h:
115+
116+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/fcntl.h:
117+
118+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/fcntl.h:
119+
120+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/unistd.h:
121+
122+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/select.h:
123+
124+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/time.h:
125+
126+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/time.h:
127+
128+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/signal.h:
129+
130+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/limits.h:
131+
132+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/limits.h:
133+
134+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/limits.h:
135+
136+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/internal_types.h:
137+
138+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/limits.h:
139+
140+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/syslimits.h:
141+
142+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/page.h:
143+
144+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/page_32.h:
145+
146+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/string.h:
147+
148+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/malloc.h:
149+
150+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/signal.h:
151+
152+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/signal.h:
153+
154+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/sigcontext.h:
155+
156+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/siginfo.h:
157+
158+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/siginfo.h:
159+
160+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/sysconf.h:
161+
162+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/capability.h:
163+
164+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/pathconf.h:
165+
166+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/pthread.h:
167+
168+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/time.h:
169+
170+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sched.h:
171+
172+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdio.h:
173+
174+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdlib.h:
175+
176+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/alloca.h:
177+
178+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/strings.h:
179+
180+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/memory.h:
181+
182+
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/system_properties.h:

‎FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CommonInstrumentationTestCase.java

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.github.hiteshsondhi88.libffmpeg;
2+
3+
import android.test.InstrumentationTestCase;
4+
5+
public class CommonInstrumentationTestCase extends InstrumentationTestCase {
6+
7+
@Override
8+
protected void setUp() throws Exception {
9+
super.setUp();
10+
Log.setDEBUG(true);
11+
}
12+
13+
}

‎FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelperTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ public void testGetCpuArch() throws Exception {
2020
}
2121
}
2222

23-
2423
}

‎FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchTest.java

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package com.github.hiteshsondhi88.libffmpeg;
2+
3+
import android.content.res.AssetManager;
4+
import android.text.TextUtils;
5+
6+
import com.github.hiteshsondhi88.libffmpeg.utils.AssertionHelper;
7+
8+
import java.io.IOException;
9+
import java.io.InputStream;
10+
11+
import static org.assertj.core.api.Assertions.assertThat;
12+
13+
public class CpuArchTest extends CommonInstrumentationTestCase {
14+
15+
public void testFFmpegAssetsWithSha1Sum() {
16+
testFFmpegAsset(CpuArch.ARMv7, "armeabi-v7a/ffmpeg");
17+
testFFmpegAsset(CpuArch.ARMv7_NEON, "armeabi-v7a-neon/ffmpeg");
18+
testFFmpegAsset(CpuArch.x86, "x86/ffmpeg");
19+
}
20+
21+
private void testFFmpegAsset(CpuArch cpuArch, String assetsPath) {
22+
AssetManager assetMgr = getInstrumentation().getContext().getResources().getAssets();
23+
InputStream is = null;
24+
try {
25+
is = assetMgr.open(assetsPath);
26+
String assetSha1Sum = FileUtils.SHA1(is);
27+
assertThat(!TextUtils.isEmpty(cpuArch.getSha1())
28+
&& !TextUtils.isEmpty(assetSha1Sum)
29+
&& cpuArch.getSha1().equals(assetSha1Sum)).isTrue();
30+
} catch (IOException e) {
31+
Log.e(e);
32+
AssertionHelper.assertError("error validating ffmpeg asset "+assetsPath);
33+
} finally {
34+
Util.close(is);
35+
}
36+
37+
}
38+
39+
}

‎FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/ShellCommandTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void run() {
4444

4545
public void testRunWaitFor() throws Exception {
4646
ShellCommand shellCommand = new ShellCommand();
47-
CommandResult commandResult = shellCommand.runWaitFor("ls /sdcard/");
47+
CommandResult commandResult = shellCommand.runWaitFor("ls");
4848
assertNotNull(commandResult);
4949
assertEquals(true, commandResult.success);
5050
assertThat(commandResult.output).isNotEmpty();

0 commit comments

Comments
 (0)