Fix: T2Je#12

soobeen27 · Sep 10, 2024 · 3cc3dd2 · 3cc3dd2
1 parent 8504eb7
commit 3cc3dd2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/Sources/FYVideoCompressor/FYVideoCompressor.swift b/Sources/FYVideoCompressor/FYVideoCompressor.swift
@@ -183,7 +183,9 @@ public class FYVideoCompressor {
 
         let videoSettings = createVideoSettingsWithBitrate(targetVideoBitrate,
                                                            maxKeyFrameInterval: 10,
-                                                           size: scaleSize)
+                                                           size: scaleSize,
+                                                           targetFPS : quality.value.fps
+        )
 #if DEBUG
         print("************** Video info **************")
 #endif
@@ -256,7 +258,9 @@ public class FYVideoCompressor {
         let targetSize = calculateSizeWithScale(config.scale, originalSize: videoTrack.naturalSize)
         let videoSettings = createVideoSettingsWithBitrate(targetVideoBitrate,
                                                            maxKeyFrameInterval: config.videomaxKeyFrameInterval,
-                                                           size: targetSize)
+                                                           size: targetSize,
+                                                           targetFPS: config.fps
+        )
 
         var audioTrack: AVAssetTrack?
         var audioSettings: [String: Any]?
@@ -457,12 +461,12 @@ public class FYVideoCompressor {
 
     }
 
-    private func createVideoSettingsWithBitrate(_ bitrate: Float, maxKeyFrameInterval: Int, size: CGSize) -> [String: Any] {
+    private func createVideoSettingsWithBitrate(_ bitrate: Float, maxKeyFrameInterval: Int, size: CGSize, targetFPS: Float = 30) -> [String: Any] {
         return [AVVideoCodecKey: AVVideoCodecType.hevc,
                 AVVideoWidthKey: size.width,
                AVVideoHeightKey: size.height,
-//          AVVideoScalingModeKey: AVVideoScalingModeResizeAspectFill,
-          AVVideoScalingModeKey: AVVideoScalingModeResizeAspect,
+          AVVideoScalingModeKey: AVVideoScalingModeResizeAspectFill,
+AVVideoExpectedSourceFrameRateKey: targetFPS,
 AVVideoCompressionPropertiesKey: [AVVideoAverageBitRateKey: bitrate,
 //                                    AVVideoProfileLevelKey: AVVideoProfileLevelH264HighAutoLevel,
 //                                 AVVideoH264EntropyModeKey: AVVideoH264EntropyModeCABAC,

diff --git a/Sources/FYVideoCompressor/VideoFrameReducer.swift b/Sources/FYVideoCompressor/VideoFrameReducer.swift
@@ -30,10 +30,14 @@ public struct ReduceFrameEvenlySpaced: VideoFrameReducer {
 
         var res = [Int]()
 
-        while res.count < Int(targetFPS * videoDuration) {
+        while res.count < Int(originalFPS * videoDuration) && counter * stride < originalFrames.count {
             let index = counter * stride
-            let frame = originalFrames[index]
-            res.append(frame)
+//            let frame = originalFrames[index]
+//            res.append(frame)
+            if index < originalFrames.count {
+                let frame = originalFrames[index]
+                res.append(frame)
+            }
             counter += 1
         }