alteropen/streamyfin
1
0
Fork 0
mirror of https://github.com/streamyfin/streamyfin.git synced 2026-03-05 17:26:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

working subs

Browse Source
This commit is contained in:
Alex Kim
2025-12-07 01:19:21 +11:00
parent bc78346760
commit 2648877eb8
23 changed files with 922 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/index.ts
View File

@@ -17,8 +17,10 @@ export type {
OnLoadEventPayload,
OnPlaybackStateChangePayload,
OnProgressEventPayload,
OnTracksReadyEventPayload,
SubtitleTrack,
SubtitleTrack as TrackInfo,
VideoSource,
} from "./mpv-player";
// MPV Player - Main exports
export { MpvPlayerView } from "./mpv-player";

135
modules/mpv-player/ios/MPVSoftwareRenderer.swift
View File

@@ -9,6 +9,7 @@ protocol MPVSoftwareRendererDelegate: AnyObject {
func renderer(_ renderer: MPVSoftwareRenderer, didChangePause isPaused: Bool)
func renderer(_ renderer: MPVSoftwareRenderer, didChangeLoading isLoading: Bool)
func renderer(_ renderer: MPVSoftwareRenderer, didBecomeReadyToSeek: Bool)
func renderer(_ renderer: MPVSoftwareRenderer, didUpdateTrackList trackCount: Int)
}
final class MPVSoftwareRenderer {
@@ -43,6 +44,9 @@ final class MPVSoftwareRenderer {
private var currentPreset: PlayerPreset?
private var currentURL: URL?
private var currentHeaders: [String: String]?
private var pendingExternalSubtitles: [String] = []
private var initialSubtitleId: Int?
private var initialAudioId: Int?
private var disposeBag: [() -> Void] = []
@@ -50,6 +54,9 @@ final class MPVSoftwareRenderer {
private var isStopping = false
private var shouldClearPixelBuffer = false
private let bgraFormatCString: [CChar] = Array("bgra\0".utf8CString)
private let maxInFlightBuffers = 3
private var inFlightBufferCount = 0
private let inFlightLock = NSLock()
weak var delegate: MPVSoftwareRendererDelegate?
private var cachedDuration: Double = 0
@@ -107,10 +114,11 @@ final class MPVSoftwareRenderer {
setOption(name: "demuxer-max-bytes", value: "150M")
setOption(name: "demuxer-readahead-secs", value: "20")
// Subtitle options - blend into video for software renderer
setOption(name: "sub-auto", value: "yes")
setOption(name: "subs-fallback", value: "yes")
// Subtitle options - use vf=sub to burn subtitles into video frames
// This happens at the filter level, BEFORE the software renderer
setOption(name: "vf", value: "sub")
setOption(name: "sub-visibility", value: "yes")
let initStatus = mpv_initialize(handle)
guard initStatus >= 0 else {
throw RendererError.mpvInitialization(initStatus)
@@ -190,10 +198,21 @@ final class MPVSoftwareRenderer {
isStopping = false
}
func load(url: URL, with preset: PlayerPreset, headers: [String: String]? = nil) {
func load(
url: URL,
with preset: PlayerPreset,
headers: [String: String]? = nil,
startPosition: Double? = nil,
externalSubtitles: [String]? = nil,
initialSubtitleId: Int? = nil,
initialAudioId: Int? = nil
) {
currentPreset = preset
currentURL = url
currentHeaders = headers
pendingExternalSubtitles = externalSubtitles ?? []
self.initialSubtitleId = initialSubtitleId
self.initialAudioId = initialAudioId
renderQueue.async { [weak self] in
guard let self else { return }
@@ -203,16 +222,38 @@ final class MPVSoftwareRenderer {
guard let self else { return }
self.delegate?.renderer(self, didChangeLoading: true)
}
}
guard let handle = mpv else { return }
renderQueue.async { [weak self] in
guard let self else { return }
guard let handle = self.mpv else { return }
self.apply(commands: preset.commands, on: handle)
self.command(handle, ["stop"])
// Sync stop to ensure previous playback is stopped before loading new file
self.commandSync(handle, ["stop"])
self.updateHTTPHeaders(headers)
// Set start position using property (setOption only works before mpv_initialize)
if let startPos = startPosition, startPos > 0 {
self.setProperty(name: "start", value: String(format: "%.2f", startPos))
} else {
self.setProperty(name: "start", value: "0")
}
// Set initial audio track if specified
if let audioId = self.initialAudioId, audioId > 0 {
self.setAudioTrack(audioId)
}
// Set initial subtitle track if no external subs (external subs change track IDs)
if self.pendingExternalSubtitles.isEmpty {
if let subId = self.initialSubtitleId {
self.setSubtitleTrack(subId)
} else {
self.disableSubtitles()
}
} else {
// External subs will be added after file loads, set sid then
self.disableSubtitles()
}
var finalURL = url
if !url.isFileURL {
finalURL = url
@@ -317,7 +358,8 @@ final class MPVSoftwareRenderer {
("dheight", MPV_FORMAT_INT64),
("duration", MPV_FORMAT_DOUBLE),
("time-pos", MPV_FORMAT_DOUBLE),
("pause", MPV_FORMAT_FLAG)
("pause", MPV_FORMAT_FLAG),
("track-list/count", MPV_FORMAT_INT64) // Notify when tracks are available
]
for (name, format) in properties {
@@ -792,6 +834,7 @@ final class MPVSoftwareRenderer {
}
}
/// Async command - returns immediately, mpv processes later
private func command(_ handle: OpaquePointer, _ args: [String]) {
guard !args.isEmpty else { return }
_ = withCStringArray(args) { pointer in
@@ -799,6 +842,14 @@ final class MPVSoftwareRenderer {
}
}
/// Sync command - waits for mpv to process before returning
private func commandSync(_ handle: OpaquePointer, _ args: [String]) -> Int32 {
guard !args.isEmpty else { return -1 }
return withCStringArray(args) { pointer in
mpv_command(handle, pointer)
}
}
private func processEvents() {
eventQueueGroup.enter()
let group = eventQueueGroup
@@ -821,6 +872,22 @@ final class MPVSoftwareRenderer {
case MPV_EVENT_VIDEO_RECONFIG:
refreshVideoState()
case MPV_EVENT_FILE_LOADED:
// Add external subtitles now that the file is loaded
let hadExternalSubs = !pendingExternalSubtitles.isEmpty
if hadExternalSubs, let handle = mpv {
for subUrl in pendingExternalSubtitles {
command(handle, ["sub-add", subUrl])
}
pendingExternalSubtitles = []
// Set subtitle after external subs are added (track IDs have changed)
if let subId = initialSubtitleId {
setSubtitleTrack(subId)
} else {
disableSubtitles()
}
}
if !isReadyToSeek {
isReadyToSeek = true
DispatchQueue.main.async { [weak self] in
@@ -887,6 +954,16 @@ final class MPVSoftwareRenderer {
delegate?.renderer(self, didChangePause: isPaused)
}
}
case "track-list/count":
var trackCount: Int64 = 0
let status = getProperty(handle: handle, name: name, format: MPV_FORMAT_INT64, value: &trackCount)
if status >= 0 && trackCount > 0 {
Logger.shared.log("Track list updated: \(trackCount) tracks available", type: "Info")
DispatchQueue.main.async { [weak self] in
guard let self = self else { return }
self.delegate?.renderer(self, didUpdateTrackList: Int(trackCount))
}
}
default:
break
}
@@ -949,12 +1026,14 @@ final class MPVSoftwareRenderer {
func seek(to seconds: Double) {
guard let handle = mpv else { return }
let clamped = max(0, seconds)
command(handle, ["seek", String(clamped), "absolute"])
// Sync seek for accurate positioning
commandSync(handle, ["seek", String(clamped), "absolute"])
}
func seek(by seconds: Double) {
guard let handle = mpv else { return }
command(handle, ["seek", String(seconds), "relative"])
// Sync seek for accurate positioning
commandSync(handle, ["seek", String(seconds), "relative"])
}
func setSpeed(_ speed: Double) {
@@ -979,7 +1058,6 @@ final class MPVSoftwareRenderer {
var trackCount: Int64 = 0
getProperty(handle: handle, name: "track-list/count", format: MPV_FORMAT_INT64, value: &trackCount)
Logger.shared.log("getSubtitleTracks: total track count = \(trackCount)", type: "Info")
for i in 0..<trackCount {
var trackType: String?
@@ -1016,7 +1094,18 @@ final class MPVSoftwareRenderer {
func setSubtitleTrack(_ trackId: Int) {
Logger.shared.log("setSubtitleTrack: setting sid to \(trackId)", type: "Info")
setProperty(name: "sid", value: String(trackId))
guard let handle = mpv else {
Logger.shared.log("setSubtitleTrack: mpv handle is nil!", type: "Error")
return
}
// Use setProperty for synchronous behavior (command is async)
if trackId < 0 {
// Disable subtitles
setProperty(name: "sid", value: "no")
} else {
setProperty(name: "sid", value: String(trackId))
}
}
func disableSubtitles() {
@@ -1030,9 +1119,11 @@ final class MPVSoftwareRenderer {
return Int(sid)
}
func addSubtitleFile(url: String) {
func addSubtitleFile(url: String, select: Bool = true) {
guard let handle = mpv else { return }
command(handle, ["sub-add", url])
// "cached" adds without selecting, "select" adds and selects
let flag = select ? "select" : "cached"
commandSync(handle, ["sub-add", url, flag])
}
// MARK: - Subtitle Positioning
@@ -1117,7 +1208,13 @@ final class MPVSoftwareRenderer {
}
func setAudioTrack(_ trackId: Int) {
guard let handle = mpv else {
Logger.shared.log("setAudioTrack: mpv handle is nil", type: "Warn")
return
}
Logger.shared.log("setAudioTrack: setting aid to \(trackId)", type: "Info")
// Use setProperty for synchronous behavior
setProperty(name: "aid", value: String(trackId))
}

40
modules/mpv-player/ios/MpvPlayerModule.swift
View File

@@ -24,23 +24,23 @@ public class MpvPlayerModule: Module {
// Enables the module to be used as a native view. Definition components that are accepted as part of the
// view definition: Prop, Events.
View(MpvPlayerView.self) {
// Defines a setter for the `url` prop.
Prop("url") { (view: MpvPlayerView, url: String) in
if let videoURL = URL(string: url) {
view.loadVideo(url: videoURL, headers: nil)
}
}
// Defines a setter for headers
Prop("headers") { (view: MpvPlayerView, headers: [String: String]?) in
// Headers will be used when loading the video
}
// Defines a setter for autoplay
Prop("autoplay") { (view: MpvPlayerView, autoplay: Bool) in
if autoplay {
view.play()
}
// All video load options are passed via a single "source" prop
Prop("source") { (view: MpvPlayerView, source: [String: Any]?) in
guard let source = source,
let urlString = source["url"] as? String,
let videoURL = URL(string: urlString) else { return }
let config = VideoLoadConfig(
url: videoURL,
headers: source["headers"] as? [String: String],
externalSubtitles: source["externalSubtitles"] as? [String],
startPosition: source["startPosition"] as? Double,
autoplay: (source["autoplay"] as? Bool) ?? true,
initialSubtitleId: source["initialSubtitleId"] as? Int,
initialAudioId: source["initialAudioId"] as? Int
)
view.loadVideo(config: config)
}
// Async function to play video
@@ -122,8 +122,8 @@ public class MpvPlayerModule: Module {
return view.getCurrentSubtitleTrack()
}
AsyncFunction("addSubtitleFile") { (view: MpvPlayerView, url: String) in
view.addSubtitleFile(url: url)
AsyncFunction("addSubtitleFile") { (view: MpvPlayerView, url: String, select: Bool) in
view.addSubtitleFile(url: url, select: select)
}
// Subtitle positioning functions
@@ -165,7 +165,7 @@ public class MpvPlayerModule: Module {
}
// Defines events that the view can send to JavaScript
Events("onLoad", "onPlaybackStateChange", "onProgress", "onError")
Events("onLoad", "onPlaybackStateChange", "onProgress", "onError", "onTracksReady")
}
}
}

71
modules/mpv-player/ios/MpvPlayerView.swift
View File

@@ -3,6 +3,37 @@ import CoreMedia
import ExpoModulesCore
import UIKit
/// Configuration for loading a video
struct VideoLoadConfig {
let url: URL
var headers: [String: String]?
var externalSubtitles: [String]?
var startPosition: Double?
var autoplay: Bool
/// MPV subtitle track ID to select on start (1-based, -1 to disable, nil to use default)
var initialSubtitleId: Int?
/// MPV audio track ID to select on start (1-based, nil to use default)
var initialAudioId: Int?
init(
url: URL,
headers: [String: String]? = nil,
externalSubtitles: [String]? = nil,
startPosition: Double? = nil,
autoplay: Bool = true,
initialSubtitleId: Int? = nil,
initialAudioId: Int? = nil
) {
self.url = url
self.headers = headers
self.externalSubtitles = externalSubtitles
self.startPosition = startPosition
self.autoplay = autoplay
self.initialSubtitleId = initialSubtitleId
self.initialAudioId = initialAudioId
}
}
// This view will be used as a native component. Make sure to inherit from `ExpoView`
// to apply the proper styling (e.g. border radius and shadows).
class MpvPlayerView: ExpoView {
@@ -15,6 +46,7 @@ class MpvPlayerView: ExpoView {
let onPlaybackStateChange = EventDispatcher()
let onProgress = EventDispatcher()
let onError = EventDispatcher()
let onTracksReady = EventDispatcher()
private var currentURL: URL?
private var cachedPosition: Double = 0
@@ -74,10 +106,9 @@ class MpvPlayerView: ExpoView {
CATransaction.commit()
}
func loadVideo(url: URL, headers: [String: String]?) {
currentURL = url
func loadVideo(config: VideoLoadConfig) {
currentURL = config.url
// Create a simple preset with default commands
let preset = PlayerPreset(
id: .sdrRec709,
title: "Default",
@@ -86,8 +117,27 @@ class MpvPlayerView: ExpoView {
commands: []
)
renderer?.load(url: url, with: preset, headers: headers)
onLoad(["url": url.absoluteString])
// Pass everything to the renderer - it handles start position and external subs
renderer?.load(
url: config.url,
with: preset,
headers: config.headers,
startPosition: config.startPosition,
externalSubtitles: config.externalSubtitles,
initialSubtitleId: config.initialSubtitleId,
initialAudioId: config.initialAudioId
)
if config.autoplay {
play()
}
onLoad(["url": config.url.absoluteString])
}
// Convenience method for simple loads
func loadVideo(url: URL, headers: [String: String]? = nil) {
loadVideo(config: VideoLoadConfig(url: url, headers: headers))
}
func play() {
@@ -164,8 +214,8 @@ class MpvPlayerView: ExpoView {
return renderer?.getCurrentSubtitleTrack() ?? 0
}
func addSubtitleFile(url: String) {
renderer?.addSubtitleFile(url: url)
func addSubtitleFile(url: String, select: Bool = true) {
renderer?.addSubtitleFile(url: url, select: select)
}
// MARK: - Audio Track Controls
@@ -266,6 +316,13 @@ extension MpvPlayerView: MPVSoftwareRendererDelegate {
])
}
}
func renderer(_: MPVSoftwareRenderer, didUpdateTrackList trackCount: Int) {
DispatchQueue.main.async { [weak self] in
guard let self else { return }
self.onTracksReady(["trackCount": trackCount])
}
}
}
// MARK: - PiPControllerDelegate

21
modules/mpv-player/src/MpvPlayer.types.ts
View File

@@ -21,6 +21,10 @@ export type OnErrorEventPayload = {
error: string;
};
export type OnTracksReadyEventPayload = {
trackCount: number;
};
export type MpvPlayerModuleEvents = {
onChange: (params: ChangeEventPayload) => void;
};
@@ -29,10 +33,20 @@ export type ChangeEventPayload = {
value: string;
};
export type MpvPlayerViewProps = {
url?: string;
export type VideoSource = {
url: string;
headers?: Record<string, string>;
externalSubtitles?: string[];
startPosition?: number;
autoplay?: boolean;
/** MPV subtitle track ID to select on start (1-based, -1 to disable) */
initialSubtitleId?: number;
/** MPV audio track ID to select on start (1-based) */
initialAudioId?: number;
};
export type MpvPlayerViewProps = {
source?: VideoSource;
style?: StyleProp<ViewStyle>;
onLoad?: (event: { nativeEvent: OnLoadEventPayload }) => void;
onPlaybackStateChange?: (event: {
@@ -40,6 +54,7 @@ export type MpvPlayerViewProps = {
}) => void;
onProgress?: (event: { nativeEvent: OnProgressEventPayload }) => void;
onError?: (event: { nativeEvent: OnErrorEventPayload }) => void;
onTracksReady?: (event: { nativeEvent: OnTracksReadyEventPayload }) => void;
};
export interface MpvPlayerViewRef {
@@ -61,7 +76,7 @@ export interface MpvPlayerViewRef {
setSubtitleTrack: (trackId: number) => Promise<void>;
disableSubtitles: () => Promise<void>;
getCurrentSubtitleTrack: () => Promise<number>;
addSubtitleFile: (url: string) => Promise<void>;
addSubtitleFile: (url: string, select?: boolean) => Promise<void>;
// Subtitle positioning
setSubtitlePosition: (position: number) => Promise<void>;
setSubtitleScale: (scale: number) => Promise<void>;

4
modules/mpv-player/src/MpvPlayerView.tsx
View File

@@ -63,8 +63,8 @@ export default React.forwardRef<MpvPlayerViewRef, MpvPlayerViewProps>(
getCurrentSubtitleTrack: async () => {
return await nativeRef.current?.getCurrentSubtitleTrack();
},
addSubtitleFile: async (url: string) => {
await nativeRef.current?.addSubtitleFile(url);
addSubtitleFile: async (url: string, select = true) => {
await nativeRef.current?.addSubtitleFile(url, select);
},
setSubtitlePosition: async (position: number) => {
await nativeRef.current?.setSubtitlePosition(position);