Merge pull request #63 from CharlieChristensen/master

Allow passing logger through constructor
MasayukiSuda · Jan 23, 2020 · 94c76e2 · 94c76e2
2 parents ecbefb0 + 8d97bb2
commit 94c76e2
Showing 1 changed file with 16 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
@@ -67,6 +67,11 @@ public void onError(Exception e) {
     };
 
     public Mp4Composer(@NonNull final String srcPath, @NonNull final String destPath) {
+        this(srcPath, destPath, new AndroidLogger());
+    }
+
+    public Mp4Composer(@NonNull final String srcPath, @NonNull final String destPath, @NonNull final Logger logger) {
+        this.logger = logger;
         this.srcDataSource = new FilePathDataSource(srcPath, logger, errorDataSource);
         this.destPath = destPath;
     }
@@ -77,6 +82,11 @@ public Mp4Composer(@NonNull final FileDescriptor srcFileDescriptor, @NonNull fin
     }
 
     public Mp4Composer(@NonNull final Uri srcUri, @NonNull final String destPath, @NonNull final Context context) {
+        this(srcUri, destPath, context, new AndroidLogger());
+    }
+
+    public Mp4Composer(@NonNull final Uri srcUri, @NonNull final String destPath, @NonNull final Context context, @NonNull final Logger logger) {
+        this.logger = logger;
         this.srcDataSource = new UriDataSource(srcUri, context, logger, errorDataSource);
         this.destPath = destPath;
     }
@@ -93,9 +103,15 @@ public Mp4Composer(@NonNull final FileDescriptor srcFileDescriptor, @NonNull fin
 
     @TargetApi(Build.VERSION_CODES.O)
     public Mp4Composer(@NonNull final Uri srcUri, @NonNull final FileDescriptor destFileDescriptor, @NonNull final Context context) {
+        this(srcUri, destFileDescriptor, context, new AndroidLogger());
+    }
+
+    @TargetApi(Build.VERSION_CODES.O)
+    public Mp4Composer(@NonNull final Uri srcUri, @NonNull final FileDescriptor destFileDescriptor, @NonNull final Context context, @NonNull final Logger logger) {
         if (Build.VERSION.SDK_INT < 26) {
             throw new IllegalArgumentException("destFileDescriptor can not use");
         }
+        this.logger = logger;
         this.srcDataSource = new UriDataSource(srcUri, context, logger, errorDataSource);
         this.destPath = null;
         this.destFileDescriptor = destFileDescriptor;