react-native-video-trim 1.0.14 → 1.0.16

package/README.md

@@ -22,7 +22,7 @@ npx pod-install ios
 ```
 
 ## Usage
->  Note that for iOS you have to try on real device
+**Note that for both Android and iOS you have to try on real device**
 
 ```js
 import { showEditor } from 'react-native-video-trim';
@@ -228,16 +228,33 @@ useEffect(() => {
 # FFMPEG Version
 This library uses FFMPEG-Kit Android under the hood, by default FFMPEG-min is used, which gives smallest bundle size: https://github.com/arthenica/ffmpeg-kit#9-packages
 
+## Android
 If you ever need to use other version of FFMPEG-Kit for Android, you can do the following, in your `android/build.gradle` > `buildscript` > `ext`:
 
 ```gradle
 buildscript {
     ext {
-        ffmpegKitPackage = "full" // default "min", if followed by lts then LTS version is use. Eg "full-lts"
+        ffmpegKitPackage = "full" // default "min"
 
-        ffmpegKitPackageVersion = "5.1.LTS" // use exact version, highest precedence, default 6.0-2 if ignored
+        ffmpegKitPackageVersion = "5.1.LTS" // default 6.0-2
     }
 ```
+
+## iOS
+Same as Android, there're 2 environment variables respectively you can use to specify FFMPEG Kit version you want to use: `FFMPEG_KIT_PACKAGE` and `FFMPEG_KIT_PACKAGE_VERSION`.
+
+You need to pass the variables when running pod install. Eg:
+```shell
+# override package name, default: min
+FFMPEGKIT_PACKAGE=full npx pod-install ios
+
+# override package version, default: '~> 6.0
+FFMPEGKIT_PACKAGE_VERSION=5.1 npx pod-install ios
+
+# or both
+FFMPEGKIT_PACKAGE=full FFMPEGKIT_PACKAGE_VERSION=5.1 npx pod-install ios
+```
+
 # Thanks
 - Android part is created by modified + fix bugs from: https://github.com/iknow4/Android-Video-Trimmer
 - iOS UI is created from: https://github.com/AndreasVerhoeven/VideoTrimmerControl

package/android/build.gradle

@@ -43,16 +43,14 @@ def supportsNamespace() {
   return major >= 8
 }
 
-static def safePackageName(String packageName) {
-  packageName.replace("-lts", "")
+def safePackageName() {
+  def name = project.properties['ffmpegKit.android.package.name']
+  name + '-' + safeExtGet('ffmpegKitPackage', 'min')
 }
 
-def safePackageVersion(String packageName) {
-  def version = project.properties['ffmpegKit.android.main.version']
-  def ltsVersion = project.properties['ffmpegKit.android.lts.version']
-
-  // try to get ffmpegKitPackageVersion if possible
-  safeExtGet("ffmpegKitPackageVersion", packageName.contains("-lts") ? ltsVersion + ".LTS" : version)
+def safePackageVersion() {
+  def name = project.properties['ffmpegKit.android.package.version']
+  safeExtGet('ffmpegKitPackageVersion', name)
 }
 
 def safeExtGet(String prop, String fallback) {
@@ -106,7 +104,7 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
   implementation 'androidx.recyclerview:recyclerview:1.3.1'
-  implementation 'com.arthenica:ffmpeg-kit-' + safePackageName(safeExtGet('ffmpegKitPackage', 'min')) + ':' + safePackageVersion(safeExtGet('ffmpegKitPackage', 'min'))
+  implementation safePackageName() + ':' + safePackageVersion()
 }
 
 if (isNewArchitectureEnabled()) {

package/android/gradle.properties

@@ -3,5 +3,5 @@ VideoTrim_minSdkVersion=21
 VideoTrim_targetSdkVersion=31
 VideoTrim_compileSdkVersion=31
 VideoTrim_ndkversion=21.4.7075529
-ffmpegKit.android.main.version=6.0-2
-ffmpegKit.android.lts.version=6.0-2
+ffmpegKit.android.package.name=com.arthenica:ffmpeg-kit
+ffmpegKit.android.package.version=6.0-2

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

@@ -31,7 +31,7 @@ public class VideoTrimmerUtil {
   private static final int THUMB_RESOLUTION_RES = 2; // double thumb resolution for better quality
 
   public static void trim(String inputFile, String outputFile, int videoDuration, long startMs, long endMs, final VideoTrimListener callback) {
-    String cmd = "-i " + inputFile + " -ss " + startMs + "ms" + " -to " + endMs + "ms -c copy " + outputFile;
+    String cmd = "-ss " + startMs + "ms" + " -to " + endMs + "ms -i " + inputFile + " -c copy " + outputFile;
     callback.onStartTrim();
     FFmpegKit.executeAsync(cmd, session -> {
       SessionState state = session.getState();

package/ios/VideoTrim.swift

@@ -279,7 +279,7 @@ class VideoTrim: RCTEventEmitter {
         let timestamp = Int(Date().timeIntervalSince1970)
         let outputName = "\(FILE_PREFIX)_\(timestamp).mp4" // use mp4 to prevent any issue with ffmpeg about file extension
         let outputFile = "\(inputFile.deletingLastPathComponent().absoluteURL)\(outputName)"
-        let cmd = "-i \(inputFile) -ss \(startTime * 1000)ms -to \(endTime * 1000)ms -c copy \(outputFile)";
+        let cmd = "-ss \(startTime * 1000)ms -to \(endTime * 1000)ms -i \(inputFile) -c copy \(outputFile)";
                 
         self.emitEventToJS("onStartTrimming", eventData: nil)
         

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-video-trim",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "Video trimmer for your React Native app",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/react-native-video-trim.podspec

@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/maitrungduc1410/react-native-video-trim.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
-  s.dependency 'ffmpeg-kit-ios-min', '~> 6.0'
+  s.dependency "ffmpeg-kit-ios-#{ENV['FFMPEGKIT_PACKAGE'] || 'min'}", ENV['FFMPEGKIT_PACKAGE_VERSION'] || '~> 6.0'
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.