react-native-compressor 1.9.0 → 1.10.1-alpha.0

package/ios/Video/NextLevelSessionExporter.swift

@@ -254,36 +254,31 @@ extension NextLevelSessionExporter {
         self._reader?.startReading()
         self._writer?.startSession(atSourceTime: self.timeRange.start)
         
-        let audioSemaphore = DispatchSemaphore(value: 0)
-        let videoSemaphore = DispatchSemaphore(value: 0)
+        let dispatchGroup = DispatchGroup()
     
         let videoTracks = asset.tracks(withMediaType: AVMediaType.video)
         if let videoInput = self._videoInput,
            let videoOutput = self._videoOutput,
            videoTracks.count > 0 {
+            dispatchGroup.enter()
             videoInput.requestMediaDataWhenReady(on: self._inputQueue, using: {
                 if self.encode(readySamplesFromReaderOutput: videoOutput, toWriterInput: videoInput) == false {
-                    videoSemaphore.signal()
+                    dispatchGroup.leave()
                 }
             })
-        } else {
-            videoSemaphore.signal()
-        }
+        } 
         
         if let audioInput = self._audioInput,
             let audioOutput = self._audioOutput {
+            dispatchGroup.enter()
             audioInput.requestMediaDataWhenReady(on: self._inputQueue, using: {
                 if self.encode(readySamplesFromReaderOutput: audioOutput, toWriterInput: audioInput) == false {
-                    audioSemaphore.signal()
+                    dispatchGroup.leave()
                 }
             })
-        } else {
-            audioSemaphore.signal()
-        }
+        } 
         
-        DispatchQueue.global().async {
-            audioSemaphore.wait()
-            videoSemaphore.wait()
+        dispatchGroup.notify(queue: .global()) {
             DispatchQueue.main.async {
                 self.finish()
             }
@@ -369,13 +364,20 @@ extension NextLevelSessionExporter {
     
     private func setupAudioOutput(withAsset asset: AVAsset) {
         let audioTracks = asset.tracks(withMediaType: AVMediaType.audio)
+        var audioTracksToUse: [AVAssetTrack] = []
         
         guard audioTracks.count > 0 else {
             self._audioOutput = nil
             return
         }
-
-        self._audioOutput = AVAssetReaderAudioMixOutput(audioTracks: audioTracks, audioSettings: nil)
+        // Remove APAC tracks
+        for audioTrack in audioTracks {
+            let mediaSubtypes = audioTrack.formatDescriptions.filter { CMFormatDescriptionGetMediaType($0 as! CMFormatDescription) == kCMMediaType_Audio }.map { CMFormatDescriptionGetMediaSubType($0 as! CMFormatDescription) }
+            for mediaSubtype in mediaSubtypes where mediaSubtype != kAudioFormatAPAC {
+                audioTracksToUse.append(audioTrack)
+            }
+        }
+        self._audioOutput = AVAssetReaderAudioMixOutput(audioTracks: audioTracksToUse, audioSettings: nil)
         self._audioOutput?.alwaysCopiesSampleData = false
         self._audioOutput?.audioMix = self.audioMix
         if let reader = self._reader,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-compressor",
-  "version": "1.9.0",
+  "version": "1.10.1-alpha.0",
   "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",
@@ -84,6 +84,7 @@
   "devDependencies": {
     "@commitlint/config-conventional": "^17.0.2",
     "@evilmartians/lefthook": "^1.2.2",
+    "@expo/config-plugins": "^7.2.5",
     "@jamesacarr/eslint-formatter-github-actions": "^0.2.0",
     "@react-native-community/eslint-config": "^3.0.2",
     "@release-it/conventional-changelog": "^5.0.0",
@@ -104,8 +105,7 @@
     "react-native-builder-bob": "^0.20.0",
     "release-it": "^15.0.0",
     "turbo": "^1.10.7",
-    "typescript": "^5.0.2",
-    "@expo/config-plugins": "^7.2.5"
+    "typescript": "^5.0.2"
   },
   "resolutions": {
     "@types/react": "17.0.21"
@@ -117,7 +117,6 @@
   "engines": {
     "node": ">= 16.0.0"
   },
-  "packageManager": "^yarn@1.22.15",
   "jest": {
     "preset": "react-native",
     "modulePathIgnorePatterns": [
@@ -197,12 +196,8 @@
         "name": "RNCompressorSpec",
         "type": "modules",
         "jsSrcsDir": "src"
-      },
-      {
-        "name": "RNVideoCompressorSpec",
-        "type": "modules",
-        "jsSrcsDir": "src"
       }
     ]
-  }
+  },
+  "packageManager": "yarn@4.5.3+sha512.3003a14012e2987072d244c720506549c1aab73ee728208f1b2580a9fd67b92d61ba6b08fe93f6dce68fd771e3af1e59a0afa28dd242dd0940d73b95fedd4e90"
 }