Skip to content

Make the sync subtitle delay feature intuitive #3160

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
refirestream wants to merge 5 commits into
base: master
Choose a base branch
from
+57 −30
Open

Make the sync subtitle delay feature intuitive #3160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c05301b
fix: group player subtitles by resolved language name
Aug 17, 2026
c248b4e
fix: compute subtitle group names once into a list
Sep 8, 2026
e01c5f3
fix: disambiguate subtitle tracks with identical original names
Sep 8, 2026
1f31bb1
Merge branch 'recloudstream:master' into fix/subtitle-language-grouping
Sarlay Sep 8, 2026
f573980
feat: make subtitle delay positive for subtitles shown too late
Sep 8, 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
14 changes: 7 additions & 7 deletions app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
private var hideControlsNames = false
protected var subtitleDelay
set(value) = try {
player.setSubtitleOffset(-value)
player.setSubtitleOffset(value)
} catch (e: Exception) {
logError(e)
}
get() = try {
-player.getSubtitleOffset()
player.getSubtitleOffset()
} catch (e: Exception) {
logError(e)
0L
Expand Down Expand Up @@ -527,7 +527,7 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(

// Scroll to the first active subtitle
val playerPosition = player.getPosition() ?: 0
val totalPosition = playerPosition - currentOffset
val totalPosition = playerPosition + currentOffset
subtitleAdapter?.updateTime(totalPosition)

subtitleAdapter?.getLatestActiveItem(totalPosition)
Expand All @@ -537,11 +537,11 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(

val str = when {
time > 0L -> {
txt(R.string.subtitle_offset_extra_hint_later_format, time)
txt(R.string.subtitle_offset_extra_hint_before_format, time)
}

time < 0L -> {
txt(R.string.subtitle_offset_extra_hint_before_format, -time)
txt(R.string.subtitle_offset_extra_hint_later_format, -time)
}

else -> {
Expand All @@ -559,12 +559,12 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
subtitleOffsetRecyclerview.isVisible = subtitles.isNotEmpty()
noSubtitlesLoadedNotice.isVisible = subtitles.isEmpty()

val initialSubtitlePosition = (player.getPosition() ?: 0) - currentOffset
val initialSubtitlePosition = (player.getPosition() ?: 0) + currentOffset
subtitleAdapter =
SubtitleOffsetItemAdapter(initialSubtitlePosition) { subtitleCue ->
val playerPosition = player.getPosition() ?: 0
subtitleOffsetInput.text = Editable.Factory.getInstance()
?.newEditable((playerPosition - subtitleCue.startTimeMs).toString())
?.newEditable((subtitleCue.startTimeMs - playerPosition).toString())
}.apply {
submitList(subtitles)
}
Expand Down
60 changes: 40 additions & 20 deletions app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import androidx.preference.PreferenceManager
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
import com.lagradost.cloudstream3.AllLanguagesName
import com.lagradost.cloudstream3.CloudStreamApp
import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
import com.lagradost.cloudstream3.CommonActivity.showToast
Expand Down Expand Up @@ -101,6 +102,7 @@ import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
import com.lagradost.cloudstream3.ui.subtitles.SUBTITLE_AUTO_SELECT_KEY
import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.getAutoSelectLanguageTagIETF
import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettings
import com.lagradost.cloudstream3.utils.AppContextUtils.getShortSeasonText
import com.lagradost.cloudstream3.utils.AppContextUtils.html
import com.lagradost.cloudstream3.utils.AppContextUtils.sortSubs
Expand All @@ -112,7 +114,7 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
import com.lagradost.cloudstream3.utils.ExtractorLinkType
import com.lagradost.cloudstream3.utils.Qualities
import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTagToEnglishLanguageName
import com.lagradost.cloudstream3.utils.SubtitleHelper.fromCodeToLangTagIETF
import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTagToLanguageName
import com.lagradost.cloudstream3.utils.SubtitleHelper.languages
import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper
Expand Down Expand Up @@ -1195,20 +1197,29 @@ class GeneratorPlayer : FullScreenPlayer() {
ArrayAdapter<Spanned>(ctx, R.layout.sort_bottom_single_choice)
subsArrayAdapter.add(ctx.getString(R.string.no_subtitles).html())

val unknownGroupName = ctx.getString(R.string.subtitles_group_unknown)
val subtitlesWithGroup = currentSubtitles.map { sub ->
(fromTagToLanguageName(sub.getIETF_tag())?.takeIf { it.isNotBlank() }
?: unknownGroupName) to sub
}

val subtitlesGrouped =
currentSubtitles.groupBy { it.originalName }.map { (key, value) ->
subtitlesWithGroup.groupBy({ it.first }, { it.second }).map { (key, value) ->
key to value.sortedBy { it.nameSuffix.toIntOrNull() ?: 0 }
}.toMap()
val subtitlesGroupedList = subtitlesGrouped.entries.toList()

val subtitles = subtitlesGrouped.map { it.key.html() }

val selectedGroup =
subtitlesWithGroup.firstOrNull { it.second == currentSelectedSubtitles }?.first

val subtitleGroupIndexStart =
subtitlesGrouped.keys.indexOf(currentSelectedSubtitles?.originalName) + 1
subtitlesGrouped.keys.indexOf(selectedGroup) + 1
var subtitleGroupIndex = subtitleGroupIndexStart

val subtitleOptionIndexStart =
subtitlesGrouped[currentSelectedSubtitles?.originalName]?.indexOfFirst { it.nameSuffix == currentSelectedSubtitles?.nameSuffix }
subtitlesGrouped[selectedGroup]?.indexOfFirst { it.nameSuffix == currentSelectedSubtitles?.nameSuffix }
?: 0
var subtitleOptionIndex = subtitleOptionIndexStart

Expand All @@ -1229,19 +1240,30 @@ class GeneratorPlayer : FullScreenPlayer() {
fun updateSubtitleOptionList() {
subsOptionsArrayAdapter.clear()

val groupSubtitles = subtitlesGroupedList.getOrNull(subtitleGroupIndex - 1)?.value

val duplicateNames = groupSubtitles.orEmpty()
.groupingBy { it.originalName }.eachCount().filterValues { it > 1 }.keys
val nameIndex = mutableMapOf<String, Int>()

val subtitleOptions =
subtitlesGroupedList
.getOrNull(subtitleGroupIndex - 1)?.value?.map { subtitle ->
val nameSuffix = subtitle.nameSuffix.html()
nameSuffix.ifBlank {
when (subtitle.origin) {
SubtitleOrigin.URL -> txt(R.string.subtitles_from_online)
SubtitleOrigin.DOWNLOADED_FILE -> txt(R.string.downloaded)
SubtitleOrigin.EMBEDDED_IN_VIDEO -> txt(R.string.subtitles_from_embedded)
}.asString(ctx).toSpanned()
groupSubtitles?.map { subtitle ->
val label = if (subtitle.originalName in duplicateNames) {
val suffix = subtitle.nameSuffix.ifBlank {
val next = (nameIndex[subtitle.originalName] ?: 0) + 1
nameIndex[subtitle.originalName] = next
next.toString()
}
"${subtitle.originalName} $suffix"
} else subtitle.originalName
label.html().ifBlank {
when (subtitle.origin) {
SubtitleOrigin.URL -> txt(R.string.subtitles_from_online)
SubtitleOrigin.DOWNLOADED_FILE -> txt(R.string.downloaded)
SubtitleOrigin.EMBEDDED_IN_VIDEO -> txt(R.string.subtitles_from_embedded)
}.asString(ctx).toSpanned()
}
?: emptyList()
} ?: emptyList()

// Show nothing if there is nothing to select
val shouldHide = subtitleOptions.size < 2
Expand Down Expand Up @@ -2264,12 +2286,10 @@ class GeneratorPlayer : FullScreenPlayer() {
viewModel.filterSubByLang =
settingsManager.getBoolean(getString(R.string.filter_sub_lang_key), false)
if (viewModel.filterSubByLang) {
val langFromPrefMedia = settingsManager.getStringSet(
this.getString(R.string.provider_lang_key), mutableSetOf("en")
)
viewModel.langFilterList = langFromPrefMedia?.mapNotNull {
fromTagToEnglishLanguageName(it)?.lowercase() ?: return@mapNotNull null
} ?: listOf()
viewModel.langFilterList = ctx.getApiProviderLangSettings().map { tag ->
if (tag == AllLanguagesName) tag
else fromCodeToLangTagIETF(tag)?.lowercase() ?: tag.lowercase()
}
}

// Set up TV clock visibility
Expand Down
12 changes: 9 additions & 3 deletions app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.lagradost.cloudstream3.AllLanguagesName
import com.lagradost.cloudstream3.LoadResponse
import com.lagradost.cloudstream3.mvvm.Resource
import com.lagradost.cloudstream3.mvvm.launchSafe
Expand Down Expand Up @@ -371,13 +372,18 @@ class PlayerGeneratorViewModel : ViewModel() {
return true
}

/** Only filter out subtitles fetched online */
if (subtitle.origin != SubtitleOrigin.URL) {
if (langFilterList.contains(AllLanguagesName)) {
return true
}

if (subtitle.origin == SubtitleOrigin.DOWNLOADED_FILE) {
return true
}

val subtitleTag = subtitle.getIETF_tag()?.lowercase() ?: return true

return langFilterList.any { lang ->
subtitle.originalName.contains(lang, ignoreCase = true)
subtitleTag == lang || subtitleTag.substringBefore('-') == lang.substringBefore('-')
}
}

Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,7 @@
<string name="subtitles_remove_captions">Remove closed captions from subtitles</string>
<string name="subtitles_remove_bloat">Remove bloat from subtitles</string>
<string name="subtitles_filter_lang">Filter by preferred media language</string>
<string name="subtitles_group_unknown">Unknown</string>
<string name="extras">Extras</string>
<string name="trailer">Trailer</string>
<string name="network_adress_example">https://example.com/example.mp4</string>
Expand Down