react-native-compressor 1.8.24 → 1.8.25

package/android/build.gradle

@@ -111,6 +111,7 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+  implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"

package/android/src/main/java/com/reactnativecompressor/Image/ImageMain.kt

@@ -42,7 +42,7 @@ class ImageMain(private val reactContext: ReactApplicationContext) {
       val srcPath = uri.path
       val params = Arguments.createMap()
       val file = File(srcPath)
-      val sizeInKBs = (file.length() / 1024).toDouble()
+      val sizeInBytes = file.length().toDouble()
       val exif = ExifInterface(srcPath!!)
       for (tag in exifAttributes) {
         val value: String? = exif.getAttribute(tag)
@@ -53,7 +53,7 @@ class ImageMain(private val reactContext: ReactApplicationContext) {
 
       }
       val extension = filePath!!.substring(filePath.lastIndexOf(".") + 1)
-      params.putDouble("size", sizeInKBs)
+      params.putDouble("size", sizeInBytes)
       params.putString("extension", extension)
       promise.resolve(params)
     } catch (e: Exception) {

package/android/src/main/java/com/reactnativecompressor/Video/VideoCompressor/videoHelpers/Track.kt

@@ -13,6 +13,7 @@ import com.googlecode.mp4parser.boxes.mp4.objectdescriptors.ESDescriptor
 import com.googlecode.mp4parser.boxes.mp4.objectdescriptors.SLConfigDescriptor
 import com.mp4parser.iso14496.part15.AvcConfigurationBox
 import java.util.*
+import kotlin.reflect.jvm.isAccessible
 
 class Track(id: Int, format: MediaFormat, audio: Boolean) {
 
@@ -186,17 +187,41 @@ class Track(id: Int, format: MediaFormat, audio: Boolean) {
             val decoderConfigDescriptor = DecoderConfigDescriptor().setup()
 
             val audioSpecificConfig = AudioSpecificConfig()
-            audioSpecificConfig.setAudioObjectType(2)
-            audioSpecificConfig.setSamplingFrequencyIndex(
-                samplingFrequencyIndexMap[audioSampleEntry.sampleRate.toInt()]!!
-            )
-            audioSpecificConfig.setChannelConfiguration(audioSampleEntry.channelCount)
-            decoderConfigDescriptor.audioSpecificInfo = audioSpecificConfig
-            descriptor.decoderConfigDescriptor = decoderConfigDescriptor
 
-            val data = descriptor.serialize()
-            esds.esDescriptor = descriptor
-            esds.data = data
+            // Fix for com.googlecode.mp4parser:isoparser multiple version management
+            // Updates based on
+            // https://github.com/sannies/mp4parser/commit/9cf7f9185b294ac4fa1cd86be1915cd355d859eb#diff-5860894eeaba912c09de175e617d53d5beecebeadd2b64695ed736f9e598bf55
+            // and
+            // https://github.com/sannies/mp4parser/commit/b85f62274b56cc68d6c6e3dc2f9d4e23318e3341#diff-5860894eeaba912c09de175e617d53d5beecebeadd2b64695ed736f9e598bf55
+            //
+            val method = audioSpecificConfig::class.members.firstOrNull { it.name == "setOriginalAudioObjectType" }
+            if (method != null) {
+                // com.googlecode.mp4parser:isoparser is >= 1.1
+                method.isAccessible = true
+                method.call(audioSpecificConfig, 2)
+                audioSpecificConfig.setSamplingFrequencyIndex(
+                    samplingFrequencyIndexMap[audioSampleEntry.sampleRate.toInt()]!!
+                )
+                audioSpecificConfig.setChannelConfiguration(audioSampleEntry.channelCount)
+                decoderConfigDescriptor.audioSpecificInfo = audioSpecificConfig
+                descriptor.decoderConfigDescriptor = decoderConfigDescriptor
+
+                esds.esDescriptor = descriptor
+            } else {
+                // com.googlecode.mp4parser:isoparser is < 1.1 (eg: 1.0.6)
+                audioSpecificConfig.setAudioObjectType(2)
+                audioSpecificConfig.setSamplingFrequencyIndex(
+                    samplingFrequencyIndexMap[audioSampleEntry.sampleRate.toInt()]!!
+                )
+                audioSpecificConfig.setChannelConfiguration(audioSampleEntry.channelCount)
+                decoderConfigDescriptor.audioSpecificInfo = audioSpecificConfig
+                descriptor.decoderConfigDescriptor = decoderConfigDescriptor
+
+                val data = descriptor.serialize()
+                esds.esDescriptor = descriptor
+                esds.data = data
+            }
+
             audioSampleEntry.addBox(esds)
             sampleDescriptionBox.addBox(audioSampleEntry)
         }

package/android/src/main/java/com/reactnativecompressor/Video/VideoMain.kt

@@ -65,14 +65,14 @@ class VideoMain(private val reactContext: ReactApplicationContext) {
       val metaRetriever = MediaMetadataRetriever()
       metaRetriever.setDataSource(srcPath)
       val file = File(srcPath)
-      val sizeInKBs = (file.length() / 1024).toDouble()
+      val sizeInBytes = (file.length()).toDouble()
       val actualHeight = metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)!!.toInt()
       val actualWidth = metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)!!.toInt()
       val duration = metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)!!.toDouble()
       val creationTime = metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DATE)
       val extension = filePath!!.substring(filePath.lastIndexOf(".") + 1)
       val params = Arguments.createMap()
-      params.putDouble("size", sizeInKBs)
+      params.putDouble("size", sizeInBytes)
       params.putInt("width", actualWidth)
       params.putInt("height", actualHeight)
       params.putDouble("duration", duration / 1000)

package/ios/Audio/AudioMain.swift

@@ -14,12 +14,7 @@ let AlAsset_Library_Scheme = "assets-library"
 class AudioMain{
     static func compress_audio(_ fileUrl: String, optionMap: NSDictionary, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         do {
-            var fileUrl = fileUrl
-            
-            if fileUrl.hasPrefix("file://") {
-                fileUrl = fileUrl.replacingOccurrences(of: "file://", with: "")
-            }
-          
+            let fileUrl = fileUrl.replacingOccurrences(of: "file://", with: "")
             let fileManager = FileManager.default
             var isDir: ObjCBool = false
             if !fileManager.fileExists(atPath: fileUrl, isDirectory: &isDir) || isDir.boolValue {
@@ -27,19 +22,19 @@ class AudioMain{
                 reject(String(err.code), err.localizedDescription, err)
                 return
             }
-            
+
             let audioOptions = AudioOptions.fromDictionary((optionMap as! [String : Any]))
-            let outputMp3Path = "file://\(Utils.generateCacheFilePath("m4a"))"
-            
-            let oldUfileUrlRL = URL(string: fileUrl)!
-            let newURL = URL(string: outputMp3Path)!
-            
+            let outputMp3Path = Utils.generateCacheFilePath("m4a")
+
+            let oldUfileUrlRL = URL(fileURLWithPath: fileUrl)
+            let newURL = URL(fileURLWithPath: outputMp3Path)
+
             var options = FormatConverter.Options()
-            
+
             if(audioOptions.samplerate != -1){
                 options.sampleRate = Double(audioOptions.samplerate)
             }
-            
+
             if(audioOptions.bitrate != -1){
                 options.bitRate = UInt32(audioOptions.bitrate)
             }
@@ -49,16 +44,16 @@ class AudioMain{
                 print("output bitrate: \(bitrate)")
                 options.bitRate = UInt32(bitrate)
             }
-            
-            
+
+
             if(audioOptions.channels != -1){
                 options.channels = UInt32(audioOptions.channels)
             }
-         
+
             options.format = .m4a
             options.eraseFile = false
             options.bitDepthRule = .any
-             
+
             let converter = FormatConverter(inputURL: oldUfileUrlRL, outputURL: newURL, options: options)
             converter.start { error in
             // check to see if error isn't nil, otherwise you're good
@@ -68,10 +63,10 @@ class AudioMain{
                     reject(error?.localizedDescription,error?.localizedDescription, error)
                     return
                 }
-               
+
                 resolve(newURL.absoluteString)
             }
-            
+
         } catch {
             reject(error.localizedDescription, error.localizedDescription, nil)
         }

package/ios/Image/ImageCompressor.swift

@@ -176,7 +176,7 @@ class ImageCompressor {
            
         }
         
-        data=copyExifInfo(actualImagePath: actualImagePath, image: image, data: data)
+        data=copyExifInfo(actualImagePath: actualImagePath, image: UIImage(data: data) ?? image, data: data)
         
         
         if isBase64 {

package/ios/Utils/CreateVideoThumbnail.swift

@@ -14,7 +14,7 @@ class CreateVideoThumbnail: NSObject {
     func create(_ fileUrl:String, options: NSDictionary, resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
     let headers = options["headers"] as? [String: Any] ?? [:]
     let format = "jpeg"
-   
+
     do {
       // Prepare cache folder
       var tempDirectory = NSSearchPathForDirectoriesInDomains(.cachesDirectory, .userDomainMask, true).last ?? ""
@@ -77,8 +77,14 @@ class CreateVideoThumbnail: NSObject {
         let cachePathDir: String = cacheDir.isEmpty ? "thumbnails/" : cacheDir
         var cacheDirectoryPath = NSSearchPathForDirectoriesInDomains(.cachesDirectory, .userDomainMask, true).last ?? ""
         cacheDirectoryPath = (cacheDirectoryPath as NSString).appendingPathComponent(cachePathDir)
-        
+
         let fm = FileManager.default
+
+        if !fm.fileExists(atPath: cacheDirectoryPath) {
+            reject("Error", "Directory does not exist", nil)
+            return
+        }
+
         do {
             let files = try fm.contentsOfDirectory(atPath: cacheDirectoryPath)
             for file in files {

package/ios/Video/VideoMain.swift

@@ -1,6 +1,6 @@
 import Foundation
 import AssetsLibrary
-import AVFoundation 
+import AVFoundation
 import Photos
 import MobileCoreServices
 
@@ -10,7 +10,7 @@ struct CompressionError: Error {
   var localizedDescription: String {
     return message
   }
-  
+
   init(message: String) {
     self.message = message
   }
@@ -18,9 +18,9 @@ struct CompressionError: Error {
 
 class VideoCompressor {
   var backgroundTaskId: UIBackgroundTaskIdentifier = .invalid;
- 
+
   var compressorExports: [String: NextLevelSessionExporter] = [:]
-    
+
     let metadatas: [String] = [
         "albumName",
         "artist",
@@ -74,11 +74,11 @@ class VideoCompressor {
       reject("failed", "Compression Failed", error)
     })
   }
-    
+
     func cancelCompression(uuid: String) -> Void {
         compressorExports[uuid]?.cancelExport()
     }
-    
+
     func getfileSize(forURL url: Any) -> Double {
         var fileURL: URL?
         var fileSize: Double = 0.0
@@ -98,11 +98,11 @@ class VideoCompressor {
         }
         return fileSize
     }
-  
-  
+
+
   func compressVideo(url: URL, options: [String: Any], onProgress: @escaping (Float) -> Void,  onCompletion: @escaping (URL) -> Void, onFailure: @escaping (Error) -> Void){
       let uuid:String = options["uuid"] as! String
-      
+
       VideoCompressor.getAbsoluteVideoPath(url.absoluteString, options: options) { absoluteVideoPath in
         var minimumFileSizeForCompress:Double=0.0;
           let videoURL = URL(string: absoluteVideoPath)
@@ -135,8 +135,8 @@ class VideoCompressor {
                     onFailure(error)
                 }
             }
-            
-            
+
+
 
         }
         else
@@ -166,12 +166,12 @@ class VideoCompressor {
     func getVideoBitrateWithFactor(f:Float)->Int {
         return Int(f * 2000 * 1000 * 1.13);
       }
-    
+
     func autoCompressionHelper(url: URL, options: [String: Any], onProgress: @escaping (Float) -> Void,  onCompletion: @escaping (URL) -> Void, onFailure: @escaping (Error) -> Void){
         let maxSize:Float = options["maxSize"] as! Float;
         let uuid:String = options["uuid"] as! String
         let progressDivider=options["progressDivider"] as? Int ?? 0
-    
+
         let asset = AVAsset(url: url)
         guard asset.tracks.count >= 1 else {
           let error = CompressionError(message: "Invalid video URL, no track found")
@@ -179,7 +179,7 @@ class VideoCompressor {
           return
         }
         let track = getVideoTrack(asset: asset);
-        
+
         let videoSize = track.naturalSize.applying(track.preferredTransform);
         let actualWidth = Float(abs(videoSize.width))
         let actualHeight = Float(abs(videoSize.height))
@@ -194,7 +194,7 @@ class VideoCompressor {
             originalBitrate: Int(bitrate),
             height: Int(resultHeight), width: Int(resultWidth)
             );
-        
+
         exportVideoHelper(url: url, asset: asset, bitRate: videoBitRate, resultWidth: resultWidth, resultHeight: resultHeight,uuid: uuid,progressDivider: progressDivider) { progress in
             onProgress(progress)
         } onCompletion: { outputURL in
@@ -206,7 +206,7 @@ class VideoCompressor {
 
     func manualCompressionHelper(url: URL, options: [String: Any], onProgress: @escaping (Float) -> Void,  onCompletion: @escaping (URL) -> Void, onFailure: @escaping (Error) -> Void){
         let uuid:String = options["uuid"] as! String
-        var bitRate=options["bitrate"] as! Float?;
+        var bitRate = (options["bitrate"] as? NSNumber)?.floatValue;
         let progressDivider=options["progressDivider"] as? Int ?? 0
         let asset = AVAsset(url: url)
         guard asset.tracks.count >= 1 else {
@@ -215,7 +215,7 @@ class VideoCompressor {
           return
         }
         let track = getVideoTrack(asset: asset);
-        
+
         let videoSize = track.naturalSize.applying(track.preferredTransform);
         var width = Float(abs(videoSize.width))
         var height = Float(abs(videoSize.height))
@@ -243,19 +243,19 @@ class VideoCompressor {
             onFailure(error)
         }
       }
-    
+
     func exportVideoHelper(url: URL,asset: AVAsset, bitRate: Int,resultWidth:Float,resultHeight:Float,uuid:String,progressDivider: Int, onProgress: @escaping (Float) -> Void,  onCompletion: @escaping (URL) -> Void, onFailure: @escaping (Error) -> Void){
         var currentVideoCompression:Int=0
-        
+
         var tmpURL = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true)
           .appendingPathComponent(ProcessInfo().globallyUniqueString)
           .appendingPathExtension("mp4")
         tmpURL = URL(string: Utils.makeValidUri(filePath: tmpURL.absoluteString))!
-        
+
         let exporter = NextLevelSessionExporter(withAsset: asset)
         exporter.outputURL = tmpURL
         exporter.outputFileType = AVFileType.mp4
-        
+
         let compressionDict: [String: Any] = [
           AVVideoAverageBitRateKey: bitRate,
           AVVideoProfileLevelKey: AVVideoProfileLevelH264HighAutoLevel,
@@ -274,7 +274,7 @@ class VideoCompressor {
           AVNumberOfChannelsKey: NSNumber(integerLiteral: 2),
           AVSampleRateKey: NSNumber(value: Float(44100))
         ]
-        
+
         compressorExports[uuid] = exporter
         exporter.export(progressHandler: { (progress) in
             let roundProgress:Int=Int((progress*100).rounded());
@@ -299,33 +299,33 @@ class VideoCompressor {
           }
         })
     }
-    
+
     func getVideoTrack(asset: AVAsset) -> AVAssetTrack {
         let tracks = asset.tracks(withMediaType: AVMediaType.video)
         return tracks[0];
         }
-    
-    
-    
+
+
+
     func getVideoMetaData(_ filePath: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         do {
             VideoCompressor.getAbsoluteVideoPath(filePath, options: [:]) { absoluteImagePath in
                 if absoluteImagePath.hasPrefix("file://") {
-                    
+
                     let absoluteImagePath = URL(string: absoluteImagePath)!.path
                     let fileManager = FileManager.default
                     var isDir: ObjCBool = false
-                    
+
                     if !fileManager.fileExists(atPath: absoluteImagePath, isDirectory: &isDir) || isDir.boolValue {
                         let err = NSError(domain: "file not found", code: -15, userInfo: nil)
                         reject(String(err.code), err.localizedDescription, err)
                         return
                     }
-                    
+
                     let attrs = try? fileManager.attributesOfItem(atPath: absoluteImagePath)
                     if let fileSize = attrs?[FileAttributeKey.size] as? UInt64 {
                         let fileSizeString = fileSize
-                        
+
                         var result: [String: Any] = [:]
                         let assetOptions: [String: Any] = [AVURLAssetPreferPreciseDurationAndTimingKey: true]
                         let asset = AVURLAsset(url: URL(fileURLWithPath: absoluteImagePath), options: assetOptions)
@@ -334,25 +334,25 @@ class VideoCompressor {
                             let _extension = (absoluteImagePath as NSString).pathExtension
                             let time = asset.duration
                             let seconds = Double(time.value) / Double(time.timescale)
-                            
+
                             result["width"] = size.width
                             result["height"] = size.height
                             result["extension"] = _extension
                             result["size"] = fileSizeString
                             result["duration"] = seconds
-                            
+
                             var commonMetadata: [AVMetadataItem] = []
                             for key in self.metadatas {
                                 let items = AVMetadataItem.metadataItems(from: asset.commonMetadata, withKey: key, keySpace: AVMetadataKeySpace.common)
                                 commonMetadata.append(contentsOf: items)
                             }
-                            
+
                             for item in commonMetadata {
                                 if let value = item.value {
                                     result[item.commonKey!.rawValue] = value
                                 }
                             }
-                            
+
                             resolve(result)
                         }
                     }
@@ -362,7 +362,7 @@ class VideoCompressor {
             reject(error.localizedDescription, error.localizedDescription, nil)
         }
     }
-    
+
     static func getAbsoluteVideoPath(_ videoPath: String, options: [String: Any], completionHandler: @escaping (String) -> Void) {
         if videoPath.hasPrefix("http://") || videoPath.hasPrefix("https://") {
             let uuid=options["uuid"] as? String ?? ""
@@ -434,5 +434,5 @@ class VideoCompressor {
             }
         }
     }
-    
+
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-compressor",
-  "version": "1.8.24",
+  "version": "1.8.25",
   "description": "Compress Image, Video, and Audio same like Whatsapp & Auto/Manual Compression | Background Upload | Download File | Create Video Thumbnail",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",