From 71d8d1dd074e9a8377f6e3953b2ed9e14b0c18b2 Mon Sep 17 00:00:00 2001 From: marcoschmickler Date: Fri, 17 Jun 2022 19:43:47 +0200 Subject: [PATCH] Webview --- kplayer/video/SVideoModel.swift | 2 ++ kplayer/video/SVideoPlayer.swift | 3 +++ kplayer/web/KBrowserView.swift | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/kplayer/video/SVideoModel.swift b/kplayer/video/SVideoModel.swift index b3dcfe1..46115de 100644 --- a/kplayer/video/SVideoModel.swift +++ b/kplayer/video/SVideoModel.swift @@ -28,6 +28,8 @@ class SVideoModel : ObservableObject { @Published var favorite = false @Published var speed: Float = 1.0 + @Published var height: Int = 0 + @Published var nominalFrameRate: Int = 0 @Published var currentURL: URL? diff --git a/kplayer/video/SVideoPlayer.swift b/kplayer/video/SVideoPlayer.swift index f7d225b..e058b16 100644 --- a/kplayer/video/SVideoPlayer.swift +++ b/kplayer/video/SVideoPlayer.swift @@ -117,6 +117,7 @@ struct SVideoPlayer: View, EditItemDelegate { Text(model.currentSnapshot.name).foregroundColor(Color.blue) + Text(" (\(model.height),\(model.nominalFrameRate)").foregroundColor(Color.blue) ScrollView(.horizontal, showsIndicators: false) { HStack { @@ -570,8 +571,10 @@ struct SVideoPlayer: View, EditItemDelegate { let heightSpace = model.proxy!.size.height * 2 var height = heightSpace if let i = player.currentItem { + model.nominalFrameRate = await i.asset.load(.nominalFrameRate) height = i.presentationSize.height } + model.height = Int(height) var f = height / heightSpace print("h \(height) \(heightSpace) \(f)") diff --git a/kplayer/web/KBrowserView.swift b/kplayer/web/KBrowserView.swift index a570e9e..d294bfc 100644 --- a/kplayer/web/KBrowserView.swift +++ b/kplayer/web/KBrowserView.swift @@ -241,7 +241,7 @@ struct KBrowserView: View { mitem.externalURL = host + url } else { - mitem.externalURL = url.replacingOccurrences(of: "//", with: "/") + mitem.externalURL = url //.replacingOccurrences(of: "//", with: "/") } mitem.cookies = cookieString