Ninjalama/streamyfin_mirror
1
0
Fork 1
mirror of https://github.com/streamyfin/streamyfin.git synced 2025-08-20 18:37:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated IOS to work with new react-video transcoded player

Browse Source
This commit is contained in:
Alex Kim
2024-11-25 03:32:28 +11:00
parent 835484b367
commit d47dd633c7
1 changed files with 3 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
modules/vlc-player/ios/VlcPlayerView.swift
View File

@@ -12,7 +12,6 @@ class VlcPlayerView: ExpoView {
private var lastReportedIsPlaying: Bool? private var lastReportedIsPlaying: Bool?
private var customSubtitles: [(internalName: String, originalName: String)] = [] private var customSubtitles: [(internalName: String, originalName: String)] = []
private var startPosition: Int32 = 0 private var startPosition: Int32 = 0
private var isTranscodedStream: Bool = false
private var isMediaReady: Bool = false private var isMediaReady: Bool = false
private var externalTrack: [String: String]? private var externalTrack: [String: String]?
@@ -112,9 +111,6 @@ class VlcPlayerView: ExpoView {
initOptions.append("--start-time=\(startPosition)") initOptions.append("--start-time=\(startPosition)")
let uri = source["uri"] as? String let uri = source["uri"] as? String
if let uri = uri, uri.contains("m3u8") {
self.isTranscodedStream = true
}
let autoplay = source["autoplay"] as? Bool ?? false let autoplay = source["autoplay"] as? Bool ?? false
let isNetwork = source["isNetwork"] as? Bool ?? false let isNetwork = source["isNetwork"] as? Bool ?? false
@@ -587,7 +583,7 @@ extension VlcPlayerView: VLCMediaPlayerDelegate {
// Playing and not transcoding, we can let it in no HLS issue. // Playing and not transcoding, we can let it in no HLS issue.
// We should also mark it as playing when the media is ready. // We should also mark it as playing when the media is ready.
// Fix HLS issue. // Fix HLS issue.
if player.isPlaying && (!self.isTranscodedStream || self.isMediaReady) { if player.isPlaying && self.isMediaReady {
stateInfo["isPlaying"] = true stateInfo["isPlaying"] = true
stateInfo["isBuffering"] = false stateInfo["isBuffering"] = false
stateInfo["state"] = "Playing" stateInfo["state"] = "Playing"
@@ -648,40 +644,16 @@ extension VlcPlayerView: VLCMediaPlayerDelegate {
let durationMs = player.media?.length.intValue ?? 0 let durationMs = player.media?.length.intValue ?? 0
if currentTimeMs >= 0 && currentTimeMs < durationMs { if currentTimeMs >= 0 && currentTimeMs < durationMs {
// Handle when VLC starts at cloest earliest segment skip to the start time, for transcoded streams.
if player.isPlaying && !self.isMediaReady { if player.isPlaying && !self.isMediaReady {
self.isMediaReady = true self.isMediaReady = true
// Set external track subtitle when starting.
if let externalTrack = self.externalTrack { if let externalTrack = self.externalTrack {
if let name = externalTrack["name"] as? String, !name.isEmpty { if let name = externalTrack["name"] as? String, !name.isEmpty {
let deliveryUrl = externalTrack["DeliveryUrl"] as? String ?? "" let deliveryUrl = externalTrack["DeliveryUrl"] as? String ?? ""
if !self.isTranscodedStream {
self.setSubtitleURL(deliveryUrl, name: name) self.setSubtitleURL(deliveryUrl, name: name)
} else {
self.setSubtitleTrackByName(name)
} }
} }
} }
// HLS bug.
if self.isTranscodedStream {
if self.startPosition > 0 {
print("Seeking to start position: \(self.startPosition)")
self.seekTo(self.startPosition * 1000)
} else {
var stateInfo: [String: Any] = [
"target": self.reactTag ?? NSNull(),
"currentTime": player.time.intValue,
"duration": player.media?.length.intValue ?? 0,
"error": false,
"isPlaying": true,
"isBuffering": false,
"state": "Playing",
]
self.onVideoStateChange?(stateInfo)
}
}
}
self.onVideoProgress?([ self.onVideoProgress?([
"currentTime": currentTimeMs, "currentTime": currentTimeMs,
"duration": durationMs, "duration": durationMs,