Skip to content

Major rework to player #2689

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.

Sign up for GitHub

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
Luna712 wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Major rework to player #2689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ac863b3
Major rework to player inheritance to use BaseFragment
Luna712 Apr 17, 2026
ab64c50
Some fixes
Luna712 Apr 18, 2026
536cb65
Some fixes
Luna712 Apr 18, 2026
ca0388c
Fix issue caused by out of date branch
Luna712 Apr 18, 2026
5e05534
Move companion objects to top
Luna712 Apr 19, 2026
3a9779d
Merge branch 'recloudstream:master' into player-rework
Luna712 Apr 19, 2026
23ed1d8
No lateinit + bugfix
Luna712 Apr 19, 2026
dd2a881
Restore lastTopIndex
Luna712 Apr 19, 2026
70c6950
Fixes
Luna712 Apr 21, 2026
a3cfa8b
Fixes
Luna712 Apr 24, 2026
452d15c
Fix
Luna712 Apr 24, 2026
cc197a9
Fix
Luna712 Apr 24, 2026
5e948f5
Fixes
Luna712 Apr 24, 2026
c9bd820
Fix
Luna712 Apr 25, 2026
93d1179
Fix
Luna712 Apr 25, 2026
0069235
trailer fix
Luna712 Apr 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
741 changes: 74 additions & 667 deletions app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 7 additions & 25 deletions app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,23 +247,6 @@ class CS3IPlayer : IPlayer {
}
}

// I know, this is not a perfect solution, however it works for fixing subs
private fun reloadSubs() {
exoPlayer?.applicationLooper?.let {
try {
Handler(it).post {
try {
seekTime(1L, source = PlayerEventSource.Player)
} catch (e: Exception) {
logError(e)
}
}
} catch (e: Exception) {
logError(e)
}
}
}

fun String.stripTrackId(): String {
return this.replace(Regex("""^\d+:"""), "")
}
Expand Down Expand Up @@ -432,9 +415,9 @@ class CS3IPlayer : IPlayer {
* Gets all supported formats in a list
* */
private fun List<Tracks.Group>.getFormats(): List<Pair<Format, Int>> {
return this.map {
return this.flatMap {
it.getFormats()
}.flatten()
}
}

private fun Tracks.Group.getFormats(): List<Pair<Format, Int>> {
Expand Down Expand Up @@ -1110,7 +1093,7 @@ class CS3IPlayer : IPlayer {
.setFallbackMinPlaybackSpeed(0.97f)
.build()
)
.setRenderersFactory { eventHandler, videoRendererEventListener, audioRendererEventListener, textRendererOutput, metadataRendererOutput ->
.setRenderersFactory { eventHandler, videoRendererEventListener, audioRendererEventListener, _, metadataRendererOutput ->
val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
val current = settingsManager.getInt(
context.getString(R.string.software_decoding_key),
Expand Down Expand Up @@ -1144,7 +1127,7 @@ class CS3IPlayer : IPlayer {
// Custom TextOutput to apply cue styling and rules to all subtitles
val customTextOutput = TextOutput { cue ->
// Do not remove filterNotNull as Java typesystem is fucked
val (bitmapCues, textCues) = cue.cues.filterNotNull()
val (bitmapCues, textCues) = cue.cues.toList()
.partition { it.bitmap != null }

val styledBitmapCues = bitmapCues.map { bitmapCue ->
Expand Down Expand Up @@ -1351,7 +1334,7 @@ class CS3IPlayer : IPlayer {
} else {
try {
val source = ConcatenatingMediaSource2.Builder()
mediaItemSlices.map { item ->
mediaItemSlices.forEach { item ->
source.add(
// The duration MUST be known for it to work properly, see https://github.com/google/ExoPlayer/issues/4727
ClippingMediaSource(
Expand All @@ -1365,7 +1348,7 @@ class CS3IPlayer : IPlayer {
@Suppress("DEPRECATION")
val source =
ConcatenatingMediaSource() // FIXME figure out why ConcatenatingMediaSource2 seems to fail with Torrents only
mediaItemSlices.map { item ->
mediaItemSlices.forEach { item ->
source.addMediaSource(
// The duration MUST be known for it to work properly, see https://github.com/google/ExoPlayer/issues/4727
ClippingMediaSource(
Expand Down Expand Up @@ -1837,7 +1820,7 @@ class CS3IPlayer : IPlayer {
defaultSet
)
?.mapNotNull { it.toIntOrNull() ?: return@mapNotNull null }
} catch (e: Throwable) {
} catch (_: Throwable) {
null
} ?: default

Expand Down Expand Up @@ -2038,4 +2021,3 @@ class CS3IPlayer : IPlayer {
}

}

Loading