Merge pull request #6 from brarcher/support-encoding

Support encoding

Author: brarcher

app/build.gradle

@@ -40,7 +40,7 @@ dependencies {
     compile 'com.android.support:appcompat-v7:27.0.2'
     compile 'com.android.support:design:27.0.2'
     compile 'com.writingminds:FFmpegAndroid:0.3.2'
-    compile 'org.florescu.android.rangeseekbar:rangeseekbar-library:0.3.0'
+    compile 'com.crystal:crystalrangeseekbar:1.1.3'
     compile 'commons-io:commons-io:2.5'
     compile group: 'com.google.guava', name: 'guava', version: '20.0'
     testCompile 'junit:junit:4.12'

app/src/main/AndroidManifest.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
     package="protect.videotranscoder">
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <application
         android:allowBackup="false"
+        tools:replace="android:allowBackup"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"

app/src/main/java/protect/videotranscoder/FFmpegResponseHandler.java

@@ -10,15 +10,13 @@ public class FFmpegResponseHandler extends ExecuteBinaryResponseHandler
 {
     private static final String TAG = "VideoTranscoder";
 
-    private final Context _context;
     private final long _durationMs;
     private final ProgressDialog _progressDialog;
     private final ResultCallbackHandler<Boolean> _resultHandler;
 
-    public FFmpegResponseHandler(Context context, long durationMs, ProgressDialog progressDialog,
+    public FFmpegResponseHandler(long durationMs, ProgressDialog progressDialog,
                                  ResultCallbackHandler<Boolean> resultHandler)
     {
-        _context = context;
         _durationMs = durationMs;
         _progressDialog = progressDialog;
         _resultHandler = resultHandler;

app/src/main/java/protect/videotranscoder/FFmpegUtil.java

@@ -20,8 +20,10 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import protect.videotranscoder.media.AudioCodec;
 import protect.videotranscoder.media.MediaInfo;
 import protect.videotranscoder.media.MediaContainer;
+import protect.videotranscoder.media.VideoCodec;
 
 /**
  * Utility class for executing ffmpeg
@@ -186,11 +188,12 @@ public void onResult(String mediaDetailsStr)
     static MediaInfo parseMediaInfo(File mediaFile, String string)
     {
         long durationMs = 0;
-        String videoCodec = null;
+        MediaContainer container = null;
+        VideoCodec videoCodec = null;
         String videoResolution = null;
         String videoBitrate = null;
         String videoFramerate = null;
-        String audioCodec = null;
+        AudioCodec audioCodec = null;
         String audioSampleRate = null;
         String audioBitrate = null;
         int audioChannels = 2;
@@ -242,6 +245,18 @@ static MediaInfo parseMediaInfo(File mediaFile, String string)
                 durationMs = time;
             }
 
+            if(line.startsWith("Input"))
+            {
+                for(MediaContainer item : MediaContainer.values())
+                {
+                    if(line.contains(item.ffmpegName))
+                    {
+                        container = item;
+                        break;
+                    }
+                }
+            }
+
             if(line.startsWith("Stream") && line.contains("Video:"))
             {
                 // Stream #0:0: Video: h264 (Main), yuv420p, 640x360 [SAR 1:1 DAR 16:9], 25 fps, 25 tbr, 1k tbn, 50 tbc
@@ -252,7 +267,9 @@ static MediaInfo parseMediaInfo(File mediaFile, String string)
                 {
                     continue;
                 }
-                videoCodec = split[3];
+
+                String videoCodecName = split[3];
+                videoCodec = VideoCodec.fromName(videoCodecName);
 
                 // Looking for resolution. There are sometimes items such as:
                 //  (mp4a / 0x6134706D)
@@ -274,12 +291,12 @@ static MediaInfo parseMediaInfo(File mediaFile, String string)
 
                     if(piece.contains("kb/s"))
                     {
-                        videoBitrate = piece;
+                        videoBitrate = piece.replace("kb/s", "").trim();
                     }
 
                     if(piece.contains("fps"))
                     {
-                        videoFramerate = piece;
+                        videoFramerate = piece.replace("fps", "").trim();
                     }
                 }
             }
@@ -294,7 +311,9 @@ static MediaInfo parseMediaInfo(File mediaFile, String string)
                 {
                     continue;
                 }
-                audioCodec = split[3];
+
+                String audioCodecName = split[3];
+                audioCodec = AudioCodec.fromName(audioCodecName);
 
                 split = line.split(",");
                 for(String piece : split)
@@ -303,12 +322,12 @@ static MediaInfo parseMediaInfo(File mediaFile, String string)
 
                     if(piece.contains("Hz"))
                     {
-                        audioSampleRate = piece;
+                        audioSampleRate = piece.replace("Hz", "").trim();
                     }
 
                     if(piece.contains("kb/s"))
                     {
-                        audioBitrate = piece;
+                        audioBitrate = piece.replace("kb/s", "").trim();
 
                         if(audioBitrate.contains("(default)"))
                         {
@@ -324,7 +343,7 @@ static MediaInfo parseMediaInfo(File mediaFile, String string)
             }
         }
 
-        MediaInfo info = new MediaInfo(mediaFile, durationMs, videoCodec, videoResolution,
+        MediaInfo info = new MediaInfo(mediaFile, durationMs, container, videoCodec, videoResolution,
                 videoBitrate, videoFramerate, audioCodec, audioSampleRate, audioBitrate, audioChannels);
         return info;
     }