diff --git a/FFmpegAndroid/build.gradle b/FFmpegAndroid/build.gradle index 2b461bb..fc332b8 100644 --- a/FFmpegAndroid/build.gradle +++ b/FFmpegAndroid/build.gradle @@ -5,11 +5,11 @@ android { buildToolsVersion "20.0.0" defaultConfig { - applicationId "github.hiteshsondhi88.libffmpeg" + applicationId "com.github.hiteshsondhi88.libffmpeg" minSdkVersion 16 targetSdkVersion 16 - versionCode 1 - versionName "1.0" + versionCode 21 + versionName "0.2.1" } sourceSets.main { diff --git a/FFmpegAndroid/gradle.properties b/FFmpegAndroid/gradle.properties new file mode 100644 index 0000000..ad72515 --- /dev/null +++ b/FFmpegAndroid/gradle.properties @@ -0,0 +1,3 @@ +POM_NAME=FFmpegAndroid Library +POM_ARTIFACT_ID=FFmpegAndroid +POM_PACKAGING=aar diff --git a/FFmpegAndroid/jni/armArch.c b/FFmpegAndroid/jni/armArch.c index 7c4c792..186b524 100644 --- a/FFmpegAndroid/jni/armArch.c +++ b/FFmpegAndroid/jni/armArch.c @@ -4,7 +4,7 @@ #include jstring -Java_github_hiteshsondhi88_libffmpeg_ArmArchHelper_cpuArchFromJNI(JNIEnv* env, jobject obj) +Java_com_github_hiteshsondhi88_libffmpeg_ArmArchHelper_cpuArchFromJNI(JNIEnv* env, jobject obj) { // Maximum we need to store here is ARM v7-neon // Which is 11 char long, so initializing a character array of length 11 diff --git a/FFmpegAndroid/libs/armeabi-v7a/libARM_ARCH.so b/FFmpegAndroid/libs/armeabi-v7a/libARM_ARCH.so index 5e54123..9cb83fe 100755 Binary files a/FFmpegAndroid/libs/armeabi-v7a/libARM_ARCH.so and b/FFmpegAndroid/libs/armeabi-v7a/libARM_ARCH.so differ diff --git a/FFmpegAndroid/libs/armeabi/libARM_ARCH.so b/FFmpegAndroid/libs/armeabi/libARM_ARCH.so index a5e65fd..d35be9e 100755 Binary files a/FFmpegAndroid/libs/armeabi/libARM_ARCH.so and b/FFmpegAndroid/libs/armeabi/libARM_ARCH.so differ diff --git a/FFmpegAndroid/obj/local/armeabi-v7a/libARM_ARCH.so b/FFmpegAndroid/obj/local/armeabi-v7a/libARM_ARCH.so index d4bcb17..cbb9c3a 100755 Binary files a/FFmpegAndroid/obj/local/armeabi-v7a/libARM_ARCH.so and b/FFmpegAndroid/obj/local/armeabi-v7a/libARM_ARCH.so differ diff --git a/FFmpegAndroid/obj/local/armeabi-v7a/objs/ARM_ARCH/armArch.o b/FFmpegAndroid/obj/local/armeabi-v7a/objs/ARM_ARCH/armArch.o index c0ce660..89caf50 100644 Binary files a/FFmpegAndroid/obj/local/armeabi-v7a/objs/ARM_ARCH/armArch.o and b/FFmpegAndroid/obj/local/armeabi-v7a/objs/ARM_ARCH/armArch.o differ diff --git a/FFmpegAndroid/obj/local/armeabi/libARM_ARCH.so b/FFmpegAndroid/obj/local/armeabi/libARM_ARCH.so index 678f8a8..b39c7aa 100755 Binary files a/FFmpegAndroid/obj/local/armeabi/libARM_ARCH.so and b/FFmpegAndroid/obj/local/armeabi/libARM_ARCH.so differ diff --git a/FFmpegAndroid/obj/local/armeabi/objs/ARM_ARCH/armArch.o b/FFmpegAndroid/obj/local/armeabi/objs/ARM_ARCH/armArch.o index acd7937..638da47 100644 Binary files a/FFmpegAndroid/obj/local/armeabi/objs/ARM_ARCH/armArch.o and b/FFmpegAndroid/obj/local/armeabi/objs/ARM_ARCH/armArch.o differ diff --git a/FFmpegAndroid/src/main/AndroidManifest.xml b/FFmpegAndroid/src/main/AndroidManifest.xml index 115aebc..9e6c29b 100644 --- a/FFmpegAndroid/src/main/AndroidManifest.xml +++ b/FFmpegAndroid/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.github.hiteshsondhi88.libffmpeg"> diff --git a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/ArmArchHelper.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ArmArchHelper.java similarity index 89% rename from FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/ArmArchHelper.java rename to FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ArmArchHelper.java index 9051635..3936a49 100644 --- a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/ArmArchHelper.java +++ b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ArmArchHelper.java @@ -1,4 +1,4 @@ -package github.hiteshsondhi88.libffmpeg; +package com.github.hiteshsondhi88.libffmpeg; class ArmArchHelper { static { diff --git a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/CommandResult.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CommandResult.java similarity index 94% rename from FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/CommandResult.java rename to FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CommandResult.java index 6e70545..e5625b5 100644 --- a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/CommandResult.java +++ b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CommandResult.java @@ -1,4 +1,4 @@ -package github.hiteshsondhi88.libffmpeg; +package com.github.hiteshsondhi88.libffmpeg; class CommandResult { final String output; diff --git a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/CpuArch.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArch.java similarity index 53% rename from FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/CpuArch.java rename to FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArch.java index 7b3efd3..686268c 100644 --- a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/CpuArch.java +++ b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArch.java @@ -1,4 +1,4 @@ -package github.hiteshsondhi88.libffmpeg; +package com.github.hiteshsondhi88.libffmpeg; enum CpuArch { x86, ARMv7, ARMv7_NEON, NONE diff --git a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/CpuArchHelper.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelper.java similarity index 95% rename from FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/CpuArchHelper.java rename to FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelper.java index eb9e590..069e8a9 100644 --- a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/CpuArchHelper.java +++ b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelper.java @@ -1,4 +1,4 @@ -package github.hiteshsondhi88.libffmpeg; +package com.github.hiteshsondhi88.libffmpeg; import android.os.Build; diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ExecuteBinaryResponseHandler.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ExecuteBinaryResponseHandler.java new file mode 100644 index 0000000..4f7115e --- /dev/null +++ b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ExecuteBinaryResponseHandler.java @@ -0,0 +1,29 @@ +package com.github.hiteshsondhi88.libffmpeg; + +public class ExecuteBinaryResponseHandler implements FFmpegExecuteResponseHandler { + + @Override + public void onSuccess(String message) { + + } + + @Override + public void onProgress(String message) { + + } + + @Override + public void onFailure(String message) { + + } + + @Override + public void onStart() { + + } + + @Override + public void onFinish() { + + } +} diff --git a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpeg.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpeg.java similarity index 94% rename from FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpeg.java rename to FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpeg.java index 3b43af8..20af734 100644 --- a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpeg.java +++ b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpeg.java @@ -1,12 +1,12 @@ -package github.hiteshsondhi88.libffmpeg; +package com.github.hiteshsondhi88.libffmpeg; import android.content.Context; import android.text.TextUtils; import java.util.Map; -import github.hiteshsondhi88.libffmpeg.exceptions.FFmpegCommandAlreadyRunningException; -import github.hiteshsondhi88.libffmpeg.exceptions.FFmpegNotSupportedException; +import com.github.hiteshsondhi88.libffmpeg.exceptions.FFmpegCommandAlreadyRunningException; +import com.github.hiteshsondhi88.libffmpeg.exceptions.FFmpegNotSupportedException; @SuppressWarnings("unused") public class FFmpeg implements FFmpegInterface { diff --git a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpegExecuteAsyncTask.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegExecuteAsyncTask.java similarity index 91% rename from FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpegExecuteAsyncTask.java rename to FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegExecuteAsyncTask.java index 9ffccdf..fca2937 100644 --- a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpegExecuteAsyncTask.java +++ b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegExecuteAsyncTask.java @@ -1,4 +1,4 @@ -package github.hiteshsondhi88.libffmpeg; +package com.github.hiteshsondhi88.libffmpeg; import android.os.AsyncTask; @@ -15,6 +15,7 @@ class FFmpegExecuteAsyncTask extends AsyncTask { private final long timeout; private long startTime; private Process process; + private String output = ""; FFmpegExecuteAsyncTask(String cmd, long timeout, FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler) { this.cmd = cmd; @@ -62,10 +63,11 @@ protected void onProgressUpdate(String... values) { @Override protected void onPostExecute(CommandResult commandResult) { if (ffmpegExecuteResponseHandler != null) { + output += commandResult.output; if (commandResult.success) { - ffmpegExecuteResponseHandler.onSuccess(commandResult.output); + ffmpegExecuteResponseHandler.onSuccess(output); } else { - ffmpegExecuteResponseHandler.onFailure(commandResult.output); + ffmpegExecuteResponseHandler.onFailure(output); } ffmpegExecuteResponseHandler.onFinish(); } @@ -87,6 +89,7 @@ private void checkAndUpdateProcess() throws TimeoutException, InterruptedExcepti String line; BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream())); while ((line = reader.readLine()) != null) { + output += line+"\n"; publishProgress(line); } } catch (IOException e) { diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegExecuteResponseHandler.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegExecuteResponseHandler.java new file mode 100644 index 0000000..0c67131 --- /dev/null +++ b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegExecuteResponseHandler.java @@ -0,0 +1,23 @@ +package com.github.hiteshsondhi88.libffmpeg; + +public interface FFmpegExecuteResponseHandler extends ResponseHandler { + + /** + * on Success + * @param message complete output of the FFmpeg command + */ + public void onSuccess(String message); + + /** + * on Progress + * @param message current output of FFmpeg command + */ + public void onProgress(String message); + + /** + * on Failure + * @param message complete output of the FFmpeg command + */ + public void onFailure(String message); + +} diff --git a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpegInterface.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegInterface.java similarity index 77% rename from FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpegInterface.java rename to FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegInterface.java index f47269c..756cd0c 100644 --- a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpegInterface.java +++ b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegInterface.java @@ -1,16 +1,16 @@ -package github.hiteshsondhi88.libffmpeg; +package com.github.hiteshsondhi88.libffmpeg; import java.util.Map; -import github.hiteshsondhi88.libffmpeg.exceptions.FFmpegCommandAlreadyRunningException; -import github.hiteshsondhi88.libffmpeg.exceptions.FFmpegNotSupportedException; +import com.github.hiteshsondhi88.libffmpeg.exceptions.FFmpegCommandAlreadyRunningException; +import com.github.hiteshsondhi88.libffmpeg.exceptions.FFmpegNotSupportedException; @SuppressWarnings("unused") interface FFmpegInterface { /** * Load binary to the device according to archituecture. This also updates FFmpeg binary if the binary on device have old version. - * @param ffmpegLoadBinaryResponseHandler {@link github.hiteshsondhi88.libffmpeg.FFmpegLoadBinaryResponseHandler} + * @param ffmpegLoadBinaryResponseHandler {@link FFmpegLoadBinaryResponseHandler} * @throws FFmpegNotSupportedException */ public void loadBinary(FFmpegLoadBinaryResponseHandler ffmpegLoadBinaryResponseHandler) throws FFmpegNotSupportedException; @@ -19,7 +19,7 @@ interface FFmpegInterface { * Executes a command * @param environvenmentVars Environment variables * @param cmd command to execute - * @param ffmpegExecuteResponseHandler {@link github.hiteshsondhi88.libffmpeg.FFmpegExecuteResponseHandler} + * @param ffmpegExecuteResponseHandler {@link FFmpegExecuteResponseHandler} * @throws FFmpegCommandAlreadyRunningException */ public void execute(Map environvenmentVars, String cmd, FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler) throws FFmpegCommandAlreadyRunningException; @@ -27,7 +27,7 @@ interface FFmpegInterface { /** * Executes a command * @param cmd command to execute - * @param ffmpegExecuteResponseHandler {@link github.hiteshsondhi88.libffmpeg.FFmpegExecuteResponseHandler} + * @param ffmpegExecuteResponseHandler {@link FFmpegExecuteResponseHandler} * @throws FFmpegCommandAlreadyRunningException */ public void execute(String cmd, FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler) throws FFmpegCommandAlreadyRunningException; diff --git a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpegLoadBinaryResponseHandler.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegLoadBinaryResponseHandler.java similarity index 55% rename from FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpegLoadBinaryResponseHandler.java rename to FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegLoadBinaryResponseHandler.java index b0fb600..87cfc9f 100644 --- a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpegLoadBinaryResponseHandler.java +++ b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegLoadBinaryResponseHandler.java @@ -1,8 +1,15 @@ -package github.hiteshsondhi88.libffmpeg; +package com.github.hiteshsondhi88.libffmpeg; public interface FFmpegLoadBinaryResponseHandler extends ResponseHandler { + /** + * on Fail + */ public void onFailure(); + + /** + * on Success + */ public void onSuccess(); } diff --git a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpegLoadLibraryAsyncTask.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegLoadLibraryAsyncTask.java similarity index 95% rename from FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpegLoadLibraryAsyncTask.java rename to FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegLoadLibraryAsyncTask.java index 0ccd2cb..f81537d 100644 --- a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpegLoadLibraryAsyncTask.java +++ b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegLoadLibraryAsyncTask.java @@ -1,4 +1,4 @@ -package github.hiteshsondhi88.libffmpeg; +package com.github.hiteshsondhi88.libffmpeg; import android.content.Context; import android.os.AsyncTask; @@ -6,7 +6,7 @@ import java.io.File; -import github.hiteshsondhi88.libffmpeg.exceptions.FFmpegCommandAlreadyRunningException; +import com.github.hiteshsondhi88.libffmpeg.exceptions.FFmpegCommandAlreadyRunningException; class FFmpegLoadLibraryAsyncTask extends AsyncTask { diff --git a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FileUtils.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FileUtils.java similarity index 97% rename from FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FileUtils.java rename to FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FileUtils.java index 36a647e..11a88be 100644 --- a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FileUtils.java +++ b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FileUtils.java @@ -1,4 +1,4 @@ -package github.hiteshsondhi88.libffmpeg; +package com.github.hiteshsondhi88.libffmpeg; import android.content.Context; import android.util.Log; diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/LoadBinaryResponseHandler.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/LoadBinaryResponseHandler.java new file mode 100644 index 0000000..1c60a34 --- /dev/null +++ b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/LoadBinaryResponseHandler.java @@ -0,0 +1,24 @@ +package com.github.hiteshsondhi88.libffmpeg; + +public class LoadBinaryResponseHandler implements FFmpegLoadBinaryResponseHandler { + + @Override + public void onFailure() { + + } + + @Override + public void onSuccess() { + + } + + @Override + public void onStart() { + + } + + @Override + public void onFinish() { + + } +} diff --git a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/Log.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/Log.java similarity index 96% rename from FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/Log.java rename to FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/Log.java index fbd9c25..33b7033 100644 --- a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/Log.java +++ b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/Log.java @@ -1,4 +1,4 @@ -package github.hiteshsondhi88.libffmpeg; +package com.github.hiteshsondhi88.libffmpeg; @SuppressWarnings("unused") class Log { diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ResponseHandler.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ResponseHandler.java new file mode 100644 index 0000000..185bf8a --- /dev/null +++ b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ResponseHandler.java @@ -0,0 +1,15 @@ +package com.github.hiteshsondhi88.libffmpeg; + +abstract interface ResponseHandler { + + /** + * on Start + */ + public void onStart(); + + /** + * on Finish + */ + public void onFinish(); + +} diff --git a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/ShellCommand.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ShellCommand.java similarity index 96% rename from FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/ShellCommand.java rename to FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ShellCommand.java index 2b431df..6da5a4a 100644 --- a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/ShellCommand.java +++ b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ShellCommand.java @@ -1,4 +1,4 @@ -package github.hiteshsondhi88.libffmpeg; +package com.github.hiteshsondhi88.libffmpeg; import java.io.IOException; diff --git a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/Util.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/Util.java similarity index 97% rename from FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/Util.java rename to FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/Util.java index 564583b..e4570ff 100644 --- a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/Util.java +++ b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/Util.java @@ -1,4 +1,4 @@ -package github.hiteshsondhi88.libffmpeg; +package com.github.hiteshsondhi88.libffmpeg; import android.content.Context; import android.content.pm.ApplicationInfo; diff --git a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/exceptions/FFmpegCommandAlreadyRunningException.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/exceptions/FFmpegCommandAlreadyRunningException.java similarity index 75% rename from FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/exceptions/FFmpegCommandAlreadyRunningException.java rename to FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/exceptions/FFmpegCommandAlreadyRunningException.java index e52373b..749e3a1 100644 --- a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/exceptions/FFmpegCommandAlreadyRunningException.java +++ b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/exceptions/FFmpegCommandAlreadyRunningException.java @@ -1,4 +1,4 @@ -package github.hiteshsondhi88.libffmpeg.exceptions; +package com.github.hiteshsondhi88.libffmpeg.exceptions; public class FFmpegCommandAlreadyRunningException extends Exception { diff --git a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/exceptions/FFmpegNotSupportedException.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/exceptions/FFmpegNotSupportedException.java similarity index 73% rename from FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/exceptions/FFmpegNotSupportedException.java rename to FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/exceptions/FFmpegNotSupportedException.java index e0e8594..45d3aaf 100644 --- a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/exceptions/FFmpegNotSupportedException.java +++ b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/exceptions/FFmpegNotSupportedException.java @@ -1,4 +1,4 @@ -package github.hiteshsondhi88.libffmpeg.exceptions; +package com.github.hiteshsondhi88.libffmpeg.exceptions; public class FFmpegNotSupportedException extends Exception { diff --git a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpegExecuteResponseHandler.java b/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpegExecuteResponseHandler.java deleted file mode 100644 index 02ced00..0000000 --- a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpegExecuteResponseHandler.java +++ /dev/null @@ -1,9 +0,0 @@ -package github.hiteshsondhi88.libffmpeg; - -public interface FFmpegExecuteResponseHandler extends ResponseHandler { - - public void onFailure(String message); - public void onSuccess(String message); - public void onProgress(String message); - -} diff --git a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/ResponseHandler.java b/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/ResponseHandler.java deleted file mode 100644 index 5b416e8..0000000 --- a/FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/ResponseHandler.java +++ /dev/null @@ -1,8 +0,0 @@ -package github.hiteshsondhi88.libffmpeg; - -interface ResponseHandler { - - public void onStart(); - public void onFinish(); - -} diff --git a/README.md b/README.md index aaf331f..f0725fa 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,10 @@ For examples and usage instructions head over to: * armv7-neon * x86 +## Sample +![http://i.imgur.com/cP4WhLn.gif](http://i.imgur.com/cP4WhLn.gif) +[Download APK](https://github.com/hiteshsondhi88/ffmpeg-android-java/releases/download/v0.2.1/app-debug.apk) + ## JavaDoc * [Javadoc](http://hiteshsondhi88.github.io/ffmpeg-android-java/docs/) diff --git a/app/app.iml b/app/app.iml index 03634ec..5e80c8e 100644 --- a/app/app.iml +++ b/app/app.iml @@ -85,6 +85,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index af93a34..897684e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,11 +5,11 @@ android { buildToolsVersion "20.0.0" defaultConfig { - applicationId "github.hiteshsondhi88.sampleffmpeg" + applicationId "com.github.hiteshsondhi88.sampleffmpeg" minSdkVersion 16 targetSdkVersion 20 - versionCode 1 - versionName "1.0" + versionCode 21 + versionName "0.2.1" } sourceSets.main { @@ -18,6 +18,10 @@ android { jni.srcDirs = [] //disable automatic ndk-build } + packagingOptions { + exclude 'META-INF/services/javax.annotation.processing.Processor' + } + buildTypes { release { runProguard false @@ -29,10 +33,8 @@ android { dependencies { compile 'com.squareup.dagger:dagger-compiler:1.2.2' compile 'com.squareup.dagger:dagger:1.2.2' - + compile 'com.jakewharton:butterknife:5.1.2' compile fileTree(dir: 'libs', include: ['*.jar']) - - compile project(':FFmpegAndroid') - androidTestCompile 'com.squareup.assertj:assertj-android:1.0.0' + compile project(':FFmpegAndroid') } diff --git a/app/src/androidTest/java/github/hiteshsondhi88/sampleffmpeg/FFmpegInstrumentationTest.java b/app/src/androidTest/java/com/github/hiteshsondhi88/sampleffmpeg/FFmpegInstrumentationTest.java similarity index 95% rename from app/src/androidTest/java/github/hiteshsondhi88/sampleffmpeg/FFmpegInstrumentationTest.java rename to app/src/androidTest/java/com/github/hiteshsondhi88/sampleffmpeg/FFmpegInstrumentationTest.java index 5140e23..7b9f160 100644 --- a/app/src/androidTest/java/github/hiteshsondhi88/sampleffmpeg/FFmpegInstrumentationTest.java +++ b/app/src/androidTest/java/com/github/hiteshsondhi88/sampleffmpeg/FFmpegInstrumentationTest.java @@ -1,4 +1,4 @@ -package github.hiteshsondhi88.sampleffmpeg; +package com.github.hiteshsondhi88.sampleffmpeg; import android.os.Environment; import android.test.ActivityInstrumentationTestCase2; @@ -8,10 +8,10 @@ import javax.inject.Inject; -import github.hiteshsondhi88.libffmpeg.FFmpeg; -import github.hiteshsondhi88.libffmpeg.FFmpegExecuteResponseHandler; -import github.hiteshsondhi88.libffmpeg.FFmpegLoadBinaryResponseHandler; -import github.hiteshsondhi88.libffmpeg.exceptions.FFmpegCommandAlreadyRunningException; +import com.github.hiteshsondhi88.libffmpeg.FFmpeg; +import com.github.hiteshsondhi88.libffmpeg.FFmpegExecuteResponseHandler; +import com.github.hiteshsondhi88.libffmpeg.FFmpegLoadBinaryResponseHandler; +import com.github.hiteshsondhi88.libffmpeg.exceptions.FFmpegCommandAlreadyRunningException; import static org.assertj.core.api.Assertions.assertThat; diff --git a/app/src/androidTest/java/github/hiteshsondhi88/sampleffmpeg/Util.java b/app/src/androidTest/java/com/github/hiteshsondhi88/sampleffmpeg/Util.java similarity index 97% rename from app/src/androidTest/java/github/hiteshsondhi88/sampleffmpeg/Util.java rename to app/src/androidTest/java/com/github/hiteshsondhi88/sampleffmpeg/Util.java index 06f8bf9..ad32e9d 100644 --- a/app/src/androidTest/java/github/hiteshsondhi88/sampleffmpeg/Util.java +++ b/app/src/androidTest/java/com/github/hiteshsondhi88/sampleffmpeg/Util.java @@ -1,4 +1,4 @@ -package github.hiteshsondhi88.sampleffmpeg; +package com.github.hiteshsondhi88.sampleffmpeg; import android.content.Context; import android.util.Log; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 581cdf1..7a7ba8d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,8 @@ + package="com.github.hiteshsondhi88.sampleffmpeg" > + + + tools:context=".Home" + android:orientation="vertical"> - + +