Use VideoCodec and AudioCodec in MediaInfo

Author: brarcher

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,11 @@ public void onResult(String mediaDetailsStr)
     static MediaInfo parseMediaInfo(File mediaFile, String string)
     {
         long durationMs = 0;
-        String videoCodec = 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;
@@ -252,7 +254,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)
@@ -294,7 +298,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)

app/src/main/java/protect/videotranscoder/activity/MainActivity.java

@@ -352,8 +352,8 @@ public void onResult(MediaInfo result)
                         if(result == null)
                         {
                             // Could not query the file, fill in what we know.
-                            result = new MediaInfo(videoFile, 0, VideoCodec.MPEG4.name(), "640x480",
-                                "800", "25", AudioCodec.MP3.name(),
+                            result = new MediaInfo(videoFile, 0, VideoCodec.MPEG4, "640x480",
+                                "800", "25", AudioCodec.MP3,
                                 "44100", "128", 2);
                         }
 

app/src/main/java/protect/videotranscoder/media/AudioCodec.java

@@ -1,5 +1,7 @@
 package protect.videotranscoder.media;
 
+import android.support.annotation.Nullable;
+
 /**
  * List of audio codecs which the application may support
  */
@@ -17,4 +19,18 @@ public enum AudioCodec
         this.ffmpegName = ffmpegName;
     }
 
+    @Nullable
+    public static AudioCodec fromName(String name)
+    {
+        for(AudioCodec item : values())
+        {
+            if(item.ffmpegName.equals(name))
+            {
+                return item;
+            }
+        }
+
+        return null;
+    }
+
 }

app/src/main/java/protect/videotranscoder/media/MediaInfo.java

@@ -9,18 +9,18 @@ public class MediaInfo
 {
     public final File file;
     public final long durationMs;
-    public final String videoCodec;
+    public final VideoCodec videoCodec;
     public final String videoResolution;
     public final String videoBitrate;
     public final String videoFramerate;
-    public final String audioCodec;
+    public final AudioCodec audioCodec;
     public final String audioSampleRate;
     public final String audioBitrate;
     public final int audioChannels;
 
 
-    public MediaInfo(File file, long durationMs, String videoCodec, String videoResolution,
-                     String videoBitrate, String videoFramerate, String audioCodec,
+    public MediaInfo(File file, long durationMs, VideoCodec videoCodec, String videoResolution,
+                     String videoBitrate, String videoFramerate, AudioCodec audioCodec,
                      String audioSampleRate, String audioBitrate, int audioChannels)
     {
         this.file = file;

app/src/main/java/protect/videotranscoder/media/VideoCodec.java

@@ -1,5 +1,7 @@
 package protect.videotranscoder.media;
 
+import android.support.annotation.Nullable;
+
 /**
  * List of video codecs which the application may support
  */
@@ -16,4 +18,18 @@ public enum VideoCodec
         this.ffmpegName = ffmpegName;
     }
 
+    @Nullable
+    public static VideoCodec fromName(String name)
+    {
+        for(VideoCodec item : values())
+        {
+            if(item.ffmpegName.equals(name))
+            {
+                return item;
+            }
+        }
+
+        return null;
+    }
+
 }

app/src/test/java/protect/videotranscoder/FFmpegUtilTest.java

@@ -8,8 +8,10 @@
 import java.io.File;
 import java.util.List;
 
+import protect.videotranscoder.media.AudioCodec;
 import protect.videotranscoder.media.MediaInfo;
 import protect.videotranscoder.media.MediaContainer;
+import protect.videotranscoder.media.VideoCodec;
 
 import static org.junit.Assert.*;
 
@@ -44,11 +46,11 @@ public void parseMediaInfo() throws Exception
         assertEquals(file, info.file);
         assertEquals( (2*60+22)*1000 + 86, info.durationMs);
 
-        assertEquals("h264", info.videoCodec);
+        assertEquals(VideoCodec.H264, info.videoCodec);
         assertEquals("1080x1920", info.videoResolution);
         assertEquals("4499 kb/s", info.videoBitrate);
         assertEquals("19.01 fps", info.videoFramerate);
-        assertEquals("aac", info.audioCodec);
+        assertEquals(AudioCodec.AAC, info.audioCodec);
         assertEquals("22050 Hz", info.audioSampleRate);
         assertEquals("63 kb/s", info.audioBitrate);
         assertEquals(1, info.audioChannels);
@@ -80,11 +82,11 @@ public void parseMediaInfo() throws Exception
         assertEquals(file, info.file);
         assertEquals( (10)*1000 + 5, info.durationMs);
 
-        assertEquals("mpeg4", info.videoCodec);
+        assertEquals(VideoCodec.MPEG4, info.videoCodec);
         assertEquals("320x240", info.videoResolution);
         assertEquals("705 kb/s", info.videoBitrate);
         assertEquals("25 fps", info.videoFramerate);
-        assertEquals("aac", info.audioCodec);
+        assertEquals(AudioCodec.AAC, info.audioCodec);
         assertEquals("22050 Hz", info.audioSampleRate);
         assertEquals("47 kb/s", info.audioBitrate);
         assertEquals(2, info.audioChannels);