Album RG scanner op implementation

kartik-venugopal · Aug 24, 2024 · 71bb926 · 71bb926
1 parent e309186
commit 71bb926
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 33 deletions.
diff --git a/....xcodeproj/project.xcworkspace/xcuserdata/kven.xcuserdatad/UserInterfaceState.xcuserstate b/....xcodeproj/project.xcworkspace/xcuserdata/kven.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Source/Core/AudioGraph/EffectsUnits/ReplayGain/LoudnessScan/AVFReplayGainScanner.swift b/Source/Core/AudioGraph/EffectsUnits/ReplayGain/LoudnessScan/AVFReplayGainScanner.swift
@@ -24,7 +24,7 @@ class AVFReplayGainScanner: EBUR128LoudnessScannerProtocol {
     private let sampleRate: Double
     private let totalSamples: AVAudioFramePosition
 
-    private let ebur128: EBUR128State
+    let ebur128: EBUR128State
 
     private(set) var isCancelled: Bool = false
 

diff --git a/...ore/AudioGraph/EffectsUnits/ReplayGain/LoudnessScan/ReplayGainAlbumScannerOperation.swift b/...ore/AudioGraph/EffectsUnits/ReplayGain/LoudnessScan/ReplayGainAlbumScannerOperation.swift
@@ -17,6 +17,9 @@ class ReplayGainAlbumScannerOperation: Operation {
     private var scanners: [EBUR128LoudnessScannerProtocol] = []
     private let completionHandler: (ReplayGainAlbumScannerOperation, EBUR128AlbumAnalysisResult?) -> Void
 
+    let eburs: ConcurrentArray<EBUR128State> = .init()
+    let results: ConcurrentArray<EBUR128TrackAnalysisResult> = .init()
+
     // -------------------------------------------------------------------------------------------------------------------
 
     // MARK: - NSOperation Overrides
@@ -36,11 +39,27 @@ class ReplayGainAlbumScannerOperation: Operation {
         self.files = files
         self.completionHandler = completionHandler
 
-//        self.scanner = file.isNativelySupported ?
-//        try AVFReplayGainScanner(file: file) :
-//        try FFmpegReplayGainScanner(file: file)
-
         super.init()
+
+        for file in self.files {
+
+            addDependency(BlockOperation {
+
+                do {
+
+                    let scanner: EBUR128LoudnessScannerProtocol = file.isNativelySupported ?
+                    try AVFReplayGainScanner(file: file) :
+                    try FFmpegReplayGainScanner(file: file)
+
+                    self.eburs.append(scanner.ebur128)
+                    let result = try scanner.scan()
+                    self.results.append(result)
+
+                } catch {
+                    NSLog("EBUR128 analysis of file '\(file.path)' failed. Error: \((error as? EBUR128Error)?.description ?? error.localizedDescription)")
+                }
+            })
+        }
     }
 
     override func start() {
@@ -53,19 +72,16 @@ class ReplayGainAlbumScannerOperation: Operation {
         _isExecuting = true
         didChangeValue(forKey: "isExecuting")
 
-        DispatchQueue.global(qos: .userInitiated).async {
-
-            var result: EBUR128AlbumAnalysisResult? = nil
+        var result: EBUR128AlbumAnalysisResult? = nil
+
+        do {
+            result = try EBUR128State.computeAlbumLoudnessAndPeak(with: eburs.array, andTrackResults: results.array)
+        } catch {
 
-//            do {
-//                result = try self.scanner.scan()
-//            } catch {
-//                NSLog("EBUR128 analysis of file '\(self.file.path)' failed. Error: \((error as? EBUR128Error)?.description ?? error.localizedDescription)")
-//            }
-
-            self.completionHandler(self, result)
-            self.finish()
         }
+
+        self.completionHandler(self, result)
+        self.finish()
     }
 
     private func finish() {

diff --git a/Source/Core/AudioGraph/EffectsUnits/ReplayGain/LoudnessScan/ReplayGainScanner.swift b/Source/Core/AudioGraph/EffectsUnits/ReplayGain/LoudnessScan/ReplayGainScanner.swift
@@ -14,6 +14,8 @@ protocol EBUR128LoudnessScannerProtocol {
 
     var file: URL {get}
 
+    var ebur128: EBUR128State {get}
+
     init(file: URL) throws
 
     func scan() throws -> EBUR128TrackAnalysisResult
@@ -40,7 +42,7 @@ class ReplayGainScanner {
         print("ReplayGainScanner.init() read \(self.cache.count) cache entries")
     }
 
-    func scan(forFile file: URL, _ completionHandler: @escaping (ReplayGain?) -> Void) throws {
+    func scan(forFile file: URL, _ completionHandler: @escaping (ReplayGain?) -> Void) {
 
         cancelOngoingScan()
 
@@ -54,7 +56,7 @@ class ReplayGainScanner {
 
         // Cache miss, initiate a scan
 
-        scanOp = try ReplayGainTrackScannerOperation(file: file) {[weak self] finishedScanOp, ebur128Result in
+        scanOp = ReplayGainTrackScannerOperation(file: file) {[weak self] finishedScanOp, ebur128Result in
 
             // A previously scheduled scan op may finish just before being cancelled. This check
             // will prevent rogue completion handler execution.

diff --git a/Source/Core/AudioGraph/EffectsUnits/ReplayGain/ReplayGainUnitDelegate.swift b/Source/Core/AudioGraph/EffectsUnits/ReplayGain/ReplayGainUnitDelegate.swift
@@ -115,24 +115,16 @@ class ReplayGainUnitDelegate: EffectsUnitDelegate<ReplayGainUnit>, ReplayGainUni
 
     private func analyze(file: URL) {
 
-        do {
-            
-            _isScanning.setTrue()
-            Messenger.publish(.Effects.ReplayGainUnit.scanInitiated)
+        _isScanning.setTrue()
+        Messenger.publish(.Effects.ReplayGainUnit.scanInitiated)
+
+        replayGainScanner.scan(forFile: file) {[weak self] (replayGain: ReplayGain?) in
 
-            try replayGainScanner.scan(forFile: file) {[weak self] (replayGain: ReplayGain?) in
-
-                guard let strongSelf = self else {return}
-
-                strongSelf.unit.replayGain = replayGain
-                strongSelf._isScanning.setFalse()
-
-                Messenger.publish(.Effects.ReplayGainUnit.scanCompleted)
-            }
+            guard let strongSelf = self else {return}
 
-        } catch {
+            strongSelf.unit.replayGain = replayGain
+            strongSelf._isScanning.setFalse()
 
-            _isScanning.setFalse()
             Messenger.publish(.Effects.ReplayGainUnit.scanCompleted)
         }
     }