alteropen/streamyfin
1
0
Fork 0
mirror of https://github.com/streamyfin/streamyfin.git synced 2026-04-20 07:44:42 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

wip: subtitles and onVideoLoad stuff

Browse Source
This commit is contained in:
Fredrik Burmester
2024-10-14 11:14:34 +02:00
parent 092f5e73d7
commit 67be97d857
8 changed files with 144 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,8 +30,9 @@ public class VlcPlayerModule: Module {
Events(
"onPlaybackStateChanged",
"onVideoLoadStart",
"onVideoStateChange",
"onVideoLoadStart",
"onVideoLoadEnd",
"onVideoProgress"
)
@@ -74,6 +75,11 @@ public class VlcPlayerModule: Module {
AsyncFunction("getVideoCropGeometry") { (view: VlcPlayerView) -> String? in
return view.getVideoCropGeometry()
}
AsyncFunction("setSubtitleURL") { (view: VlcPlayerView, url: String) in
view.setSubtitleURL(url)
}
}
}
}

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

@@ -9,6 +9,8 @@ class VlcPlayerView: ExpoView {
private var isPaused: Bool = false
private var currentGeometryCString: [CChar]?
private var lastReportedState: VLCMediaPlayerState?
private var lastReportedIsPlaying: Bool?
private var isMediaReady: Bool = false
// MARK: - Initialization
@@ -233,6 +235,7 @@ class VlcPlayerView: ExpoView {
// }
// }
// }
@objc func setSubtitleTrack(_ trackIndex: Int) {
print("Debug: Attempting to set subtitle track to index: \(trackIndex)")
DispatchQueue.main.async {
@@ -255,21 +258,39 @@ class VlcPlayerView: ExpoView {
}
}
@objc func setSubtitleURL(_ subtitleURL: String) {
DispatchQueue.main.async { [weak self] in
guard let self = self, let url = URL(string: subtitleURL) else {
print("Error: Invalid subtitle URL")
return
}
let result = self.mediaPlayer?.addPlaybackSlave(url, type: .subtitle, enforce: true)
if let result = result {
print("Subtitle added with result: \(result)")
} else {
print("Failed to add subtitle")
}
}
}
@objc func getSubtitleTracks() -> [[String: Any]]? {
guard let mediaPlayer = self.mediaPlayer else {
return nil
}
let count = mediaPlayer.numberOfSubtitlesTracks
print(
"Debug: Number of subtitle tracks: \(count)"
)
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]
{
@@ -493,6 +514,7 @@ class VlcPlayerView: ExpoView {
@objc var onVideoLoadStart: RCTDirectEventBlock?
@objc var onVideoStateChange: RCTDirectEventBlock?
@objc var onVideoProgress: RCTDirectEventBlock?
@objc var onVideoLoadEnd: RCTDirectEventBlock?
// MARK: - Deinitialization
@@ -534,30 +556,19 @@ extension VlcPlayerView: VLCMediaPlayerDelegate {
stateInfo["state"] = "Buffering"
}
// switch currentState {
// case .opening:
// stateInfo["state"] = "Opening"
// case .buffering:
// stateInfo["state"] = "Buffering"
// stateInfo["isBuffering"] = true
// case .playing:
// stateInfo["state"] = "Playing"
// case .paused:
// stateInfo["state"] = "Paused"
// case .stopped:
// stateInfo["state"] = "Stopped"
// case .ended:
// stateInfo["state"] = "Ended"
// case .error:
// stateInfo["state"] = "Error"
// default:
// stateInfo["state"] = "Unknown"
// }
// Dermine if the media has finished loading
if currentState == .buffering && !self.isMediaReady {
self.isMediaReady = true
self.onVideoLoadEnd?(stateInfo)
}
print("State changed: \(stateInfo)")
self.lastReportedState = currentState
self.onVideoStateChange?(stateInfo)
if self.lastReportedState != currentState
|| self.lastReportedIsPlaying != player.isPlaying
{
self.lastReportedState = currentState
self.lastReportedIsPlaying = player.isPlaying
self.onVideoStateChange?(stateInfo)
}
}
}

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

@@ -67,6 +67,7 @@ export type VlcPlayerViewProps = {
onVideoProgress?: (event: ProgressUpdatePayload) => void;
onVideoStateChange?: (event: PlaybackStatePayload) => void;
onVideoLoadStart?: (event: VideoLoadStartPayload) => void;
onVideoLoadEnd?: (event: VideoLoadStartPayload) => void;
};
export interface VlcPlayerViewRef {
@@ -87,4 +88,5 @@ export interface VlcPlayerViewRef {
getChapters: () => Promise<ChapterInfo[] | null>;
setVideoCropGeometry: (geometry: string | null) => Promise<void>;
getVideoCropGeometry: () => Promise<string | null>;
setSubtitleURL: (url: string) => Promise<void>;
}

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

@@ -5,8 +5,6 @@ import {
VlcPlayerViewProps,
VlcPlayerViewRef,
VlcPlayerSource,
TrackInfo,
ChapterInfo,
} from "./VlcPlayer.types";
interface NativeViewRef extends VlcPlayerViewRef {
@@ -80,6 +78,9 @@ const VlcPlayerView = React.forwardRef<VlcPlayerViewRef, VlcPlayerViewProps>(
const geometry = await nativeRef.current?.getVideoCropGeometry();
return geometry ?? null;
},
setSubtitleURL: async (url: string) => {
await nativeRef.current?.setSubtitleURL(url);
},
}));
const {
@@ -93,6 +94,7 @@ const VlcPlayerView = React.forwardRef<VlcPlayerViewRef, VlcPlayerViewProps>(
onVideoLoadStart,
onVideoStateChange,
onVideoProgress,
onVideoLoadEnd,
...otherProps
} = props;
@@ -111,6 +113,7 @@ const VlcPlayerView = React.forwardRef<VlcPlayerViewRef, VlcPlayerViewProps>(
volume={volume}
videoAspectRatio={videoAspectRatio}
onVideoLoadStart={onVideoLoadStart}
onVideoLoadEnd={onVideoLoadEnd}
onVideoStateChange={onVideoStateChange}
onVideoProgress={onVideoProgress}
/>