Compare commits

..

1 Commits

Author SHA1 Message Date
Uruk
620a3224fc docs: add CodeRabbit auto-summary integration to PR template
Integrates CodeRabbit's automatic summary generation feature into the pull request template by adding a trigger command and informational comment.

This enables automated PR summaries when CodeRabbit is enabled, streamlining the review process and reducing manual effort in documenting changes.
2026-01-17 18:14:08 +01:00
22 changed files with 43 additions and 160 deletions

View File

@@ -10,10 +10,13 @@
## 🔖 Summary ## 🔖 Summary
<!-- <!--
A concise description of the changes introduced by this PR. A concise description of the changes introduced by this PR.
CodeRabbit will auto-generate a summary here if enabled.
Example: Example:
Add real-time currency conversion widget to dashboard. "Add real-time currency conversion widget to dashboard."
--> -->
@coderabbitai summary
## 🏷️ Ticket / Issue ## 🏷️ Ticket / Issue
<!-- <!--
Link to the related ticket, issue or user story. Link to the related ticket, issue or user story.

View File

@@ -449,7 +449,7 @@ export default function page() {
async (data: { nativeEvent: MpvOnProgressEventPayload }) => { async (data: { nativeEvent: MpvOnProgressEventPayload }) => {
if (isSeeking.get() || isPlaybackStopped) return; if (isSeeking.get() || isPlaybackStopped) return;
const { position, cacheSeconds } = data.nativeEvent; const { position } = data.nativeEvent;
// MPV reports position in seconds, convert to ms // MPV reports position in seconds, convert to ms
const currentTime = position * 1000; const currentTime = position * 1000;
@@ -459,12 +459,6 @@ export default function page() {
progress.set(currentTime); progress.set(currentTime);
// Update cache progress (current position + buffered seconds ahead)
if (cacheSeconds !== undefined && cacheSeconds > 0) {
const cacheEnd = currentTime + cacheSeconds * 1000;
cacheProgress.set(cacheEnd);
}
// Update URL immediately after seeking, or every 30 seconds during normal playback // Update URL immediately after seeking, or every 30 seconds during normal playback
const now = Date.now(); const now = Date.now();
const shouldUpdateUrl = wasJustSeeking.get(); const shouldUpdateUrl = wasJustSeeking.get();

View File

@@ -144,10 +144,7 @@ export const Button: React.FC<PropsWithChildren<ButtonProps>> = ({
${colorClasses} ${colorClasses}
${className}`} ${className}`}
> >
<Text <Text className={`${textColorClass} text-xl font-bold`}>
className={`${textColorClass} text-xl font-bold`}
ellipsizeMode='tail'
>
{children} {children}
</Text> </Text>
</View> </View>
@@ -189,7 +186,6 @@ export const Button: React.FC<PropsWithChildren<ButtonProps>> = ({
${iconRight ? "mr-2" : ""} ${iconRight ? "mr-2" : ""}
${iconLeft ? "ml-2" : ""} ${iconLeft ? "ml-2" : ""}
`} `}
ellipsizeMode='tail'
> >
{children} {children}
</Text> </Text>

View File

@@ -17,7 +17,7 @@ const JellyfinServerDiscovery: React.FC<Props> = ({ onServerSelect }) => {
return ( return (
<View className='mt-2'> <View className='mt-2'>
<Button onPress={startDiscovery} color='black'> <Button onPress={startDiscovery} color='black'>
<Text maxFontSizeMultiplier={1.2} className='text-white text-center'> <Text className='text-white text-center'>
{isSearching {isSearching
? t("server.searching") ? t("server.searching")
: t("server.search_for_local_servers")} : t("server.search_for_local_servers")}

View File

@@ -532,24 +532,18 @@ export const PlayButton: React.FC<Props> = ({
className='flex flex-row items-center justify-center bg-transparent rounded-full z-20 h-12 w-full ' className='flex flex-row items-center justify-center bg-transparent rounded-full z-20 h-12 w-full '
> >
<View className='flex flex-row items-center space-x-2'> <View className='flex flex-row items-center space-x-2'>
<Animated.Text <Animated.Text style={[animatedTextStyle, { fontWeight: "bold" }]}>
style={[animatedTextStyle, { fontWeight: "bold" }]}
maxFontSizeMultiplier={1.2}
>
{runtimeTicksToMinutes( {runtimeTicksToMinutes(
(item?.RunTimeTicks || 0) - (item?.RunTimeTicks || 0) -
(item?.UserData?.PlaybackPositionTicks || 0), (item?.UserData?.PlaybackPositionTicks || 0),
)} )}
{(item?.UserData?.PlaybackPositionTicks || 0) > 0 && " left"} {(item?.UserData?.PlaybackPositionTicks || 0) > 0 && " left"}
</Animated.Text> </Animated.Text>
<Animated.Text style={animatedTextStyle} maxFontSizeMultiplier={1.2}> <Animated.Text style={animatedTextStyle}>
<Ionicons name='play-circle' size={24} /> <Ionicons name='play-circle' size={24} />
</Animated.Text> </Animated.Text>
{client && ( {client && (
<Animated.Text <Animated.Text style={animatedTextStyle}>
style={animatedTextStyle}
maxFontSizeMultiplier={1.2}
>
<Feather name='cast' size={22} /> <Feather name='cast' size={22} />
<CastButton tintColor='transparent' /> <CastButton tintColor='transparent' />
</Animated.Text> </Animated.Text>

View File

@@ -198,13 +198,10 @@ export const PlayButton: React.FC<Props> = ({
className='flex flex-row items-center justify-center bg-transparent rounded-xl z-20 h-12 w-full ' className='flex flex-row items-center justify-center bg-transparent rounded-xl z-20 h-12 w-full '
> >
<View className='flex flex-row items-center space-x-2'> <View className='flex flex-row items-center space-x-2'>
<Animated.Text <Animated.Text style={[animatedTextStyle, { fontWeight: "bold" }]}>
style={[animatedTextStyle, { fontWeight: "bold" }]}
maxFontSizeMultiplier={1.2}
>
{runtimeTicksToMinutes(item?.RunTimeTicks)} {runtimeTicksToMinutes(item?.RunTimeTicks)}
</Animated.Text> </Animated.Text>
<Animated.Text style={animatedTextStyle} maxFontSizeMultiplier={1.2}> <Animated.Text style={animatedTextStyle}>
<Ionicons name='play-circle' size={24} /> <Ionicons name='play-circle' size={24} />
</Animated.Text> </Animated.Text>
</View> </View>

View File

@@ -13,7 +13,6 @@ export function ThemedText({
}: ThemedTextProps) { }: ThemedTextProps) {
return ( return (
<Text <Text
maxFontSizeMultiplier={1.3}
style={[ style={[
{ color: "white" }, { color: "white" },
type === "default" ? styles.default : undefined, type === "default" ? styles.default : undefined,

View File

@@ -736,7 +736,6 @@ export const AppleTVCarousel: React.FC<AppleTVCarouselProps> = ({
> >
<TouchableOpacity onPress={() => navigateToItem(item)}> <TouchableOpacity onPress={() => navigateToItem(item)}>
<Animated.Text <Animated.Text
maxFontSizeMultiplier={1.2}
style={{ style={{
color: `rgba(255, 255, 255, ${TEXT_OPACITY})`, color: `rgba(255, 255, 255, ${TEXT_OPACITY})`,
fontSize: GENRES_FONT_SIZE, fontSize: GENRES_FONT_SIZE,
@@ -802,7 +801,6 @@ export const AppleTVCarousel: React.FC<AppleTVCarouselProps> = ({
> >
<TouchableOpacity onPress={() => navigateToItem(item)}> <TouchableOpacity onPress={() => navigateToItem(item)}>
<Animated.Text <Animated.Text
maxFontSizeMultiplier={1.2}
numberOfLines={OVERVIEW_MAX_LINES} numberOfLines={OVERVIEW_MAX_LINES}
style={{ style={{
color: `rgba(255, 255, 255, ${TEXT_OPACITY * 0.85})`, color: `rgba(255, 255, 255, ${TEXT_OPACITY * 0.85})`,

View File

@@ -27,7 +27,7 @@ export function Input(props: InputProps) {
${isFocused ? "bg-neutral-700 border-2 border-white" : "bg-neutral-900 border-2 border-transparent"} ${isFocused ? "bg-neutral-700 border-2 border-white" : "bg-neutral-900 border-2 border-transparent"}
text-white ${extraClassName} text-white ${extraClassName}
`} `}
maxFontSizeMultiplier={1.2} allowFontScaling={false}
style={[ style={[
style, style,
{ {
@@ -45,7 +45,7 @@ export function Input(props: InputProps) {
<TextInput <TextInput
ref={inputRef} ref={inputRef}
className='p-4 rounded-xl bg-neutral-900' className='p-4 rounded-xl bg-neutral-900'
maxFontSizeMultiplier={1.2} allowFontScaling={false}
style={[{ color: "white" }, style]} style={[{ color: "white" }, style]}
placeholderTextColor={"#9CA3AF"} placeholderTextColor={"#9CA3AF"}
clearButtonMode='while-editing' clearButtonMode='while-editing'

View File

@@ -19,9 +19,7 @@ export const SectionHeader: React.FC<Props> = ({
return ( return (
<View className='px-4 flex flex-row items-center justify-between mb-2'> <View className='px-4 flex flex-row items-center justify-between mb-2'>
<Text className='text-lg font-bold text-neutral-100' ellipsizeMode='tail'> <Text className='text-lg font-bold text-neutral-100'>{title}</Text>
{title}
</Text>
{shouldShowAction && ( {shouldShowAction && (
<TouchableOpacity <TouchableOpacity
onPress={onPressAction} onPress={onPressAction}
@@ -31,7 +29,6 @@ export const SectionHeader: React.FC<Props> = ({
className='py-1 pl-3' className='py-1 pl-3'
> >
<Text <Text
ellipsizeMode='tail'
style={{ style={{
color: actionDisabled ? "rgba(255,255,255,0.4)" : Colors.primary, color: actionDisabled ? "rgba(255,255,255,0.4)" : Colors.primary,
}} }}

View File

@@ -4,7 +4,7 @@ export function Text(props: TextProps) {
if (Platform.isTV) if (Platform.isTV)
return ( return (
<RNText <RNText
maxFontSizeMultiplier={1.3} allowFontScaling={false}
style={[{ color: "white" }, style]} style={[{ color: "white" }, style]}
{...otherProps} {...otherProps}
/> />
@@ -12,7 +12,7 @@ export function Text(props: TextProps) {
return ( return (
<RNText <RNText
maxFontSizeMultiplier={1.3} allowFontScaling={false}
style={[{ color: "white" }, style]} style={[{ color: "white" }, style]}
{...otherProps} {...otherProps}
/> />

View File

@@ -175,16 +175,10 @@ export const Favorites = () => {
contentFit='contain' contentFit='contain'
source={heart} source={heart}
/> />
<Text <Text className='text-xl font-semibold text-white mb-2'>
maxFontSizeMultiplier={1.2}
className='text-xl font-semibold text-white mb-2'
>
{t("favorites.noDataTitle")} {t("favorites.noDataTitle")}
</Text> </Text>
<Text <Text className='text-base text-white/70 text-center max-w-xs px-4'>
maxFontSizeMultiplier={1.2}
className='text-base text-white/70 text-center max-w-xs px-4'
>
{t("favorites.noData")} {t("favorites.noData")}
</Text> </Text>
</View> </View>

View File

@@ -11,12 +11,12 @@ export const KefinTweaksSettings = () => {
return ( return (
<View className=''> <View className=''>
<View className='flex flex-col rounded-xl overflow-hidden p-4 bg-neutral-900'> <View className='flex flex-col rounded-xl overflow-hidden p-4 bg-neutral-900'>
<Text maxFontSizeMultiplier={1.2} className='text-xs text-red-600 mb-2'> <Text className='text-xs text-red-600 mb-2'>
{t("home.settings.plugins.kefinTweaks.watchlist_enabler")} {t("home.settings.plugins.kefinTweaks.watchlist_enabler")}
</Text> </Text>
<View className='flex flex-row items-center justify-between mt-2'> <View className='flex flex-row items-center justify-between mt-2'>
<Text maxFontSizeMultiplier={1.2} className='text-white'> <Text className='text-white'>
{isEnabled ? t("Watchlist On") : t("Watchlist Off")} {isEnabled ? t("Watchlist On") : t("Watchlist Off")}
</Text> </Text>

View File

@@ -19,9 +19,7 @@ const SkipButton: React.FC<SkipButtonProps> = ({
onPress={onPress} onPress={onPress}
className='bg-black/60 rounded-md px-3 py-3 border border-neutral-900' className='bg-black/60 rounded-md px-3 py-3 border border-neutral-900'
> >
<Text maxFontSizeMultiplier={1.2} className='text-white font-bold'> <Text className='text-white font-bold'>{buttonText}</Text>
{buttonText}
</Text>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
); );

View File

@@ -102,7 +102,6 @@ const SliderScrubber: React.FC<SliderScrubberProps> = ({
contentFit='cover' contentFit='cover'
/> />
<Text <Text
maxFontSizeMultiplier={1.2}
style={{ style={{
position: "absolute", position: "absolute",
bottom: 5, bottom: 5,
@@ -127,16 +126,10 @@ const SliderScrubber: React.FC<SliderScrubberProps> = ({
maximumValue={max} maximumValue={max}
/> />
<View className='flex flex-row items-center justify-between mt-0.5'> <View className='flex flex-row items-center justify-between mt-0.5'>
<Text <Text className='text-[12px] text-neutral-400'>
maxFontSizeMultiplier={1.2}
className='text-[12px] text-neutral-400'
>
{formatTimeString(currentTime, "ms")} {formatTimeString(currentTime, "ms")}
</Text> </Text>
<Text <Text className='text-[12px] text-neutral-400'>
maxFontSizeMultiplier={1.2}
className='text-[12px] text-neutral-400'
>
-{formatTimeString(remainingTime, "ms")} -{formatTimeString(remainingTime, "ms")}
</Text> </Text>
</View> </View>

View File

@@ -195,7 +195,6 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
<View style={styles.infoBox}> <View style={styles.infoBox}>
{playMethod && ( {playMethod && (
<Text <Text
maxFontSizeMultiplier={1.2}
style={[ style={[
styles.infoText, styles.infoText,
{ color: getPlayMethodColor(playMethod) }, { color: getPlayMethodColor(playMethod) },
@@ -205,31 +204,28 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
</Text> </Text>
)} )}
{transcodeReasons && transcodeReasons.length > 0 && ( {transcodeReasons && transcodeReasons.length > 0 && (
<Text <Text style={[styles.infoText, styles.reasonText]}>
maxFontSizeMultiplier={1.2}
style={[styles.infoText, styles.reasonText]}
>
{transcodeReasons.map(formatTranscodeReason).join(", ")} {transcodeReasons.map(formatTranscodeReason).join(", ")}
</Text> </Text>
)} )}
{info?.videoWidth && info?.videoHeight && ( {info?.videoWidth && info?.videoHeight && (
<Text maxFontSizeMultiplier={1.2} style={styles.infoText}> <Text style={styles.infoText}>
{info.videoWidth}x{info.videoHeight} {info.videoWidth}x{info.videoHeight}
</Text> </Text>
)} )}
{info?.videoCodec && ( {info?.videoCodec && (
<Text maxFontSizeMultiplier={1.2} style={styles.infoText}> <Text style={styles.infoText}>
Video: {formatCodec(info.videoCodec)} Video: {formatCodec(info.videoCodec)}
{info.fps ? ` @ ${formatFps(info.fps)} fps` : ""} {info.fps ? ` @ ${formatFps(info.fps)} fps` : ""}
</Text> </Text>
)} )}
{info?.audioCodec && ( {info?.audioCodec && (
<Text maxFontSizeMultiplier={1.2} style={styles.infoText}> <Text style={styles.infoText}>
Audio: {formatCodec(info.audioCodec)} Audio: {formatCodec(info.audioCodec)}
</Text> </Text>
)} )}
{(info?.videoBitrate || info?.audioBitrate) && ( {(info?.videoBitrate || info?.audioBitrate) && (
<Text maxFontSizeMultiplier={1.2} style={styles.infoText}> <Text style={styles.infoText}>
Bitrate:{" "} Bitrate:{" "}
{info.videoBitrate {info.videoBitrate
? formatBitrate(info.videoBitrate) ? formatBitrate(info.videoBitrate)
@@ -239,22 +235,17 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
</Text> </Text>
)} )}
{info?.cacheSeconds !== undefined && ( {info?.cacheSeconds !== undefined && (
<Text maxFontSizeMultiplier={1.2} style={styles.infoText}> <Text style={styles.infoText}>
Buffer: {info.cacheSeconds.toFixed(1)}s Buffer: {info.cacheSeconds.toFixed(1)}s
</Text> </Text>
)} )}
{info?.droppedFrames !== undefined && info.droppedFrames > 0 && ( {info?.droppedFrames !== undefined && info.droppedFrames > 0 && (
<Text <Text style={[styles.infoText, styles.warningText]}>
maxFontSizeMultiplier={1.2}
style={[styles.infoText, styles.warningText]}
>
Dropped: {info.droppedFrames} frames Dropped: {info.droppedFrames} frames
</Text> </Text>
)} )}
{!info && !playMethod && ( {!info && !playMethod && (
<Text maxFontSizeMultiplier={1.2} style={styles.infoText}> <Text style={styles.infoText}>Loading...</Text>
Loading...
</Text>
)} )}
</View> </View>
</Animated.View> </Animated.View>

View File

@@ -1,13 +1,10 @@
package expo.modules.mpvplayer package expo.modules.mpvplayer
import android.content.Context import android.content.Context
import android.content.res.AssetManager
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import android.util.Log import android.util.Log
import android.view.Surface import android.view.Surface
import java.io.File
import java.io.FileOutputStream
/** /**
* MPV renderer that wraps libmpv for video playback. * MPV renderer that wraps libmpv for video playback.
@@ -29,7 +26,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
} }
interface Delegate { interface Delegate {
fun onPositionChanged(position: Double, duration: Double, cacheSeconds: Double) fun onPositionChanged(position: Double, duration: Double)
fun onPauseChanged(isPaused: Boolean) fun onPauseChanged(isPaused: Boolean)
fun onLoadingChanged(isLoading: Boolean) fun onLoadingChanged(isLoading: Boolean)
fun onReadyToSeek() fun onReadyToSeek()
@@ -49,7 +46,6 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
// Cached state // Cached state
private var cachedPosition: Double = 0.0 private var cachedPosition: Double = 0.0
private var cachedDuration: Double = 0.0 private var cachedDuration: Double = 0.0
private var cachedCacheSeconds: Double = 0.0
private var _isPaused: Boolean = true private var _isPaused: Boolean = true
private var _isLoading: Boolean = false private var _isLoading: Boolean = false
private var _playbackSpeed: Double = 1.0 private var _playbackSpeed: Double = 1.0
@@ -105,52 +101,6 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
MPVLib.create(context) MPVLib.create(context)
MPVLib.addObserver(this) MPVLib.addObserver(this)
/**
* Create mpv config directory and copy font files to ensure SubRip subtitles load properly on Android.
*
* Technical Background:
* ====================
* On Android, mpv requires access to a font file to render text-based subtitles, particularly SubRip (.srt)
* format subtitles. Without an available font in the config directory, mpv will fail to display subtitles
* even when subtitle tracks are properly detected and loaded.
*
* Why This Is Necessary:
* =====================
* 1. Android's font system is isolated from native libraries like mpv. While Android has system fonts,
* mpv cannot access them directly due to sandboxing and library isolation.
*
* 2. SubRip subtitles require a font to render text overlay on video. When no font is available in the
* configured directory, mpv either:
* - Fails silently (subtitles don't appear)
* - Falls back to a default font that may not support the required character set
* - Crashes or produces rendering errors
*
* 3. By placing a font file (font.ttf) in mpv's config directory and setting that directory via
* MPVLib.setOptionString("config-dir", ...), we ensure mpv has a known, accessible font source.
*
* Reference:
* =========
* This workaround is documented in the mpv-android project:
* https://github.com/mpv-android/mpv-android/issues/96
*
* The issue discusses that without a font in the config directory, SubRip subtitles fail to load
* properly on Android, and the solution is to copy a font file to a known location that mpv can access.
*/
// Create mpv config directory and copy font files
val mpvDir = File(context.getExternalFilesDir(null) ?: context.filesDir, "mpv")
//Log.i(TAG, "mpv config dir: $mpvDir")
if (!mpvDir.exists()) mpvDir.mkdirs()
// This needs to be named `subfont.ttf` else it won't work
arrayOf("subfont.ttf").forEach { fileName ->
val file = File(mpvDir, fileName)
if (file.exists()) return@forEach
context.assets
.open(fileName, AssetManager.ACCESS_STREAMING)
.copyTo(FileOutputStream(file))
}
MPVLib.setOptionString("config", "yes")
MPVLib.setOptionString("config-dir", mpvDir.path)
// Configure mpv options before initialization (based on Findroid) // Configure mpv options before initialization (based on Findroid)
MPVLib.setOptionString("vo", "gpu") MPVLib.setOptionString("vo", "gpu")
MPVLib.setOptionString("gpu-context", "android") MPVLib.setOptionString("gpu-context", "android")
@@ -174,7 +124,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
MPVLib.setOptionString("hr-seek-framedrop", "yes") MPVLib.setOptionString("hr-seek-framedrop", "yes")
// Subtitle settings // Subtitle settings
MPVLib.setOptionString("sub-scale-with-window", "no") MPVLib.setOptionString("sub-scale-with-window", "yes")
MPVLib.setOptionString("sub-use-margins", "no") MPVLib.setOptionString("sub-use-margins", "no")
MPVLib.setOptionString("subs-match-os-language", "yes") MPVLib.setOptionString("subs-match-os-language", "yes")
MPVLib.setOptionString("subs-fallback", "yes") MPVLib.setOptionString("subs-fallback", "yes")
@@ -333,7 +283,6 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
MPVLib.observeProperty("pause", MPV_FORMAT_FLAG) MPVLib.observeProperty("pause", MPV_FORMAT_FLAG)
MPVLib.observeProperty("track-list/count", MPV_FORMAT_INT64) MPVLib.observeProperty("track-list/count", MPV_FORMAT_INT64)
MPVLib.observeProperty("paused-for-cache", MPV_FORMAT_FLAG) MPVLib.observeProperty("paused-for-cache", MPV_FORMAT_FLAG)
MPVLib.observeProperty("demuxer-cache-duration", MPV_FORMAT_DOUBLE)
// Video dimensions for PiP aspect ratio // Video dimensions for PiP aspect ratio
MPVLib.observeProperty("video-params/w", MPV_FORMAT_INT64) MPVLib.observeProperty("video-params/w", MPV_FORMAT_INT64)
MPVLib.observeProperty("video-params/h", MPV_FORMAT_INT64) MPVLib.observeProperty("video-params/h", MPV_FORMAT_INT64)
@@ -612,7 +561,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
when (property) { when (property) {
"duration" -> { "duration" -> {
cachedDuration = value cachedDuration = value
mainHandler.post { delegate?.onPositionChanged(cachedPosition, cachedDuration, cachedCacheSeconds) } mainHandler.post { delegate?.onPositionChanged(cachedPosition, cachedDuration) }
} }
"time-pos" -> { "time-pos" -> {
cachedPosition = value cachedPosition = value
@@ -621,12 +570,9 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
val shouldUpdate = _isSeeking || (now - lastProgressUpdateTime >= 1000) val shouldUpdate = _isSeeking || (now - lastProgressUpdateTime >= 1000)
if (shouldUpdate) { if (shouldUpdate) {
lastProgressUpdateTime = now lastProgressUpdateTime = now
mainHandler.post { delegate?.onPositionChanged(cachedPosition, cachedDuration, cachedCacheSeconds) } mainHandler.post { delegate?.onPositionChanged(cachedPosition, cachedDuration) }
} }
} }
"demuxer-cache-duration" -> {
cachedCacheSeconds = value
}
} }
} }

View File

@@ -307,7 +307,7 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
// MARK: - MPVLayerRenderer.Delegate // MARK: - MPVLayerRenderer.Delegate
override fun onPositionChanged(position: Double, duration: Double, cacheSeconds: Double) { override fun onPositionChanged(position: Double, duration: Double) {
cachedPosition = position cachedPosition = position
cachedDuration = duration cachedDuration = duration
@@ -319,8 +319,7 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
onProgress(mapOf( onProgress(mapOf(
"position" to position, "position" to position,
"duration" to duration, "duration" to duration,
"progress" to if (duration > 0) position / duration else 0.0, "progress" to if (duration > 0) position / duration else 0.0
"cacheSeconds" to cacheSeconds
)) ))
} }

View File

@@ -5,7 +5,7 @@ import CoreVideo
import AVFoundation import AVFoundation
protocol MPVLayerRendererDelegate: AnyObject { protocol MPVLayerRendererDelegate: AnyObject {
func renderer(_ renderer: MPVLayerRenderer, didUpdatePosition position: Double, duration: Double, cacheSeconds: Double) func renderer(_ renderer: MPVLayerRenderer, didUpdatePosition position: Double, duration: Double)
func renderer(_ renderer: MPVLayerRenderer, didChangePause isPaused: Bool) func renderer(_ renderer: MPVLayerRenderer, didChangePause isPaused: Bool)
func renderer(_ renderer: MPVLayerRenderer, didChangeLoading isLoading: Bool) func renderer(_ renderer: MPVLayerRenderer, didChangeLoading isLoading: Bool)
func renderer(_ renderer: MPVLayerRenderer, didBecomeReadyToSeek: Bool) func renderer(_ renderer: MPVLayerRenderer, didBecomeReadyToSeek: Bool)
@@ -44,7 +44,6 @@ final class MPVLayerRenderer {
// Thread-safe state for playback // Thread-safe state for playback
private var _cachedDuration: Double = 0 private var _cachedDuration: Double = 0
private var _cachedPosition: Double = 0 private var _cachedPosition: Double = 0
private var _cachedCacheSeconds: Double = 0
private var _isPaused: Bool = true private var _isPaused: Bool = true
private var _playbackSpeed: Double = 1.0 private var _playbackSpeed: Double = 1.0
private var _isLoading: Bool = false private var _isLoading: Bool = false
@@ -76,10 +75,6 @@ final class MPVLayerRenderer {
get { stateQueue.sync { _cachedPosition } } get { stateQueue.sync { _cachedPosition } }
set { stateQueue.async(flags: .barrier) { self._cachedPosition = newValue } } set { stateQueue.async(flags: .barrier) { self._cachedPosition = newValue } }
} }
private var cachedCacheSeconds: Double {
get { stateQueue.sync { _cachedCacheSeconds } }
set { stateQueue.async(flags: .barrier) { self._cachedCacheSeconds = newValue } }
}
private var isPaused: Bool { private var isPaused: Bool {
get { stateQueue.sync { _isPaused } } get { stateQueue.sync { _isPaused } }
set { stateQueue.async(flags: .barrier) { self._isPaused = newValue } } set { stateQueue.async(flags: .barrier) { self._isPaused = newValue } }
@@ -169,7 +164,6 @@ final class MPVLayerRenderer {
// Enable composite OSD mode - renders subtitles directly onto video frames using GPU // Enable composite OSD mode - renders subtitles directly onto video frames using GPU
// This is better for PiP as subtitles are baked into the video // This is better for PiP as subtitles are baked into the video
// NOTE: Must be set BEFORE the #if targetEnvironment check or tvOS will freeze on player exit
checkError(mpv_set_option_string(handle, "avfoundation-composite-osd", "yes")) checkError(mpv_set_option_string(handle, "avfoundation-composite-osd", "yes"))
// Hardware decoding with VideoToolbox // Hardware decoding with VideoToolbox
@@ -346,8 +340,7 @@ final class MPVLayerRenderer {
("time-pos", MPV_FORMAT_DOUBLE), ("time-pos", MPV_FORMAT_DOUBLE),
("pause", MPV_FORMAT_FLAG), ("pause", MPV_FORMAT_FLAG),
("track-list/count", MPV_FORMAT_INT64), ("track-list/count", MPV_FORMAT_INT64),
("paused-for-cache", MPV_FORMAT_FLAG), ("paused-for-cache", MPV_FORMAT_FLAG)
("demuxer-cache-duration", MPV_FORMAT_DOUBLE)
] ]
for (name, format) in properties { for (name, format) in properties {
mpv_observe_property(handle, 0, name, format) mpv_observe_property(handle, 0, name, format)
@@ -491,7 +484,7 @@ final class MPVLayerRenderer {
cachedDuration = value cachedDuration = value
DispatchQueue.main.async { [weak self] in DispatchQueue.main.async { [weak self] in
guard let self else { return } guard let self else { return }
self.delegate?.renderer(self, didUpdatePosition: self.cachedPosition, duration: self.cachedDuration, cacheSeconds: self.cachedCacheSeconds) self.delegate?.renderer(self, didUpdatePosition: self.cachedPosition, duration: self.cachedDuration)
} }
} }
case "time-pos": case "time-pos":
@@ -506,16 +499,10 @@ final class MPVLayerRenderer {
lastProgressUpdateTime = now lastProgressUpdateTime = now
DispatchQueue.main.async { [weak self] in DispatchQueue.main.async { [weak self] in
guard let self else { return } guard let self else { return }
self.delegate?.renderer(self, didUpdatePosition: self.cachedPosition, duration: self.cachedDuration, cacheSeconds: self.cachedCacheSeconds) self.delegate?.renderer(self, didUpdatePosition: self.cachedPosition, duration: self.cachedDuration)
} }
} }
} }
case "demuxer-cache-duration":
var value = Double(0)
let status = getProperty(handle: handle, name: name, format: MPV_FORMAT_DOUBLE, value: &value)
if status >= 0 {
cachedCacheSeconds = value
}
case "pause": case "pause":
var flag: Int32 = 0 var flag: Int32 = 0
let status = getProperty(handle: handle, name: name, format: MPV_FORMAT_FLAG, value: &flag) let status = getProperty(handle: handle, name: name, format: MPV_FORMAT_FLAG, value: &flag)

View File

@@ -298,7 +298,7 @@ class MpvPlayerView: ExpoView {
// MARK: - MPVLayerRendererDelegate // MARK: - MPVLayerRendererDelegate
extension MpvPlayerView: MPVLayerRendererDelegate { extension MpvPlayerView: MPVLayerRendererDelegate {
func renderer(_: MPVLayerRenderer, didUpdatePosition position: Double, duration: Double, cacheSeconds: Double) { func renderer(_: MPVLayerRenderer, didUpdatePosition position: Double, duration: Double) {
cachedPosition = position cachedPosition = position
cachedDuration = duration cachedDuration = duration
@@ -313,7 +313,6 @@ extension MpvPlayerView: MPVLayerRendererDelegate {
"position": position, "position": position,
"duration": duration, "duration": duration,
"progress": duration > 0 ? position / duration : 0, "progress": duration > 0 ? position / duration : 0,
"cacheSeconds": cacheSeconds,
]) ])
} }
} }

View File

@@ -15,8 +15,6 @@ export type OnProgressEventPayload = {
position: number; position: number;
duration: number; duration: number;
progress: number; progress: number;
/** Seconds of video buffered ahead of current position */
cacheSeconds: number;
}; };
export type OnErrorEventPayload = { export type OnErrorEventPayload = {