Skip to content

Commit f7fdbf0

Browse files
committed
新增armeabi架构,分离assets文件
1 parent 1d98159 commit f7fdbf0

File tree

30 files changed

+506
-21
lines changed

30 files changed

+506
-21
lines changed

AndroidFFmpegLibrary/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ dependencies {
3333
androidTestImplementation 'com.android.support.test:runner:1.0.2'
3434
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
3535
implementation libs["appcompat-v7"]
36-
api libs["exec"]
36+
api project(':FFmpeg-java')
37+
api project(':FFmpeg-armeabi')
38+
api project(':FFmpeg-armv7a')
39+
api project(':FFmpeg-x86')
3740
}
3841

3942
apply from: 'bintray.gradle'
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
<manifest package="com.excellence.ffmpeg"
2-
xmlns:android="http://schemas.android.com/apk/res/android"/>
1+
<manifest package="com.excellence.ffmpeg.lib" />

FFmpeg-armeabi/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

FFmpeg-armeabi/bintray.gradle

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
def bintray = rootProject.ext.bintray
2+
/*********************上传jCenter依赖*********************/
3+
apply plugin: 'com.novoda.bintray-release'
4+
5+
/**避免中文注释:编码GBK的不可映射字符**/
6+
tasks.withType(Javadoc) {
7+
options {
8+
encoding "UTF-8"
9+
charSet 'UTF-8'
10+
links "http://docs.oracle.com/javase/7/docs/api"
11+
}
12+
}
13+
14+
/**避免Javadocs错误:找不到引用**/
15+
tasks.withType(Javadoc) {
16+
options.addStringOption('Xdoclint:none', '-quiet')
17+
options.addStringOption('encoding', 'UTF-8')
18+
}
19+
20+
/**发布到我的Bintray仓库**/
21+
def user = getPropertyValue('bintrayUser')
22+
def key = getPropertyValue('bintrayKey')
23+
def org = getPropertyValue('userOrg')
24+
25+
publish {
26+
bintrayUser = user
27+
bintrayKey = key
28+
dryRun = false
29+
userOrg = org
30+
groupId = bintray.groupId
31+
artifactId = 'ffmpeg-armeabi'
32+
publishVersion = bintray.publishVersion
33+
desc = 'android执行FFmpeg可执行文件-armeabi'
34+
website = bintray.website
35+
licences = bintray.licences
36+
}
37+
38+
/**读取bintray.key文件的key**/
39+
def getPropertyValue(String key) {
40+
if (key == null || key.length() == 0)
41+
return null
42+
43+
File file = project.rootProject.file('../../bintray.key')
44+
if (!file.exists())
45+
return null
46+
47+
InputStream inputStream = file.newDataInputStream()
48+
Properties properties = new Properties()
49+
properties.load(inputStream)
50+
51+
//读取Key
52+
return properties.getProperty(key)
53+
}

FFmpeg-armeabi/build.gradle

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
def plugins = rootProject.ext.plugins
2+
def cfg = rootProject.ext.android
3+
def libs = rootProject.ext.dependencies
4+
5+
apply plugin: plugins.library
6+
7+
8+
android {
9+
compileSdkVersion cfg.compileSdkVersion
10+
11+
defaultConfig {
12+
minSdkVersion cfg.minSdkVersion
13+
targetSdkVersion cfg.targetSdkVersion
14+
versionCode cfg.versionCode
15+
versionName cfg.versionName
16+
17+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
18+
19+
}
20+
21+
buildTypes {
22+
release {
23+
minifyEnabled false
24+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
25+
}
26+
}
27+
28+
}
29+
30+
dependencies {
31+
implementation fileTree(dir: 'libs', include: ['*.jar'])
32+
33+
testImplementation 'junit:junit:4.12'
34+
androidTestImplementation 'com.android.support.test:runner:1.0.2'
35+
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
36+
implementation libs["appcompat-v7"]
37+
}
38+
39+
apply from: 'bintray.gradle'

FFmpeg-armeabi/proguard-rules.pro

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Add project specific ProGuard rules here.
2+
# You can control the set of applied configuration files using the
3+
# proguardFiles setting in build.gradle.
4+
#
5+
# For more details, see
6+
# http://developer.android.com/guide/developing/tools/proguard.html
7+
8+
# If your project uses WebView with JS, uncomment the following
9+
# and specify the fully qualified class name to the JavaScript interface
10+
# class:
11+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12+
# public *;
13+
#}
14+
15+
# Uncomment this to preserve the line number information for
16+
# debugging stack traces.
17+
#-keepattributes SourceFile,LineNumberTable
18+
19+
# If you keep the line number information, uncomment this to
20+
# hide the original source file name.
21+
#-renamesourcefileattribute SourceFile
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<manifest package="com.excellence.ffmpeg.armeabi" />
17.6 MB
Binary file not shown.

FFmpeg-armv7a/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

FFmpeg-armv7a/bintray.gradle

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
def bintray = rootProject.ext.bintray
2+
/*********************上传jCenter依赖*********************/
3+
apply plugin: 'com.novoda.bintray-release'
4+
5+
/**避免中文注释:编码GBK的不可映射字符**/
6+
tasks.withType(Javadoc) {
7+
options {
8+
encoding "UTF-8"
9+
charSet 'UTF-8'
10+
links "http://docs.oracle.com/javase/7/docs/api"
11+
}
12+
}
13+
14+
/**避免Javadocs错误:找不到引用**/
15+
tasks.withType(Javadoc) {
16+
options.addStringOption('Xdoclint:none', '-quiet')
17+
options.addStringOption('encoding', 'UTF-8')
18+
}
19+
20+
/**发布到我的Bintray仓库**/
21+
def user = getPropertyValue('bintrayUser')
22+
def key = getPropertyValue('bintrayKey')
23+
def org = getPropertyValue('userOrg')
24+
25+
publish {
26+
bintrayUser = user
27+
bintrayKey = key
28+
dryRun = false
29+
userOrg = org
30+
groupId = bintray.groupId
31+
artifactId = 'ffmpeg-armv7a'
32+
publishVersion = bintray.publishVersion
33+
desc = 'android执行FFmpeg可执行文件-armv7a'
34+
website = bintray.website
35+
licences = bintray.licences
36+
}
37+
38+
/**读取bintray.key文件的key**/
39+
def getPropertyValue(String key) {
40+
if (key == null || key.length() == 0)
41+
return null
42+
43+
File file = project.rootProject.file('../../bintray.key')
44+
if (!file.exists())
45+
return null
46+
47+
InputStream inputStream = file.newDataInputStream()
48+
Properties properties = new Properties()
49+
properties.load(inputStream)
50+
51+
//读取Key
52+
return properties.getProperty(key)
53+
}

0 commit comments

Comments
 (0)