Ninjalama/streamyfin
1
0
Fork 0
forked from Ninjalama/streamyfin_mirror
Code Pull Requests 2 Actions Packages Projects Releases Activity

wip

Browse Source
This commit is contained in:
Fredrik Burmester
2024-10-12 12:55:45 +02:00
parent 091a8ff6c3
commit bf8687a473
12 changed files with 1141 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/vlc-player/ios/VlcPlayerModule.swift
View File

@@ -8,10 +8,6 @@ public class VlcPlayerModule: Module {
view.setSource(source)
}
Prop("progressUpdateInterval") { (view: VlcPlayerView, interval: Double) in
view.setProgressUpdateInterval(interval)
}
Prop("paused") { (view: VlcPlayerView, paused: Bool) in
if paused {
view.pause()
@@ -33,7 +29,6 @@ public class VlcPlayerModule: Module {
}
Events(
"onProgress",
"onPlaybackStateChanged",
"onVideoLoadStart",
"onVideoStateChange",
@@ -48,18 +43,14 @@ public class VlcPlayerModule: Module {
view.pause()
}
AsyncFunction("seekTo") { (view: VlcPlayerView, time: Double) in
AsyncFunction("stop") { (view: VlcPlayerView) in
view.stop()
}
AsyncFunction("seekTo") { (view: VlcPlayerView, time: Int32) in
view.seekTo(time)
}
AsyncFunction("jumpBackward") { (view: VlcPlayerView, interval: Int) in
view.jumpBackward(interval)
}
AsyncFunction("jumpForward") { (view: VlcPlayerView, interval: Int) in
view.jumpForward(interval)
}
AsyncFunction("setAudioTrack") { (view: VlcPlayerView, trackIndex: Int) in
view.setAudioTrack(trackIndex)
}

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

@@ -5,11 +5,9 @@ import UIKit
class VlcPlayerView: ExpoView {
private var mediaPlayer: VLCMediaPlayer?
private var videoView: UIView?
private var progressUpdateTimer: Timer?
private var progressUpdateInterval: TimeInterval = 0.5
private var isPaused: Bool = false
private var currentGeometryCString: [CChar]?
private var stateUpdateTimer: Timer?
private var lastReportedState: VLCMediaPlayerState?
// MARK: - Initialization
@@ -43,7 +41,8 @@ class VlcPlayerView: ExpoView {
}
private func setupMediaPlayer() {
DispatchQueue.main.async {
DispatchQueue.main.async { [weak self] in
guard let self = self else { return }
self.mediaPlayer = VLCMediaPlayer()
self.mediaPlayer?.delegate = self
self.mediaPlayer?.drawable = self.videoView
@@ -62,21 +61,31 @@ class VlcPlayerView: ExpoView {
// MARK: - Public Methods
@objc func play() {
self.mediaPlayer?.play()
self.isPaused = false
DispatchQueue.main.async { [weak self] in
guard let self = self else { return }
self.mediaPlayer?.play()
self.isPaused = false
}
}
@objc func pause() {
self.mediaPlayer?.pause()
self.isPaused = true
DispatchQueue.main.async { [weak self] in
guard let self = self else { return }
self.mediaPlayer?.pause()
self.isPaused = true
}
}
@objc func seekTo(_ time: Double) {
self.mediaPlayer?.time = VLCTime(int: Int32(time * 1000))
@objc func seekTo(_ time: Int32) {
DispatchQueue.main.async { [weak self] in
guard let self = self else { return }
self.mediaPlayer?.time = VLCTime(int: time)
}
}
@objc func setSource(_ source: [String: Any]) {
DispatchQueue.main.async {
DispatchQueue.main.async { [weak self] in
guard let self = self else { return }
self.mediaPlayer?.stop()
self.mediaPlayer = nil
@@ -111,8 +120,7 @@ class VlcPlayerView: ExpoView {
media.addOptions(mediaOptions)
}
// Parse the media asynchronously
media.parse()
// Set the media without parsing
self.mediaPlayer?.media = media
if autoplay {
@@ -123,25 +131,16 @@ class VlcPlayerView: ExpoView {
}
}
@objc func setProgressUpdateInterval(_ interval: Double) {
progressUpdateInterval = TimeInterval(interval / 1000.0)
updateProgressTimer()
}
@objc func jumpBackward(_ interval: Int) {
mediaPlayer?.jumpBackward(Int32(interval))
}
@objc func jumpForward(_ interval: Int) {
mediaPlayer?.jumpForward(Int32(interval))
}
@objc func setMuted(_ muted: Bool) {
mediaPlayer?.audio?.isMuted = muted
DispatchQueue.main.async {
self.mediaPlayer?.audio?.isMuted = muted
}
}
@objc func setVolume(_ volume: Int) {
mediaPlayer?.audio?.volume = Int32(volume)
DispatchQueue.main.async {
self.mediaPlayer?.audio?.volume = Int32(volume)
}
}
@objc func setVideoAspectRatio(_ ratio: String) {
@@ -170,24 +169,109 @@ class VlcPlayerView: ExpoView {
}
}
// @objc func getAudioTracks(
// _ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock
// ) {
// DispatchQueue.global(qos: .userInitiated).async { [weak self] in
// guard let self = self, let mediaPlayer = self.mediaPlayer else {
// DispatchQueue.main.async {
// reject("ERROR", "Media player not available", nil)
// }
// return
// }
// guard let trackNames = mediaPlayer.audioTrackNames,
// let trackIndexes = mediaPlayer.audioTrackIndexes
// else {
// DispatchQueue.main.async {
// reject("ERROR", "No audio tracks available", nil)
// }
// return
// }
// let tracks = zip(trackNames, trackIndexes).map { name, index in
// return ["name": name, "index": index]
// }
// DispatchQueue.main.async {
// resolve(tracks)
// }
// }
// }
@objc func setSubtitleTrack(_ trackIndex: Int) {
DispatchQueue.main.async {
self.mediaPlayer?.currentVideoSubTitleIndex = Int32(trackIndex)
if trackIndex == -1 {
// Disable subtitles
self.mediaPlayer?.currentVideoSubTitleIndex = -1
} else {
// Set the subtitle track
self.mediaPlayer?.currentVideoSubTitleIndex = Int32(trackIndex)
}
}
}
@objc func getSubtitleTracks() -> [[String: Any]]? {
guard let trackNames = mediaPlayer?.videoSubTitlesNames,
let trackIndexes = mediaPlayer?.videoSubTitlesIndexes
else {
guard let mediaPlayer = self.mediaPlayer else {
return nil
}
return zip(trackNames, trackIndexes).map { name, index in
return ["name": name, "index": index]
let count = mediaPlayer.numberOfSubtitlesTracks
guard count > 0 else {
return nil
}
var tracks: [[String: Any]] = []
// Add the "Disabled" track
tracks.append(["name": "Disabled", "index": -1])
if let names = mediaPlayer.videoSubTitlesNames as? [String],
let indexes = mediaPlayer.videoSubTitlesIndexes as? [NSNumber]
{
for (index, name) in zip(indexes, names) {
tracks.append(["name": name, "index": index.intValue])
}
}
return tracks
}
// @objc func getSubtitleTracks(
// _ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock
// ) {
// DispatchQueue.global(qos: .userInitiated).async { [weak self] in
// guard let self = self, let mediaPlayer = self.mediaPlayer else {
// DispatchQueue.main.async {
// reject("ERROR", "Media player not available", nil)
// }
// return
// }
// let count = mediaPlayer.numberOfSubtitlesTracks
// guard count > 0 else {
// DispatchQueue.main.async {
// reject("ERROR", "No subtitle tracks available", nil)
// }
// return
// }
// var tracks: [[String: Any]] = [["name": "Disabled", "index": -1]]
// if let names = mediaPlayer.videoSubTitlesNames as? [String],
// let indexes = mediaPlayer.videoSubTitlesIndexes as? [NSNumber]
// {
// for (index, name) in zip(indexes, names) {
// tracks.append(["name": name, "index": index.intValue])
// }
// }
// DispatchQueue.main.async {
// resolve(tracks)
// }
// }
// }
@objc func setSubtitleDelay(_ delay: Int) {
DispatchQueue.main.async {
self.mediaPlayer?.currentVideoSubTitleDelay = NSInteger(delay)
@@ -271,30 +355,26 @@ class VlcPlayerView: ExpoView {
}
}
@objc func stop() {
DispatchQueue.main.async { [weak self] in
guard let self = self else { return }
// Stop and release the media player
self.mediaPlayer?.stop()
self.mediaPlayer?.delegate = nil
self.mediaPlayer = nil
// Clear the video view
self.videoView?.removeFromSuperview()
self.videoView = nil
// Remove notifications
NotificationCenter.default.removeObserver(self)
}
}
// MARK: - Private Methods
private func updateProgressTimer() {
progressUpdateTimer?.invalidate()
progressUpdateTimer = Timer.scheduledTimer(
withTimeInterval: progressUpdateInterval, repeats: true
) { [weak self] _ in
self?.sendProgressUpdate()
}
}
private func sendProgressUpdate() {
DispatchQueue.main.async {
guard let player = self.mediaPlayer else { return }
let currentTime = player.time.intValue
let duration = player.media?.length.intValue ?? 0
let progress: [String: Any] = [
"currentTime": currentTime,
"duration": duration,
]
self.onVideoProgress?(progress)
}
}
@objc private func applicationWillResignActive() {
if !isPaused {
pause()
@@ -317,7 +397,6 @@ class VlcPlayerView: ExpoView {
// MARK: - Expo Events
@objc var onProgress: RCTDirectEventBlock?
@objc var onPlaybackStateChanged: RCTDirectEventBlock?
@objc var onVideoLoadStart: RCTDirectEventBlock?
@objc var onVideoStateChange: RCTDirectEventBlock?
@@ -326,92 +405,77 @@ class VlcPlayerView: ExpoView {
// MARK: - Deinitialization
deinit {
stateUpdateTimer?.invalidate()
release()
}
}
extension VlcPlayerView: VLCMediaPlayerDelegate {
func mediaPlayerStateChanged(_ aNotification: Notification) {
guard let player = self.mediaPlayer else { return }
let currentState = player.state
// If the state hasn't changed, don't do anything
guard currentState != lastReportedState else { return }
// Cancel any pending state update
stateUpdateTimer?.invalidate()
// Schedule a new state update
stateUpdateTimer = Timer.scheduledTimer(withTimeInterval: 0.1, repeats: false) {
[weak self] _ in
self?.reportStateChange(currentState)
DispatchQueue.main.async { [weak self] in
guard let self = self else { return }
self.updatePlayerState()
}
}
private func reportStateChange(_ state: VLCMediaPlayerState) {
DispatchQueue.main.async {
guard let player = self.mediaPlayer else { return }
private func updatePlayerState() {
DispatchQueue.main.async { [weak self] in
guard let self = self, let player = self.mediaPlayer else { return }
let currentState = player.state
print("VLC Player State Changed: \(currentState.description)")
var stateInfo: [String: Any] = [
"target": self.reactTag ?? NSNull(),
"currentTime": player.time.intValue,
"duration": player.media?.length.intValue ?? 0,
"isPlaying": currentState == .playing,
"isBuffering": currentState == .buffering,
]
switch state {
switch currentState {
case .opening:
stateInfo["type"] = "Opening"
case .paused:
self.isPaused = true
stateInfo["type"] = "Paused"
case .stopped:
stateInfo["type"] = "Stopped"
stateInfo["state"] = "Opening"
case .buffering:
if player.isPlaying {
self.isPaused = false
stateInfo["type"] = "Playing"
} else {
stateInfo["type"] = "Buffering"
stateInfo["isBuffering"] = true
}
stateInfo["state"] = "Buffering"
stateInfo["isBuffering"] = true
case .playing:
self.isPaused = false
stateInfo["type"] = "Playing"
case .esAdded:
stateInfo["type"] = "ESAdded"
stateInfo["state"] = "Playing"
case .paused:
stateInfo["state"] = "Paused"
case .stopped:
stateInfo["state"] = "Stopped"
case .ended:
print("VLCMediaPlayerStateEnded")
stateInfo["type"] = "Ended"
stateInfo["state"] = "Ended"
case .error:
stateInfo["type"] = "Error"
self.release()
@unknown default:
stateInfo["type"] = "Unknown"
stateInfo["state"] = "Error"
default:
stateInfo["state"] = "Unknown"
}
self.lastReportedState = state
self.onVideoStateChange?(stateInfo)
if currentState != self.lastReportedState {
self.lastReportedState = currentState
self.onVideoStateChange?(stateInfo)
}
}
}
func mediaPlayerTimeChanged(_ aNotification: Notification) {
updateVideoProgress()
DispatchQueue.main.async { [weak self] in
self?.updateVideoProgress()
}
}
private func updateVideoProgress() {
DispatchQueue.main.async {
guard let player = self.mediaPlayer else { return }
let currentTime = player.time.intValue
let duration = player.media?.length.intValue ?? 0
let currentTimeMs = player.time.intValue
let durationMs = player.media?.length.intValue ?? 0
if currentTime >= 0 && currentTime < duration {
if currentTimeMs >= 0 && currentTimeMs < durationMs {
self.onVideoProgress?([
"target": self.reactTag ?? NSNull(),
"currentTime": currentTime,
"duration": duration,
"currentTime": currentTimeMs,
"duration": durationMs,
])
}
}

13
modules/vlc-player/src/VlcPlayer.types.ts
View File

@@ -1,19 +1,19 @@
export type PlaybackStatePayload = {
nativeEvent: {
target: number;
type:
state:
| "Opening"
| "Paused"
| "Stopped"
| "Buffering"
| "Playing"
| "ESAdded"
| "Paused"
| "Stopped"
| "Ended"
| "Error"
| "Unknown";
currentTime: number;
duration: number;
isBuffering?: boolean;
isBuffering: boolean;
isPlaying: boolean;
};
};
@@ -70,9 +70,8 @@ export type VlcPlayerViewProps = {
export interface VlcPlayerViewRef {
play: () => Promise<void>;
pause: () => Promise<void>;
stop: () => Promise<void>;
seekTo: (time: number) => Promise<void>;
jumpBackward: (interval: number) => Promise<void>;
jumpForward: (interval: number) => Promise<void>;
setAudioTrack: (trackIndex: number) => Promise<void>;
getAudioTracks: () => Promise<TrackInfo[] | null>;
setSubtitleTrack: (trackIndex: number) => Promise<void>;

9
modules/vlc-player/src/VlcPlayerView.tsx
View File

@@ -31,15 +31,12 @@ const VlcPlayerView = React.forwardRef<VlcPlayerViewRef, VlcPlayerViewProps>(
pause: async () => {
await nativeRef.current?.pause();
},
stop: async () => {
await nativeRef.current?.stop();
},
seekTo: async (time: number) => {
await nativeRef.current?.seekTo(time);
},
jumpBackward: async (interval: number) => {
await nativeRef.current?.jumpBackward(interval);
},
jumpForward: async (interval: number) => {
await nativeRef.current?.jumpForward(interval);
},
setAudioTrack: async (trackIndex: number) => {
await nativeRef.current?.setAudioTrack(trackIndex);
},