-
Notifications
You must be signed in to change notification settings - Fork 760
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
21 changed files
with
138 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
2 changes: 1 addition & 1 deletion
2
...fmpegandroid/ExampleInstrumentedTest.java → ...rxffmpegdemo/ExampleInstrumentedTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
.../fastffmpegandroid/FFmpegApplication.java → ...n/java/io/microshow/rxffmpegdemo/App.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,21 @@ | ||
package com.superman.fastffmpegandroid; | ||
package io.microshow.rxffmpegdemo; | ||
|
||
import android.app.Application; | ||
|
||
import com.superman.ffmpeg.FFmpegInvoke; | ||
import io.microshow.rxffmpeg.RxFFmpegInvoke; | ||
|
||
/** | ||
* Created by Super on 2018/12/7. | ||
*/ | ||
|
||
public class FFmpegApplication extends Application { | ||
public class App extends Application { | ||
|
||
@Override | ||
public void onCreate() { | ||
super.onCreate(); | ||
|
||
//开启debug模式,正式环境设为false即可 | ||
FFmpegInvoke.getInstance().setDebug(true); | ||
RxFFmpegInvoke.getInstance().setDebug(BuildConfig.DEBUG); | ||
|
||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...uperman/fastffmpegandroid/TimerUtils.java → ...io/microshow/rxffmpegdemo/TimerUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package com.superman.fastffmpegandroid; | ||
package io.microshow.rxffmpegdemo; | ||
|
||
/** | ||
* Created by Super on 2018/12/8. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
<resources> | ||
<string name="app_name">FastFFmpegAndroid</string> | ||
<string name="app_name">RxFFmpeg</string> | ||
</resources> |
2 changes: 1 addition & 1 deletion
2
...an/fastffmpegandroid/ExampleUnitTest.java → ...croshow/rxffmpegdemo/ExampleUnitTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package com.superman.fastffmpegandroid; | ||
package io.microshow.rxffmpegdemo; | ||
|
||
import org.junit.Test; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
ext { | ||
/*---- 官方 Support 库、Build 工具版本、主配文件参数 ----*/ | ||
//最小SDK版本 | ||
minSdkValue = 16 | ||
//目标版本 | ||
targetSdkValue = 27 | ||
//编译 SDK 版本 | ||
compileSdkValue = 27 | ||
//构建工具 | ||
buildToolsValue = "27.0.3" | ||
//支持包版本 | ||
supportLibValue = "27.1.1" | ||
//应用 versionCode | ||
versionCodeValue = 1 | ||
//应用 version 名称,更多设置里显示的 | ||
versionNameValue = "1.0.1" | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
/build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
apply plugin: 'com.android.library' | ||
|
||
android { | ||
compileSdkVersion compileSdkValue | ||
defaultConfig { | ||
minSdkVersion minSdkValue | ||
targetSdkVersion targetSdkValue | ||
versionCode versionCodeValue | ||
versionName versionNameValue | ||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" | ||
// externalNativeBuild { | ||
// cmake { | ||
// cppFlags "-std=c++11" | ||
// } | ||
// ndk { | ||
// abiFilters "armeabi-v7a" | ||
// } | ||
// } | ||
} | ||
buildTypes { | ||
release { | ||
minifyEnabled false | ||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | ||
} | ||
} | ||
// externalNativeBuild { | ||
// cmake { | ||
// path "CMakeLists.txt" | ||
// } | ||
// } | ||
sourceSets { | ||
main { | ||
jniLibs.srcDirs = ['libs'] | ||
} | ||
} | ||
} | ||
|
||
dependencies { | ||
api fileTree(dir: 'libs', include: ['*.jar']) | ||
//rxjava and rxandroid | ||
api 'io.reactivex.rxjava2:rxandroid:2.1.0' | ||
api 'io.reactivex.rxjava2:rxjava:2.2.4' | ||
} |
File renamed without changes.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
# Add project specific ProGuard rules here. | ||
# By default, the flags in this file are appended to flags specified | ||
# in D:\DevConfig\android\sdk\android-sdk-windows\android-sdk-windows/tools/proguard/proguard-android.txt | ||
# You can edit the include path and order by changing the proguardFiles | ||
# directive in build.gradle. | ||
# | ||
# For more details, see | ||
# http://developer.android.com/guide/developing/tools/proguard.html | ||
|
||
# Add any project specific keep options here: | ||
|
||
# If your project uses WebView with JS, uncomment the following | ||
# and specify the fully qualified class name to the JavaScript interface | ||
# class: | ||
#-keepclassmembers class fqcn.of.javascript.interface.for.webview { | ||
# public *; | ||
#} | ||
|
||
# Uncomment this to preserve the line number information for | ||
# debugging stack traces. | ||
#-keepattributes SourceFile,LineNumberTable | ||
|
||
# If you keep the line number information, uncomment this to | ||
# hide the original source file name. | ||
#-renamesourcefileattribute SourceFile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
package="io.microshow.rxffmpeg"> | ||
</manifest> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
<resources> | ||
</resources> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
include ':app' | ||
include ':app', ':rxffmpeg' |