Add MediaContainer to MediaInfo

Author: brarcher

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

@@ -188,6 +188,7 @@ public void onResult(String mediaDetailsStr)
     static MediaInfo parseMediaInfo(File mediaFile, String string)
     {
         long durationMs = 0;
+        MediaContainer container = null;
         VideoCodec videoCodec = null;
         String videoResolution = null;
         String videoBitrate = null;
@@ -244,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
@@ -330,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;
     }

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

@@ -49,6 +49,7 @@
 import protect.videotranscoder.R;
 import protect.videotranscoder.ResultCallbackHandler;
 import protect.videotranscoder.media.AudioCodec;
+import protect.videotranscoder.media.MediaContainer;
 import protect.videotranscoder.media.MediaInfo;
 import protect.videotranscoder.media.VideoCodec;
 
@@ -352,7 +353,7 @@ 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, "640x480",
+                            result = new MediaInfo(videoFile, 0, MediaContainer.MP4, VideoCodec.MPEG4, "640x480",
                                 "800", "25", AudioCodec.MP3,
                                 "44100", "128", 2);
                         }

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

@@ -9,6 +9,7 @@ public class MediaInfo
 {
     public final File file;
     public final long durationMs;
+    public final MediaContainer container;
     public final VideoCodec videoCodec;
     public final String videoResolution;
     public final String videoBitrate;
@@ -19,12 +20,14 @@ public class MediaInfo
     public final int audioChannels;
 
 
-    public MediaInfo(File file, long durationMs, VideoCodec videoCodec, String videoResolution,
-                     String videoBitrate, String videoFramerate, AudioCodec audioCodec,
-                     String audioSampleRate, String audioBitrate, int audioChannels)
+    public MediaInfo(File file, long durationMs, MediaContainer container, VideoCodec videoCodec,
+                     String videoResolution, String videoBitrate, String videoFramerate,
+                     AudioCodec audioCodec, String audioSampleRate, String audioBitrate,
+                     int audioChannels)
     {
         this.file = file;
         this.durationMs = durationMs;
+        this.container = container;
         this.videoCodec = videoCodec;
         this.videoResolution = videoResolution;
         this.videoBitrate = videoBitrate;

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

@@ -45,7 +45,7 @@ public void parseMediaInfo() throws Exception
 
         assertEquals(file, info.file);
         assertEquals( (2*60+22)*1000 + 86, info.durationMs);
-
+        assertEquals(MediaContainer.MP4, info.container);
         assertEquals(VideoCodec.H264, info.videoCodec);
         assertEquals("1080x1920", info.videoResolution);
         assertEquals("4499 kb/s", info.videoBitrate);
@@ -81,7 +81,7 @@ public void parseMediaInfo() throws Exception
 
         assertEquals(file, info.file);
         assertEquals( (10)*1000 + 5, info.durationMs);
-
+        assertEquals(MediaContainer.MP4, info.container);
         assertEquals(VideoCodec.MPEG4, info.videoCodec);
         assertEquals("320x240", info.videoResolution);
         assertEquals("705 kb/s", info.videoBitrate);
@@ -90,6 +90,26 @@ public void parseMediaInfo() throws Exception
         assertEquals("22050 Hz", info.audioSampleRate);
         assertEquals("47 kb/s", info.audioBitrate);
         assertEquals(2, info.audioChannels);
+
+        string = "Input #0, flv, from 'SampleVideo_360x240_1mb.flv':\n" +
+                "  Metadata:\n" + "    encoder         : Lavf53.24.2\n" +
+                "  Duration: 00:00:10.64, start: 0.000000, bitrate: 792 kb/s\n" +
+                "    Stream #0:0: Audio: aac (LC), 48000 Hz, 5.1, fltp\n" +
+                "    Stream #0:1: Video: flv1, yuv420p, 320x240, 25 fps, 25 tbr, 1k tbn";
+
+        info = FFmpegUtil.parseMediaInfo(file, string);
+
+        assertEquals(file, info.file);
+        assertEquals( (10)*1000 + 64, info.durationMs);
+        assertEquals(MediaContainer.FLV, info.container);
+        assertEquals(null, info.videoCodec);
+        assertEquals("320x240", info.videoResolution);
+        assertEquals(null, info.videoBitrate);
+        assertEquals("25 fps", info.videoFramerate);
+        assertEquals(AudioCodec.AAC, info.audioCodec);
+        assertEquals("48000 Hz", info.audioSampleRate);
+        assertEquals(null, info.audioBitrate);
+        assertEquals(2, info.audioChannels);
     }
 
     @Test