Repository navigation
fix(player): time Up Next from the end of the file, not the credits marker #994
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Rhainland
wants to merge
2
commits into
Silo-Server:main
Choose a base branch
from
Rhainland:fix/next-up-from-file-end
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+149
−59
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
shared/src/commonMain/kotlin/org/siloserver/silo/domain/player/NextUpPrompt.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package org.siloserver.silo.domain.player | ||
|
|
||
| /** | ||
| * When the Up Next card opens before an episode ends: `playback.next_up_prompt_seconds` | ||
| * before the end of the file, as on iOS/tvOS (`PlayerNextUpCompletionPolicy`). Credits | ||
| * markers drive Skip Credits; they do not move this point. | ||
| */ | ||
| object NextUpPrompt { | ||
| /** | ||
| * True when playback moves from [previousPosition] to [position] across the point | ||
| * [promptSeconds] before [duration]. Only the crossing counts, so resuming or seeking | ||
| * past that point doesn't open the card. [promptSeconds] 0 ("At end") or an unknown | ||
| * duration never opens it early; the card then waits for the stream to end. | ||
| */ | ||
| fun crossesPromptPoint( | ||
| previousPosition: Double, | ||
| position: Double, | ||
| duration: Double, | ||
| promptSeconds: Int, | ||
| ): Boolean { | ||
| if (promptSeconds <= 0 || duration <= 0) return false | ||
| val promptStart = duration - promptSeconds | ||
| return previousPosition < promptStart && position >= promptStart | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Short episodes never cross the configured Up Next prompt point
Episodes at or below the configured offset end without showing Up Next because
promptStartis nonpositive and playback starts at zero. Handle this boundary explicitly so the prompt can appear during playback.Prompt for LLM
Talk to Kody by mentioning @kody
Was this suggestion helpful? React with 👍 or 👎 to help Kody learn from this interaction.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same as main. The phone already computed the point as duration minus the lead time and needed a forward crossing, so a file no longer than the lead never opened the card early; the TV never used the setting at all. Such a file still gets Up Next when the stream ends (onApproachingEnd(videoEnded = true)). The longest lead is 2 minutes, so this only affects clips, not episodes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That context changes the assessment: short files still get Up Next when playback ends, so the suggestion overstates the impact. The phone’s behavior is also unchanged from main; the TV’s prior behavior was different because it did not use the setting.
There is still a boundary case: for a file no longer than the configured lead time, the prompt cannot open early under the crossing logic. Whether to change that is a product decision rather than necessarily a regression in this PR. I would not treat it as blocking #994.