react-native-video-trim 3.0.8 → 3.0.10

package/README.md

@@ -12,6 +12,7 @@
 - ✅ Save to Photos, Documents and Share to other apps
 - ✅ Check if file is valid video/audio
 - ✅ File operations: list, clean up, delete specific file
+- ✅ Support React Native New + Old Arch
 
 <div align="left">
 <img src="images/document_picker.png" width="300" />
@@ -21,11 +22,19 @@
 ## Installation
 
 ```sh
-npm install react-native-video-trim
+# new arch
+npm install react-native-video-trim react-native-nitro-modules
+
+# old arch
+npm install react-native-video-trim@^3.0.0
 
 # or with yarn
 
-yarn add react-native-video-trim
+# new arch
+yarn add react-native-video-trim react-native-nitro-modules
+
+# old arch
+yarn add react-native-video-trim@^3.0.0
 ```
 ## For iOS (React Native CLI project)
 Run the following command to setup for iOS:
@@ -226,7 +235,6 @@ Main method to show Video Editor UI.
   - `alertOnFailTitle` (`default = "Error"`)
   - `alertOnFailMessage` (`default = "Fail to load media. Possibly invalid file or no network connection"`)
   - `alertOnFailCloseText` (`default = "Close"`)
-  - `progressUpdateInterval` (`default = 0.1`): how fast the trimming progress update interval is, default is emit progress every 100ms (0.1 second)
 
 If `saveToPhoto = true`, you must ensure that you have request permission to write to photo/gallery
 - For Android: you need to have `<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />` in AndroidManifest.xml
@@ -274,7 +282,13 @@ Clean all generated output files in app storage. Return number of successfully d
 ## deleteFile()
 Delete a file in app storage. Return `true` if success
 
-# Events
+# Callbacks (New arch)
+
+## showEditor
+
+## closeEditor
+
+# Events (Old arch)
 To listen for events you interest, do the following:
 ```js
 useEffect(() => {

package/android/build.gradle

@@ -94,6 +94,7 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
   implementation 'androidx.recyclerview:recyclerview:1.3.1'
+  implementation 'io.github.maitrungduc1410:ffmpeg-kit-min:6.0.0'
 }
 
 if (isNewArchitectureEnabled()) {

package/android/src/main/java/com/videotrim/VideoTrimModule.java

@@ -99,7 +99,6 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
   private boolean openShareSheetOnFinish = false;
   private boolean isVideoType = true;
   private boolean closeWhenFinish = true;
-  private float progressUpdateInterval = 0.1f;
 
   private static final int REQUEST_CODE_SAVE_FILE = 1;
 
@@ -195,7 +194,6 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
     isVideoType = !config.hasKey("type") || !Objects.equals(config.getString("type"), "audio");
 
     closeWhenFinish = !config.hasKey("closeWhenFinish") || config.getBoolean("closeWhenFinish");
-    progressUpdateInterval = config.hasKey("progressUpdateInterval") ? (float) config.getDouble("progressUpdateInterval") : 0.1f;
 
     Activity activity = getReactApplicationContext().getCurrentActivity();
 
@@ -374,6 +372,11 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
     alertDialog.show();
   }
 
+  @Override
+  public void onLog(WritableMap log) {
+    sendEvent(getReactApplicationContext(), "onLog", log);
+  }
+
   @Override
   public void onStatistics(WritableMap statistics) {
     sendEvent(getReactApplicationContext(), "onStatistics", statistics);
@@ -433,7 +436,9 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
           builder.setTitle(cancelTrimmingDialogTitle);
           builder.setCancelable(false);
           builder.setPositiveButton(cancelTrimmingDialogConfirmText, (dialog, which) -> {
-            trimmerView.onCancelTrimClicked();
+            if (trimmerView != null) {
+              trimmerView.onCancelTrimClicked();
+            }
 
             if (mProgressDialog != null && mProgressDialog.isShowing()) {
               mProgressDialog.dismiss();
@@ -445,7 +450,9 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
           cancelTrimmingConfirmDialog = builder.create();
           cancelTrimmingConfirmDialog.show();
         } else {
-          trimmerView.onCancelTrimClicked();
+          if (trimmerView != null) {
+            trimmerView.onCancelTrimClicked();
+          }
 
           if (mProgressDialog != null && mProgressDialog.isShowing()) {
             mProgressDialog.dismiss();
@@ -465,7 +472,10 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
 
     mProgressDialog.setOnShowListener(dialog -> {
       sendEvent(getReactApplicationContext(), "onStartTrimming", null);
-      trimmerView.onSaveClicked(progressUpdateInterval);
+
+      if (trimmerView != null) {
+        trimmerView.onSaveClicked();
+      }
     });
 
     mProgressDialog.show();
@@ -552,9 +562,9 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
   private void isValidFile(String filePath, Promise promise) {
     MediaMetadataUtil.checkFileValidity(filePath, (isValid, fileType, duration) -> {
       if (isValid) {
-        System.out.println("Valid " + fileType + " file with duration: " + duration + " milliseconds");
+        Log.d(TAG, "Valid " + fileType + " file with duration: " + duration + " milliseconds");
       } else {
-        System.out.println("Invalid file");
+        Log.d(TAG, "Invalid file");
       }
 
       WritableMap map = Arguments.createMap();

package/android/src/main/java/com/videotrim/interfaces/VideoTrimListener.java

@@ -11,5 +11,6 @@ public interface VideoTrimListener {
   void onError(String errorMessage, ErrorCode errorCode);
   void onCancel();
   void onSave();
+  void onLog(WritableMap log);
   void onStatistics(WritableMap statistics);
 }

package/android/src/main/java/com/videotrim/utils/VideoTrimmerUtil.java

@@ -1,21 +1,27 @@
 package com.videotrim.utils;
 
+import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
-import android.media.MediaCodec;
 import android.media.MediaMetadataRetriever;
+import android.util.Log;
+
+import com.arthenica.ffmpegkit.FFmpegKit;
+import com.arthenica.ffmpegkit.FFmpegSession;
+import com.arthenica.ffmpegkit.ReturnCode;
+import com.arthenica.ffmpegkit.SessionState;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.videotrim.enums.ErrorCode;
 import com.videotrim.interfaces.VideoTrimListener;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+
 import iknow.android.utils.DeviceUtil;
 import iknow.android.utils.UnitConverter;
 import iknow.android.utils.callback.SingleCallback;
 import iknow.android.utils.thread.BackgroundExecutor;
-import android.media.MediaExtractor;
-import android.media.MediaFormat;
-import android.media.MediaMuxer;
-import java.io.IOException;
-import java.nio.ByteBuffer;
 
 public class VideoTrimmerUtil {
 
@@ -36,201 +42,80 @@ public class VideoTrimmerUtil {
   public static final int THUMB_WIDTH = UnitConverter.dpToPx(25); // x2 for better resolution
   private static final int THUMB_RESOLUTION_RES = 2; // double thumb resolution for better quality
 
-  private static final int BUFFER_SIZE = 1024 * 1024; // 1MB buffer
-
-  // Custom session class to manage trimming and cancellation
-  public static class TrimSession {
-    private final Thread trimThread;
-    private volatile boolean isCancelled = false;
-
-    private TrimSession(Thread thread) {
-      this.trimThread = thread;
-    }
-
-    public void cancel() {
-      isCancelled = true;
-      if (trimThread != null) {
-        trimThread.interrupt();
+  public static FFmpegSession trim(String inputFile, String outputFile, int videoDuration, long startMs, long endMs, final VideoTrimListener callback) {
+    // Get the current date and time
+    Date currentDate = new Date();
+
+    // Create a SimpleDateFormat object with the desired format
+    @SuppressLint("SimpleDateFormat") SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+
+    // Set the timezone to UTC
+    dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+    // Format the current date and time
+    String formattedDateTime = dateFormat.format(currentDate);
+
+    String[] cmds = {
+      "-ss",
+      startMs + "ms",
+      "-to",
+      endMs + "ms",
+      "-i",
+      inputFile,
+      "-c",
+      "copy",
+      "-metadata",
+      "creation_time=" + formattedDateTime,
+      outputFile
+    };
+    Log.d(TAG,"Command111: " + String.join(",", cmds));
+
+    FFmpegSession s = FFmpegKit.execute("-protocols");
+    Log.d(TAG, "1111getOutput: " + s.getOutput());
+    Log.d(TAG, "1111getAllLogs: " + s.getAllLogs());
+
+    return FFmpegKit.executeWithArgumentsAsync(cmds, session -> {
+      SessionState state = session.getState();
+      ReturnCode returnCode = session.getReturnCode();
+      if (ReturnCode.isSuccess(session.getReturnCode())) {
+        // SUCCESS
+        callback.onFinishTrim(outputFile, startMs, endMs, videoDuration);
+      } else if (ReturnCode.isCancel(session.getReturnCode())) {
+        // CANCEL
+        callback.onCancelTrim();
+      } else {
+        // FAILURE
+        String errorMessage = String.format("Command failed with state %s and rc %s.%s", state, returnCode, session.getFailStackTrace());
+        callback.onError(errorMessage, ErrorCode.TRIMMING_FAILED);
       }
-    }
-
-    public boolean isActive() {
-      return !isCancelled;
-    }
-  }
-
-  public static TrimSession trim(String inputFile, String outputFile, int videoDuration, long startMs, long endMs, final VideoTrimListener callback, float progressUpdateInterval) {
-    // Start trimming in a background thread
-    Thread trimThread = new Thread(() -> {
-      MediaExtractor extractor = null;
-      MediaMuxer muxer = null;
-      TrimSession session = new TrimSession(Thread.currentThread());
-
-      try {
-        // Get rotation metadata from input file
-        MediaMetadataRetriever retriever = new MediaMetadataRetriever();
-        retriever.setDataSource(inputFile);
-        String rotationStr = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION);
-        int rotation = rotationStr != null ? Integer.parseInt(rotationStr) : 0;
-
-
-        extractor = new MediaExtractor();
-        extractor.setDataSource(inputFile);
-
-        int trackCount = extractor.getTrackCount();
-        muxer = new MediaMuxer(outputFile, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
-        int[] trackIndices = new int[trackCount];
-        long[] trackStartTimes = new long[trackCount];
-        boolean[] tracksAdded = new boolean[trackCount];
-        int videoTrackIndex = -1;
-
-        // Calculate trimmed duration
-        long startUs = startMs * 1000; // e.g., 5s = 5000000us
-        long endUs = endMs * 1000;     // e.g., 9s = 9000000us
-        long trimmedDurationUs = endUs - startUs; // e.g., 4s = 4000000us
-
-        // Determine max buffer size from video format and resolution
-        int maxBufferSize = BUFFER_SIZE; // Default 1MB
-        String widthStr = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH);
-        String heightStr = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT);
-        int width = widthStr != null ? Integer.parseInt(widthStr) : 0; // Default to unknown
-        int height = heightStr != null ? Integer.parseInt(heightStr) : 0;
-
-        // IMPORTANT: after this line, the retriever is no longer needed
-        retriever.release();
-
-        // Adjust buffer size based on resolution
-        if (width > 3840 || height > 2160) { // 8K+
-          maxBufferSize = 16 * 1024 * 1024; // 16MB for 8K
-        } else if (width > 1920 || height > 1080) { // 4K
-          maxBufferSize = 8 * 1024 * 1024; // 8MB for 4K
-        } else if (width > 1280 || height > 720) { // 1080p
-          maxBufferSize = 4 * 1024 * 1024; // 4MB for 1080p
-        } // 720p or lower (or unknown resolution) sticks with BUFFER_SIZE (1MB)
-
-        // Add tracks with corrected duration
-        for (int i = 0; i < trackCount; i++) {
-          MediaFormat format = extractor.getTrackFormat(i);
-
-          // Override with KEY_MAX_INPUT_SIZE if available
-          if (format.containsKey(MediaFormat.KEY_MAX_INPUT_SIZE)) {
-            int maxInputSize = format.getInteger(MediaFormat.KEY_MAX_INPUT_SIZE);
-            maxBufferSize = Math.max(maxBufferSize, maxInputSize);
-          }
-
-          String mime = format.getString(MediaFormat.KEY_MIME);
-          if (mime != null && mime.startsWith("video/")) {
-            videoTrackIndex = i;
-          }
-          // Set the duration for each track to the trimmed duration
-          format.setLong(MediaFormat.KEY_DURATION, trimmedDurationUs);
-          trackIndices[i] = muxer.addTrack(format);
-          tracksAdded[i] = false;
-          extractor.selectTrack(i);
-        }
-
-        // Set rotation metadata on muxer
-        muxer.setOrientationHint(rotation);
-
-        // Seek to start time
-        extractor.seekTo(startUs, MediaExtractor.SEEK_TO_CLOSEST_SYNC);
-
-        ByteBuffer buffer = ByteBuffer.allocate(maxBufferSize);
-        MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
-        long lastProgressTime = System.currentTimeMillis();
-        boolean videoSampleWritten = false;
-
-        muxer.start();
-        while (session.isActive()) {
-          bufferInfo.size = extractor.readSampleData(buffer, 0);
-          if (bufferInfo.size < 0) break; // EOS
-
-          long sampleTime = extractor.getSampleTime();
-          if (sampleTime > endUs) break;
-
-          bufferInfo.presentationTimeUs = sampleTime;
-          int extractorFlags = extractor.getSampleFlags();
-          bufferInfo.flags = (extractorFlags & MediaExtractor.SAMPLE_FLAG_SYNC) != 0 ? MediaCodec.BUFFER_FLAG_KEY_FRAME : 0;
-          int trackIndex = extractor.getSampleTrackIndex();
-
-          if (!tracksAdded[trackIndex]) {
-            trackStartTimes[trackIndex] = sampleTime;
-            tracksAdded[trackIndex] = true;
-          }
-          bufferInfo.presentationTimeUs -= trackStartTimes[trackIndex]; // Adjust time to start at 0
-
-          // Ensure presentation time doesn't exceed trimmed duration
-          if (bufferInfo.presentationTimeUs >= trimmedDurationUs) {
-            extractor.advance();
-            continue;
-          }
-
-          if (trackIndex == videoTrackIndex) {
-            videoSampleWritten = true;
-          }
-          muxer.writeSampleData(trackIndices[trackIndex], buffer, bufferInfo);
-          extractor.advance();
-
-          long currentTime = System.currentTimeMillis();
-          if (currentTime - lastProgressTime >= progressUpdateInterval * 1000) {
-            double progress = (double)(sampleTime - startUs) / (endUs - startUs);
-            if (progress > 0 && progress <= 1) {
-              WritableMap statsMap = Arguments.createMap();
-              statsMap.putDouble("time", progress * videoDuration);
-              statsMap.putDouble("progress", progress); // Percentage
-
-              callback.onStatistics(statsMap);
-              callback.onTrimmingProgress((int)(progress * 100));
-            }
-            lastProgressTime = currentTime;
-          }
-        }
-
-        // For static videos: ensure one video frame if none written
-        if (!videoSampleWritten && videoTrackIndex != -1) {
-          for (int i = 0; i < trackCount; i++) {
-            if (i != videoTrackIndex) {
-              extractor.unselectTrack(i);
-            }
-          }
-          extractor.selectTrack(videoTrackIndex);
-          extractor.seekTo(0, MediaExtractor.SEEK_TO_CLOSEST_SYNC);
-          bufferInfo.size = extractor.readSampleData(buffer, 0);
-          if (bufferInfo.size >= 0) {
-            bufferInfo.presentationTimeUs = 0;
-            // Map MediaExtractor flags to MediaCodec flags
-            int extractorFlags = extractor.getSampleFlags();
-            bufferInfo.flags = (extractorFlags & MediaExtractor.SAMPLE_FLAG_SYNC) != 0 ? MediaCodec.BUFFER_FLAG_KEY_FRAME : 0;
-            muxer.writeSampleData(trackIndices[videoTrackIndex], buffer, bufferInfo);
-          }
-        }
-
-        if (session.isActive()) {
-          muxer.stop();
-          callback.onFinishTrim(outputFile, startMs, endMs, videoDuration);
-        } else {
-          callback.onCancelTrim();
-        }
-
-      } catch (IOException e) {
-        e.printStackTrace();
-        callback.onError("Trimming failed: " + e.getMessage(), ErrorCode.TRIMMING_FAILED);
-      } finally {
-        try {
-          if (muxer != null && session.isActive()) {
-            muxer.release();
-          }
-          if (extractor != null) extractor.release();
-        } catch (Exception e) {
-          e.printStackTrace();
-          System.err.println("Error releasing resources: " + e.getMessage());
-        }
+    }, log -> {
+      Log.d(TAG, "FFmpeg process started with log " + log.getMessage());
+
+      WritableMap map = Arguments.createMap();
+      map.putInt("level", log.getLevel().getValue());
+      map.putString("message", log.getMessage());
+      map.putDouble("sessionId", log.getSessionId());
+      map.putString("logStr", log.toString());
+      callback.onLog(map);
+    }, statistics -> {
+      int timeInMilliseconds = (int) statistics.getTime();
+      if (timeInMilliseconds > 0) {
+        int completePercentage =
+          (timeInMilliseconds * 100) / videoDuration;
+        callback.onTrimmingProgress(Math.min(Math.max(completePercentage, 0), 100));
       }
-    });
 
-    TrimSession session = new TrimSession(trimThread);
-    trimThread.start();
-    return session;
+      WritableMap map = Arguments.createMap();
+      map.putDouble("sessionId", statistics.getSessionId());
+      map.putInt("videoFrameNumber", statistics.getVideoFrameNumber());
+      map.putDouble("videoFps", statistics.getVideoFps());
+      map.putDouble("videoQuality", statistics.getVideoQuality());
+      map.putDouble("size", statistics.getSize());
+      map.putDouble("time", statistics.getTime());
+      map.putDouble("bitrate", statistics.getBitrate());
+      map.putDouble("speed", statistics.getSpeed());
+      map.putString("statisticsStr", statistics.toString());
+      callback.onStatistics(map);
+    });
   }
 
   public static void shootVideoThumbInBackground(final MediaMetadataRetriever mediaMetadataRetriever, final int totalThumbsCount, final long startPosition,

package/android/src/main/java/com/videotrim/widgets/VideoTrimmerView.java

@@ -48,6 +48,7 @@ import java.util.Locale;
 import iknow.android.utils.DeviceUtil;
 import iknow.android.utils.thread.BackgroundExecutor;
 import iknow.android.utils.thread.UiThreadExecutor;
+import com.arthenica.ffmpegkit.FFmpegSession;
 
 public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
 
@@ -108,7 +109,7 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
   private long jumpToPositionOnLoad = 0;
   private FrameLayout headerView;
   private TextView headerText;
-  private VideoTrimmerUtil.TrimSession trimSession;
+  private FFmpegSession ffmpegSession;
   private boolean alertOnFailToLoad = true;
   private String alertOnFailTitle = "Error";
   private String alertOnFailMessage = "Fail to load media. Possibly invalid file or no network connection";
@@ -365,22 +366,21 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
     setHandleTouchListener(trailingHandle, false);
   }
 
-  public void onSaveClicked(float progressUpdateInterval) {
+  public void onSaveClicked() {
     onMediaPause();
-    trimSession = VideoTrimmerUtil.trim(
+    ffmpegSession = VideoTrimmerUtil.trim(
       mSourceUri.toString(),
       StorageUtil.getOutputPath(mContext, mOutputExt),
       mDuration,
       startTime,
       endTime,
-      mOnTrimVideoListener,
-      progressUpdateInterval
+      mOnTrimVideoListener
     );
   }
 
   public void onCancelTrimClicked() {
-    if (trimSession != null) {
-      trimSession.cancel();
+    if (ffmpegSession != null) {
+      ffmpegSession.cancel();
     } else {
       mOnTrimVideoListener.onCancelTrim();
     }