add video type #528

kingslay · Nov 13, 2023 · af9da4b · af9da4b
1 parent 957383c
commit af9da4b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/FFmpegKit b/FFmpegKit
diff --git a/Sources/KSPlayer/AVPlayer/PlayerDefines.swift b/Sources/KSPlayer/AVPlayer/PlayerDefines.swift
@@ -62,6 +62,21 @@ public enum DynamicRange: Int32 {
     #endif
 }
 
+extension DynamicRange: CustomStringConvertible {
+    public var description: String {
+        switch self {
+        case .sdr:
+            return "SDR"
+        case .hdr10:
+            return "HDR10"
+        case .hlg:
+            return "HDR"
+        case .dolbyVision:
+            return "Dolby Vision"
+        }
+    }
+}
+
 extension DynamicRange {
     var colorPrimaries: CFString {
         switch self {

diff --git a/Sources/KSPlayer/MEPlayer/MEPlayerItem.swift b/Sources/KSPlayer/MEPlayer/MEPlayerItem.swift
@@ -82,7 +82,7 @@ final class MEPlayerItem {
     lazy var dynamicInfo = DynamicInfo { [weak self] in
         toDictionary(self?.formatCtx?.pointee.metadata)
     } bytesRead: { [weak self] in
-        self?.formatCtx?.pointee.pb.pointee.bytes_read ?? 0
+        self?.formatCtx?.pointee.pb?.pointee.bytes_read ?? 0
     } audioBitrate: { [weak self] in
         Int(8 * (self?.audioTrack?.bitrate ?? 0))
     } videoBitrate: { [weak self] in

diff --git a/Sources/KSPlayer/SwiftUI/KSVideoPlayerView.swift b/Sources/KSPlayer/SwiftUI/KSVideoPlayerView.swift
@@ -503,8 +503,9 @@ struct VideoSettingView: View {
                         Text(track.description).tag(track.trackID as Int32?)
                     }
                 } label: {
-                    Label("Video track", systemImage: "video.fill")
+                    Label("Video Track", systemImage: "video.fill")
                 }
+                LabeledContent("Video Type", value: (videoTracks.first { $0.isEnabled }?.dynamicRange ?? .sdr).description)
             }
             Picker(selection: Binding {
                 subtitleModel.selectedSubtitleInfo?.subtitleID