react-native-video-trim 3.0.10 → 4.1.0

package/android/src/main/java/com/{videotrim → margelo/nitro/videotrim}/utils/StorageUtil.java

@@ -1,4 +1,4 @@
-package com.videotrim.utils;
+package com.margelo.nitro.videotrim.utils;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -8,7 +8,9 @@ import android.os.Build;
 import android.os.Environment;
 import android.provider.MediaStore;
 import android.text.TextUtils;
+
 import com.facebook.react.bridge.ReactApplicationContext;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;

package/android/src/main/java/com/{videotrim → margelo/nitro/videotrim}/utils/VideoTrimmerUtil.java

@@ -1,4 +1,4 @@
-package com.videotrim.utils;
+package com.margelo.nitro.videotrim.utils;
 
 import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
@@ -9,13 +9,15 @@ 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 com.margelo.nitro.videotrim.enums.ErrorCode;
+import com.margelo.nitro.videotrim.interfaces.VideoTrimListener;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.TimeZone;
 
 import iknow.android.utils.DeviceUtil;
@@ -23,6 +25,7 @@ import iknow.android.utils.UnitConverter;
 import iknow.android.utils.callback.SingleCallback;
 import iknow.android.utils.thread.BackgroundExecutor;
 
+
 public class VideoTrimmerUtil {
 
   private static final String TAG = VideoTrimmerUtil.class.getSimpleName();
@@ -42,7 +45,7 @@ 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
 
-  public static FFmpegSession trim(String inputFile, String outputFile, int videoDuration, long startMs, long endMs, final VideoTrimListener callback) {
+  public static FFmpegSession trim(String inputFile, String outputFile, int videoDuration, long startMs, long endMs, boolean enableRotation, double rotationAngle, final VideoTrimListener callback) {
     // Get the current date and time
     Date currentDate = new Date();
 
@@ -54,26 +57,32 @@ public class VideoTrimmerUtil {
     // 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 -> {
+    // create list to store commands
+    List<String> cmds = new ArrayList<>();
+    cmds.add("-ss");
+    cmds.add(startMs + "ms");
+    cmds.add("-to");
+    cmds.add(endMs + "ms");
+
+    if (enableRotation) {
+      // add "-display_rotation" and rotation angle to the command, contact, not creating new
+      cmds.add("-display_rotation");
+      cmds.add(String.valueOf(rotationAngle));
+    }
+
+    cmds.add("-i");
+    cmds.add(inputFile);
+    cmds.add("-c");
+    cmds.add("copy");
+    cmds.add("-metadata");
+    cmds.add("creation_time=" + formattedDateTime);
+    cmds.add(outputFile);
+
+    String[] command = cmds.toArray(new String[0]);
+
+    Log.d(TAG,"Command: " + String.join(",", command));
+
+    return FFmpegKit.executeWithArgumentsAsync(command, session -> {
       SessionState state = session.getState();
       ReturnCode returnCode = session.getReturnCode();
       if (ReturnCode.isSuccess(session.getReturnCode())) {
@@ -90,11 +99,12 @@ public class VideoTrimmerUtil {
     }, 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());
+      Map<String, String> map = new HashMap<>();
+      map.put("level", String.valueOf(log.getLevel().getValue()));
+      map.put("message", log.getMessage());
+      map.put("sessionId", String.valueOf(log.getSessionId()));
+      map.put("logStr", log.toString());
+
       callback.onLog(map);
     }, statistics -> {
       int timeInMilliseconds = (int) statistics.getTime();
@@ -104,16 +114,16 @@ public class VideoTrimmerUtil {
         callback.onTrimmingProgress(Math.min(Math.max(completePercentage, 0), 100));
       }
 
-      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());
+      Map<String, String> map = new HashMap<>();
+      map.put("sessionId", String.valueOf(statistics.getSessionId()));
+      map.put("videoFrameNumber", String.valueOf(statistics.getVideoFrameNumber()));
+      map.put("videoFps", String.valueOf(statistics.getVideoFps()));
+      map.put("videoQuality", String.valueOf(statistics.getVideoQuality()));
+      map.put("size", String.valueOf(statistics.getSize()));
+      map.put("time", String.valueOf(statistics.getTime()));
+      map.put("bitrate", String.valueOf(statistics.getBitrate()));
+      map.put("speed", String.valueOf(statistics.getSpeed()));
+      map.put("statisticsStr", statistics.toString());
       callback.onStatistics(map);
     });
   }

package/android/src/main/java/com/{videotrim → margelo/nitro/videotrim}/widgets/VideoTrimmerView.java

@@ -1,8 +1,8 @@
-package com.videotrim.widgets;
+package com.margelo.nitro.videotrim.widgets;
 
 import static com.facebook.react.bridge.UiThreadUtil.runOnUiThread;
-import static com.videotrim.utils.VideoTrimmerUtil.RECYCLER_VIEW_PADDING;
-import static com.videotrim.utils.VideoTrimmerUtil.VIDEO_FRAMES_WIDTH;
+import static com.margelo.nitro.videotrim.utils.VideoTrimmerUtil.RECYCLER_VIEW_PADDING;
+import static com.margelo.nitro.videotrim.utils.VideoTrimmerUtil.VIDEO_FRAMES_WIDTH;
 
 import android.content.Context;
 import android.content.pm.ActivityInfo;
@@ -32,15 +32,16 @@ import android.widget.VideoView;
 
 import androidx.appcompat.app.AlertDialog;
 
+import com.arthenica.ffmpegkit.FFmpegSession;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableMap;
-import com.videotrim.R;
-import com.videotrim.enums.ErrorCode;
-import com.videotrim.interfaces.IVideoTrimmerView;
-import com.videotrim.interfaces.VideoTrimListener;
-import com.videotrim.utils.MediaMetadataUtil;
-import com.videotrim.utils.StorageUtil;
-import com.videotrim.utils.VideoTrimmerUtil;
+import com.margelo.nitro.videotrim.EditorConfig;
+import com.margelo.nitro.videotrim.R;
+import com.margelo.nitro.videotrim.enums.ErrorCode;
+import com.margelo.nitro.videotrim.interfaces.IVideoTrimmerView;
+import com.margelo.nitro.videotrim.interfaces.VideoTrimListener;
+import com.margelo.nitro.videotrim.utils.MediaMetadataUtil;
+import com.margelo.nitro.videotrim.utils.StorageUtil;
+import com.margelo.nitro.videotrim.utils.VideoTrimmerUtil;
 
 import java.io.IOException;
 import java.util.Locale;
@@ -48,7 +49,6 @@ 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 {
 
@@ -87,6 +87,9 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
   private RelativeLayout trimmerContainerWrapper;
 
   private long startTime = 0, endTime = 0;
+  private boolean enableRotation = false;
+  private double rotationAngle = 0.0;
+
   private Vibrator vibrator;
   private boolean didClampWhilePanning = false;
 
@@ -116,16 +119,16 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
   private String alertOnFailCloseText = "Close";
   private View currentSelectedhandle;
 
-  public VideoTrimmerView(ReactApplicationContext context, ReadableMap config, AttributeSet attrs) {
+  public VideoTrimmerView(ReactApplicationContext context, EditorConfig config, AttributeSet attrs) {
     this(context, attrs, 0, config);
   }
 
-  public VideoTrimmerView(ReactApplicationContext context, AttributeSet attrs, int defStyleAttr, ReadableMap config) {
+  public VideoTrimmerView(ReactApplicationContext context, AttributeSet attrs, int defStyleAttr, EditorConfig config) {
     super(context, attrs, defStyleAttr);
     init(context, config);
   }
 
-  private void init(ReactApplicationContext context, ReadableMap config) {
+  private void init(ReactApplicationContext context, EditorConfig config) {
     this.mContext = context;
 
     context.getCurrentActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
@@ -374,6 +377,8 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
       mDuration,
       startTime,
       endTime,
+      enableRotation,
+      rotationAngle,
       mOnTrimVideoListener
     );
   }
@@ -445,79 +450,50 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
     return screenWidth;
   }
 
-  private void configure(ReadableMap config) {
-    if (config.hasKey("maxDuration")) {
-      mMaxDuration = Math.max(0, config.getInt("maxDuration") * 1000L);
+  private void configure(EditorConfig config) {
+    if (config.getMaxDuration() > 0) {
+      mMaxDuration = (long) Math.max(0, config.getMaxDuration() * 1000L);
     }
-    if (config.hasKey("minDuration")) {
-      mMinDuration = Math.max(1000L, config.getInt("minDuration") * 1000L);
-    }
-    if (config.hasKey("cancelButtonText")) {
-      cancelBtn.setText(config.getString("cancelButtonText"));
-    }
-    if (config.hasKey("saveButtonText")) {
-      saveBtn.setText(config.getString("saveButtonText"));
+
+    if (config.getMinDuration() > 0) {
+      mMinDuration = (long) Math.max(1000L, config.getMinDuration() * 1000L);
     }
 
-    if (config.hasKey("type")) {
-      isVideoType = !config.getString("type").equals("audio");
+    cancelBtn.setText(config.getCancelButtonText());
 
-//      if (!isVideoType) {
-//        mThumbnailContainer.setAlpha(0f);
-//        mThumbnailContainer.setBackground(ContextCompat.getDrawable(mContext, R.drawable.thumb_container_bg));
-//      }
-    }
+    saveBtn.setText(config.getSaveButtonText());
 
-    if (config.hasKey("outputExt")) {
-      mOutputExt = config.getString("outputExt");
-    } else if (!isVideoType) {
-      mOutputExt = "wav";
-    }
+    isVideoType = config.getType().equals("video");
 
-    if (config.hasKey("enableHapticFeedback")) {
-      enableHapticFeedback = config.getBoolean("enableHapticFeedback");
+    mOutputExt = config.getOutputExt();
+    if (!isVideoType) {
+      mOutputExt = "wav";
     }
 
-    if (config.hasKey("autoplay")) {
-      autoplay = config.getBoolean("autoplay");
-    }
+    enableHapticFeedback = config.getEnableHapticFeedback();
+    autoplay = config.getAutoplay();
 
-    if (config.hasKey("jumpToPositionOnLoad")) {
-      jumpToPositionOnLoad = config.getInt("jumpToPositionOnLoad");
+    if (config.getJumpToPositionOnLoad() > 0) {
+      jumpToPositionOnLoad = (long) config.getJumpToPositionOnLoad();
     }
-    // check if config.getString("headerText") is not empty
 
-    if (config.hasKey("headerText") && !config.getString("headerText").isEmpty()){
-      headerText.setText(config.getString("headerText"));
+      headerText.setText(config.getHeaderText());
 
-      if (config.hasKey("headerTextSize")) {
-        int textSize = config.getInt("headerTextSize");
+        int textSize = (int) config.getHeaderTextSize();
         if (textSize < 0) {
           textSize = 16;
         }
         headerText.setTextSize(TypedValue.COMPLEX_UNIT_DIP, textSize);
-      }
-
-      if (config.hasKey("headerTextColor")) {
-        headerText.setTextColor(config.getInt("headerTextColor"));
-      }
+        headerText.setTextColor((int) config.getHeaderTextColor());
 
       headerView.setVisibility(View.VISIBLE);
-    }
-
-    alertOnFailToLoad = !config.hasKey("alertOnFailToLoad") || config.getBoolean("alertOnFailToLoad");
 
-    if (config.hasKey("alertOnFailTitle")) {
-      alertOnFailTitle = config.getString("alertOnFailTitle");
-    }
-
-    if (config.hasKey("alertOnFailMessage")) {
-      alertOnFailMessage = config.getString("alertOnFailMessage");
-    }
-
-    if (config.hasKey("alertOnFailCloseText")) {
-      alertOnFailCloseText = config.getString("alertOnFailCloseText");
-    }
+    alertOnFailToLoad = config.getAlertOnFailToLoad();
+    alertOnFailTitle = config.getAlertOnFailTitle();
+    alertOnFailMessage = config.getAlertOnFailMessage();
+    alertOnFailCloseText = config.getAlertOnFailCloseText();
+    enableRotation = config.getEnableRotation();
+    rotationAngle = config.getRotationAngle();
   }
 
   private void startTimingRunnable() {

package/ios/AssetLoader.swift

@@ -1,8 +1,8 @@
 //
 //  AssetLoader.swift
-//  react-native-video-trim
+//  VideoTrim
 //
-//  Created by Duc Trung Mai on 7/27/24.
+//  Created by Duc Trung Mai on 20/5/25.
 //
 
 import AVFoundation

package/ios/ErrorCode.swift

@@ -1,8 +1,8 @@
 //
 //  ErrorCode.swift
-//  react-native-video-trim
+//  VideoTrim
 //
-//  Created by ByteDance on 7/27/24.
+//  Created by Duc Trung Mai on 20/5/25.
 //
 
 import Foundation

package/ios/ProgressAlertController.swift

@@ -1,8 +1,8 @@
 //
 //  ProgressAlertController.swift
-//  react-native-video-trim
+//  VideoTrim
 //
-//  Created by Duc Trung Mai on 8/18/24.
+//  Created by Duc Trung Mai on 20/5/25.
 //
 
 import UIKit