Strip fps and kb/s from media data

Author: brarcher

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

@@ -291,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();
                     }
                 }
             }
@@ -322,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)"))
                         {

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

@@ -48,11 +48,11 @@ public void parseMediaInfo() throws Exception
         assertEquals(MediaContainer.MP4, info.container);
         assertEquals(VideoCodec.H264, info.videoCodec);
         assertEquals("1080x1920", info.videoResolution);
-        assertEquals("4499 kb/s", info.videoBitrate);
-        assertEquals("19.01 fps", info.videoFramerate);
+        assertEquals("4499", info.videoBitrate);
+        assertEquals("19.01", info.videoFramerate);
         assertEquals(AudioCodec.AAC, info.audioCodec);
-        assertEquals("22050 Hz", info.audioSampleRate);
-        assertEquals("63 kb/s", info.audioBitrate);
+        assertEquals("22050", info.audioSampleRate);
+        assertEquals("63", info.audioBitrate);
         assertEquals(1, info.audioChannels);
 
         string = "libavutil      55. 17.103 / 55. 17.103\n" +
@@ -84,11 +84,11 @@ public void parseMediaInfo() throws Exception
         assertEquals(MediaContainer.MP4, info.container);
         assertEquals(VideoCodec.MPEG4, info.videoCodec);
         assertEquals("320x240", info.videoResolution);
-        assertEquals("705 kb/s", info.videoBitrate);
-        assertEquals("25 fps", info.videoFramerate);
+        assertEquals("705", info.videoBitrate);
+        assertEquals("25", info.videoFramerate);
         assertEquals(AudioCodec.AAC, info.audioCodec);
-        assertEquals("22050 Hz", info.audioSampleRate);
-        assertEquals("47 kb/s", info.audioBitrate);
+        assertEquals("22050", info.audioSampleRate);
+        assertEquals("47", info.audioBitrate);
         assertEquals(2, info.audioChannels);
 
         string = "Input #0, flv, from 'SampleVideo_360x240_1mb.flv':\n" +
@@ -105,9 +105,9 @@ public void parseMediaInfo() throws Exception
         assertEquals(null, info.videoCodec);
         assertEquals("320x240", info.videoResolution);
         assertEquals(null, info.videoBitrate);
-        assertEquals("25 fps", info.videoFramerate);
+        assertEquals("25", info.videoFramerate);
         assertEquals(AudioCodec.AAC, info.audioCodec);
-        assertEquals("48000 Hz", info.audioSampleRate);
+        assertEquals("48000", info.audioSampleRate);
         assertEquals(null, info.audioBitrate);
         assertEquals(2, info.audioChannels);
     }