Merge pull request #128 from brarcher/invalid-files-handling

Invalid files handling

Author: brarcher

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

@@ -154,6 +154,16 @@ public static void probeGetOutput(@NonNull final String [] command,
             @Override
             public void onSuccess(String message)
             {
+                // On some systems some warnings are emitted right before the json, such as:
+                //   WARNING: linker: /data/data/protect.videoeditor/files/ffprobe: unused DT entry: type 0x6ffffffe arg 0x22c0
+                // Skip past this to the start of the json, if any exists.
+
+                int jsonStartIndex = message.indexOf('{');
+                if(jsonStartIndex != -1)
+                {
+                    message = message.substring(jsonStartIndex);
+                }
+
                 resultHandler.onResult(message);
             }
 
@@ -499,7 +509,7 @@ static MediaInfo parseMediaInfo(File mediaFile, String mediaDetailsJsonStr)
         }
         catch (IOException e)
         {
-            Log.w(TAG, "Failed to read media details for file : " + mediaFile.getAbsolutePath() + "\n" + mediaDetailsJsonStr);
+            Log.w(TAG, "Failed to read media details for file : " + mediaFile.getAbsolutePath() + "\n" + mediaDetailsJsonStr, e);
         }
 
         if(totalBitrateK != null)
@@ -525,8 +535,14 @@ static MediaInfo parseMediaInfo(File mediaFile, String mediaDetailsJsonStr)
             }
         }
 
-        MediaInfo info = new MediaInfo(mediaFile, durationMs, container, videoCodec, videoResolution,
-                videoBitrateK, videoFramerate, audioCodec, audioSampleRate, audioBitrateK, audioChannels);
+        MediaInfo info = null;
+
+        if(container != null && (videoCodec != null || audioCodec != null))
+        {
+            info = new MediaInfo(mediaFile, durationMs, container, videoCodec, videoResolution,
+                    videoBitrateK, videoFramerate, audioCodec, audioSampleRate, audioBitrateK, audioChannels);
+        }
+
         return info;
     }
 

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

@@ -974,7 +974,7 @@ protected void onResume()
     {
         super.onResume();
 
-        if(isEncoding() == false)
+        if(isEncoding() == false && videoInfo != null)
         {
             startVideoPlayback(null);
         }
@@ -1032,6 +1032,28 @@ private void setSpinnerSelection(Spinner spinner, Object value)
         }
     }
 
+    private void hideAllOptions()
+    {
+        for(int id : BASIC_SETTINGS_IDS)
+        {
+            findViewById(id).setVisibility(View.GONE);
+        }
+        for(int id : VIDEO_SETTINGS_IDS)
+        {
+            findViewById(id).setVisibility(View.GONE);
+        }
+        for(int id : AUDIO_SETTINGS_IDS)
+        {
+            findViewById(id).setVisibility(View.GONE);
+        }
+
+        encodeButton.setVisibility(View.GONE);
+        startJumpBack.setVisibility(View.GONE);
+        startJumpForward.setVisibility(View.GONE);
+        endJumpBack.setVisibility(View.GONE);
+        endJumpForward.setVisibility(View.GONE);
+    }
+
     private void populateOptionDefaults()
     {
         for(int id : BASIC_SETTINGS_IDS)
@@ -1277,9 +1299,6 @@ public void onNothingSelected(AdapterView<?> parentView)
 
     private void setSelectMediaFile(String path, String overrideBaseName)
     {
-        videoView.setVideoPath(path);
-        videoView.start();
-
         videoView.setOnPreparedListener(new MediaPlayer.OnPreparedListener()
         {
             @Override
@@ -1371,26 +1390,28 @@ public void onClick(View v)
             }
         });
 
-        final File videoFile = new File(path);
-
         FFmpegUtil.getMediaDetails(new File(path), new ResultCallbackHandler<MediaInfo>()
         {
             @Override
             public void onResult(MediaInfo result)
             {
-                if(result == null)
-                {
-                    Log.d(TAG, "Failed to query media file, filling in defaults");
-                    // Could not query the file, fill in what we know.
-                    result = new MediaInfo(videoFile, 0, MediaContainer.MP4, VideoCodec.MPEG4, "640x480",
-                        800, "25", AudioCodec.MP3,
-                        44100, 128, 2);
-                }
-
                 videoInfo = result;
-                videoInfo.setFileBaseName(overrideBaseName);
 
-                populateOptionDefaults();
+                if(result != null)
+                {
+                    String uri = Uri.fromFile(new File(path)).toString();
+                    videoView.setVideoPath(uri);
+                    videoView.start();
+
+                    videoInfo.setFileBaseName(overrideBaseName);
+                    populateOptionDefaults();
+                }
+                else
+                {
+                    Toast.makeText(MainActivity.this, R.string.invalidMediaFile, Toast.LENGTH_LONG).show();
+                    hideAllOptions();
+                    stopVideoPlayback();
+                }
             }
         });
     }

app/src/main/res/values/strings.xml

@@ -38,6 +38,7 @@
     <string name="couldNotFindFileSubmsg">could not find input file</string>
     <string name="fieldMissingError"><xliff:g id="field_name">%s</xliff:g> missing</string>
     <string name="fieldMissingOrInvalidError"><xliff:g id="field_name">%s</xliff:g> missing or invalid</string>
+    <string name="invalidMediaFile">The selected media file is invalid or not supported</string>
 
     <string name="writePermissionExplanation">This application needs access to storage in order to read and write media files. Without this access, the application cannot transcode.</string>
     <string name="permissionRequestAgain">Request again</string>

app/src/test/shell/test.py

@@ -5,6 +5,7 @@
 import json
 import collections
 import time
+from datetime import datetime
 
 ASSETS = os.path.dirname(os.path.realpath(__file__)) + os.sep + "assets"
 
@@ -18,11 +19,8 @@ def adb(args):
     if result != 0:
         raise Exception("adb failed with " + str(result) + ": " + str(cmd))
 
-def clearLogcat():
-    adb(["shell", "logcat", "-c"])
-
-def logcat():
-    p = subprocess.Popen(["adb", "logcat", "-d"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+def logcat(sinceTime):
+    p = subprocess.Popen(["adb", "logcat", "-t", sinceTime], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     stdout, stderr = p.communicate()
     rc = p.wait()
     if rc != 0:
@@ -40,12 +38,12 @@ def pushAsset(filename):
 
 def encodeVideoTest(test, output):
     pushAsset(test.filename)
-    clearLogcat()
+    startTime = datetime.now().strftime('%m-%d %H:%M:%S.000')
     encodeVideo(test.filename, output, test.mediaContainer, test.videoCodec, test.videoBitrateK, test.resolution, test.fps, test.audioCodec, test.audioSampleRate, test.audioBitrateK, test.audioChannel)
 
     logs = None
     for count in range(1, 300):
-        logs = logcat()
+        logs = logcat(startTime)
         if "Encode result" in logs:
             break
         time.sleep(1)
@@ -57,6 +55,7 @@ def encodeVideoTest(test, output):
         raise Exception("Failed to encode file: " + test.filename)
 
     pullFile(output)
+    removeFile(output)
 
 def encodeVideo(filename, output, mediaContainer, videoCodec, videoBitrateK, resolution, fps, audioCodec, audioSampleRate, audioBitrateK, audioChannel):
     args = []
@@ -121,12 +120,12 @@ def encodeVideo(filename, output, mediaContainer, videoCodec, videoBitrateK, res
 
 def encodeAudioTest(test, output):
     pushAsset(test.filename)
-    clearLogcat()
+    startTime = datetime.now().strftime('%m-%d %H:%M:%S.000')
     encodeAudio(test.filename, output, test.mediaContainer, test.audioCodec, test.audioSampleRate, test.audioBitrateK, test.audioChannel)
 
     logs = None
     for count in range(1, 300):
-        logs = logcat()
+        logs = logcat(startTime)
         if "Encode result" in logs:
             break
         time.sleep(1)
@@ -138,6 +137,7 @@ def encodeAudioTest(test, output):
         raise Exception("Failed to encode file: " + test.filename)
 
     pullFile(output)
+    removeFile(output)
 
 def encodeAudio(filename, output, mediaContainer, audioCodec, audioSampleRate, audioBitrateK, audioChannel):
     args = []

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.1.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files