#579 解决 nominalFrameRate 不对的问题

kingslay · Oct 6, 2023 · bd60377 · bd60377
1 parent 8701fe7
commit bd60377
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/Sources/KSPlayer/MEPlayer/FFmpegAssetTrack.swift b/Sources/KSPlayer/MEPlayer/FFmpegAssetTrack.swift
@@ -62,22 +62,23 @@ public class FFmpegAssetTrack: MediaPlayerTrack {
         } else {
             rotation = 0
         }
-        let frameRate = stream.pointee.avg_frame_rate
-        if stream.pointee.duration > 0, stream.pointee.nb_frames > 0, stream.pointee.nb_frames != stream.pointee.duration {
-            nominalFrameRate = Float(stream.pointee.nb_frames) * Float(timebase.den) / Float(stream.pointee.duration) * Float(timebase.num)
-        } else if frameRate.den > 0, frameRate.num > 0 {
-            nominalFrameRate = Float(frameRate.num) / Float(frameRate.den)
+
+        if mediaType == .audio {
+            var frameSize = codecpar.frame_size
+            if frameSize < 1 {
+                frameSize = timebase.den / timebase.num
+            }
+            nominalFrameRate = max(Float(codecpar.sample_rate / frameSize), 44)
         } else {
-            if mediaType == .audio {
-                var frameSize = codecpar.frame_size
-                if frameSize < 1 {
-                    frameSize = timebase.den / timebase.num
-                }
-                nominalFrameRate = max(Float(codecpar.sample_rate / frameSize), 44)
-            } else {
-                nominalFrameRate = 24
+            let frameRate = stream.pointee.avg_frame_rate
+            if stream.pointee.duration > 0, stream.pointee.nb_frames > 0, stream.pointee.nb_frames != stream.pointee.duration {
+                nominalFrameRate = Float(stream.pointee.nb_frames) * Float(timebase.den) / Float(stream.pointee.duration) * Float(timebase.num)
+            } else if frameRate.den > 0, frameRate.num > 0 {
+                nominalFrameRate = Float(frameRate.num) / Float(frameRate.den)
             }
+            nominalFrameRate = 24
         }
+
         if codecpar.codec_type == AVMEDIA_TYPE_VIDEO {
             description += ", \(nominalFrameRate) fps"
         }