Merge pull request #59 from asakahara/master

Add error handling to getting video resolution
MasayukiSuda · Jan 6, 2020 · ca6066c · ca6066c
2 parents ae0516d + 4f1798d
commit ca6066c
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/mp4compose/src/main/java/com/daasuu/mp4compose/composer/Mp4Composer.java b/mp4compose/src/main/java/com/daasuu/mp4compose/composer/Mp4Composer.java
@@ -399,6 +399,15 @@ private Size getVideoResolution(DataSource dataSource) {
             final int height = Integer.valueOf(rawHeight);
 
             return new Size(width, height);
+        } catch (IllegalArgumentException e) {
+            logger.error("MediaMetadataRetriever", "getVideoResolution IllegalArgumentException", e);
+            return null;
+        } catch (RuntimeException e) {
+            logger.error("MediaMetadataRetriever", "getVideoResolution RuntimeException", e);
+            return null;
+        } catch (Exception e) {
+            logger.error("MediaMetadataRetriever", "getVideoResolution Exception", e);
+            return null;
         } finally {
             try {
                 if (retriever != null) {