预览音频合成算法修改

BFFramework/Classes/PQGPUImage/akfilters/PQMovieFilter.swift

@@ -113,7 +113,7 @@ class PQMovieFilter: PQBaseFilter {
     var framebufferIndex:Int = 0
 
     deinit {
-        FilterLog(message: "movie filter deinit")
+//        BFLog(1, message: "movie filter deinit")
         clearData()
     }
 

BFFramework/Classes/Stuckpoint/View/PQSelectedMaterialListView.swift

@@ -40,6 +40,10 @@ class PQSelectedMaterialListView: UIView {
     required init?(coder _: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+    
+    deinit {
+        BFLog(1, message: "meterialview release")
+    }
 
     /// 添加新素材
     /// - Parameter itemData: <#itemData description#>

BFFramework/Classes/Stuckpoint/ViewModel/PQPlayerViewModel.swift

@@ -646,14 +646,14 @@ extension PQPlayerViewModel {
         let originaDuration = CMTimeGetSeconds(clipAudioRange.duration)
         BFLog(message: "处理主音频 原始时长startTime = \(originaDuration) 要显示时长totalDuration = \(totalDuration)")
         //整倍数
-        var  count = Int(totalDuration) / Int(originaDuration)
+        let  count = Int(totalDuration) / Int(originaDuration)
 //        count = count + 1
         //有余数多 clip 一整段
         let row = totalDuration - Double(count) * originaDuration
         //已经拼接的总时长
         var clipTotalDuration:Float = 0.0
         if count > 0 {
-            for index in 0 ... count {
+            for index in 0 ..< count {
                 BFLog(message: "this is running running")
                 //第一段是用户选择的开始时间 到倒数第二个卡点， 其它段都是从推荐卡点到倒数第二个卡点
                 var startTime = CMTime.zero
@@ -661,7 +661,7 @@ extension PQPlayerViewModel {
        
                 if(index == 0){
                     startTime = mStartTime
-                    trackTimeRange =  CMTimeRange(start: startTime, end: CMTime(value: CMTimeValue((CMTimeGetSeconds(clipAudioRange.end) - CMTimeGetSeconds(startTime)) * Double(playerTimescaleInt)), timescale: playerTimescaleInt))
+                    trackTimeRange =  CMTimeRange(start: startTime, end: CMTime(value: CMTimeValue(CMTimeGetSeconds(clipAudioRange.end)), timescale: playerTimescaleInt))
                     clipTotalDuration = clipTotalDuration + Float(CMTimeGetSeconds(trackTimeRange.duration))
                 }else{
                     // (CMTimeGetSeconds(clipAudioRange.end) - CMTimeGetSeconds(mStartTime))为用户选择的第一段时长
@@ -670,7 +670,7 @@ extension PQPlayerViewModel {
                     
                     clipTotalDuration = clipTotalDuration + Float(CMTimeGetSeconds(trackTimeRange.duration))
                 }
-                BFLog(message: "原音频时长短：count = \(count),startTime = \(startTime),trackTimeRange = \(trackTimeRange)")
+                BFLog(1, message: "原音频时长短：count = \(count),startTime = \(startTime),trackTimeRange = \(trackTimeRange)")
                 let parameters = mixAudioTrack(audioAsset: originAsset, startTime: startTime, trackTimeRange: trackTimeRange, volume: volume, composition: composition)
                 if parameters != nil {
                     tempParameters.append(parameters!)
@@ -684,7 +684,7 @@ extension PQPlayerViewModel {
             let startTime = CMTime(value: CMTimeValue(clipTotalDuration * Float(playerTimescaleInt)), timescale: playerTimescaleInt)
             
             let trackTimeRange = CMTimeRange(start: startTime, end: CMTime(value: CMTimeValue((CMTimeGetSeconds(startTime) + row) * Double(playerTimescaleInt)), timescale: playerTimescaleInt))
-            BFLog(message: "最后一小段音乐时长短：count = \(count),startTime = \(startTime),trackTimeRange = \(trackTimeRange)")
+            BFLog(1, message: "最后一小段音乐时长短：count = \(count),startTime = \(startTime),trackTimeRange = \(trackTimeRange)")
             let parameters = mixAudioTrack(audioAsset: originAsset, startTime: startTime, trackTimeRange: trackTimeRange, volume: volume, composition: composition)
             if parameters != nil {
                 tempParameters.append(parameters!)