Merge branch 'release/v0.2.1'

Author: hiteshsondhi88

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 {

FFmpegAndroid/gradle.properties

@@ -0,0 +1,3 @@
+POM_NAME=FFmpegAndroid Library
+POM_ARTIFACT_ID=FFmpegAndroid
+POM_PACKAGING=aar

FFmpegAndroid/jni/armArch.c

@@ -4,7 +4,7 @@
 #include <cpu-features.h>
 
 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

FFmpegAndroid/libs/armeabi-v7a/libARM_ARCH.so

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="github.hiteshsondhi88.libffmpeg">
+    package="com.github.hiteshsondhi88.libffmpeg">
 
     <application
         android:label="@string/app_name">

FFmpegAndroid/libs/armeabi/libARM_ARCH.so

@@ -1,4 +1,4 @@
-package github.hiteshsondhi88.libffmpeg;
+package com.github.hiteshsondhi88.libffmpeg;
 
 class ArmArchHelper {
     static {

FFmpegAndroid/obj/local/armeabi-v7a/libARM_ARCH.so

@@ -1,4 +1,4 @@
-package github.hiteshsondhi88.libffmpeg;
+package com.github.hiteshsondhi88.libffmpeg;
 
 class CommandResult {
     final String output;

FFmpegAndroid/obj/local/armeabi-v7a/objs/ARM_ARCH/armArch.o

@@ -1,4 +1,4 @@
-package github.hiteshsondhi88.libffmpeg;
+package com.github.hiteshsondhi88.libffmpeg;
 
 enum CpuArch {
     x86, ARMv7, ARMv7_NEON, NONE

FFmpegAndroid/obj/local/armeabi/libARM_ARCH.so

@@ -1,4 +1,4 @@
-package github.hiteshsondhi88.libffmpeg;
+package com.github.hiteshsondhi88.libffmpeg;
 
 import android.os.Build;
 

FFmpegAndroid/obj/local/armeabi/objs/ARM_ARCH/armArch.o

@@ -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() {
+
+    }
+}

FFmpegAndroid/src/main/AndroidManifest.xml

@@ -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 {

FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/ArmArchHelper.java FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ArmArchHelper.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<Void, String, CommandResult> {
     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) {

FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/CommandResult.java FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CommandResult.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);
+
+}

FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/CpuArch.java FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArch.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,15 +19,15 @@ 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<String, String> environvenmentVars, String cmd, FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler) throws FFmpegCommandAlreadyRunningException;
 
     /**
      * 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;

FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/CpuArchHelper.java FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelper.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();
 
 }

FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ExecuteBinaryResponseHandler.java

@@ -1,12 +1,12 @@
-package github.hiteshsondhi88.libffmpeg;
+package com.github.hiteshsondhi88.libffmpeg;
 
 import android.content.Context;
 import android.os.AsyncTask;
 import android.text.TextUtils;
 
 import java.io.File;
 
-import github.hiteshsondhi88.libffmpeg.exceptions.FFmpegCommandAlreadyRunningException;
+import com.github.hiteshsondhi88.libffmpeg.exceptions.FFmpegCommandAlreadyRunningException;
 
 class FFmpegLoadLibraryAsyncTask extends AsyncTask<Void, Void, Boolean> {
 

FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpeg.java FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpeg.java

@@ -1,4 +1,4 @@
-package github.hiteshsondhi88.libffmpeg;
+package com.github.hiteshsondhi88.libffmpeg;
 
 import android.content.Context;
 import android.util.Log;

FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpegExecuteAsyncTask.java FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegExecuteAsyncTask.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() {
+
+    }
+}

FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegExecuteResponseHandler.java

@@ -1,4 +1,4 @@
-package github.hiteshsondhi88.libffmpeg;
+package com.github.hiteshsondhi88.libffmpeg;
 
 @SuppressWarnings("unused")
 class Log {

FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpegInterface.java FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegInterface.java

@@ -0,0 +1,15 @@
+package com.github.hiteshsondhi88.libffmpeg;
+
+abstract interface ResponseHandler {
+
+    /**
+     * on Start
+     */
+    public void onStart();
+
+    /**
+     * on Finish
+     */
+    public void onFinish();
+
+}

FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpegLoadBinaryResponseHandler.java FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegLoadBinaryResponseHandler.java

@@ -1,4 +1,4 @@
-package github.hiteshsondhi88.libffmpeg;
+package com.github.hiteshsondhi88.libffmpeg;
 
 import java.io.IOException;
 

FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FFmpegLoadLibraryAsyncTask.java 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.content.pm.ApplicationInfo;

FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/FileUtils.java FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FileUtils.java

@@ -1,4 +1,4 @@
-package github.hiteshsondhi88.libffmpeg.exceptions;
+package com.github.hiteshsondhi88.libffmpeg.exceptions;
 
 public class FFmpegCommandAlreadyRunningException extends Exception {
 

FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/LoadBinaryResponseHandler.java

@@ -1,4 +1,4 @@
-package github.hiteshsondhi88.libffmpeg.exceptions;
+package com.github.hiteshsondhi88.libffmpeg.exceptions;
 
 public class FFmpegNotSupportedException extends Exception {
 

FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/Log.java FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/Log.java

@@ -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/)
 

FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ResponseHandler.java

@@ -85,6 +85,7 @@
     <orderEntry type="library" exported="" scope="TEST" name="assertj-core-1.6.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="support-annotations-20.0.0" level="project" />
     <orderEntry type="library" exported="" name="dagger-compiler-1.2.2" level="project" />
+    <orderEntry type="library" exported="" name="butterknife-5.1.2" level="project" />
     <orderEntry type="library" exported="" name="javawriter-2.5.0" level="project" />
     <orderEntry type="module" module-name="FFmpegAndroid" exported="" />
   </component>

FFmpegAndroid/src/main/java/github/hiteshsondhi88/libffmpeg/ShellCommand.java FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ShellCommand.java

@@ -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')
 }