mirror of
https://github.com/aniyomiorg/aniyomi.git
synced 2024-11-29 09:39:03 +03:00
feat(player): Add video filters (#1698)
This commit is contained in:
Abdallah
GitHub
parent
c85006ac58
commit
60c671aa27
5 changed files with 116 additions and 3 deletions
|
|
@ -63,6 +63,7 @@ import eu.kanade.tachiyomi.ui.player.settings.sheets.ScreenshotOptionsSheet
|
|||
import eu.kanade.tachiyomi.ui.player.settings.sheets.StreamsCatalogSheet
|
||||
import eu.kanade.tachiyomi.ui.player.settings.sheets.VideoChaptersSheet
|
||||
import eu.kanade.tachiyomi.ui.player.settings.sheets.subtitle.SubtitleSettingsSheet
|
||||
import eu.kanade.tachiyomi.ui.player.settings.sheets.subtitle.VideoFilters
|
||||
import eu.kanade.tachiyomi.ui.player.settings.sheets.subtitle.toHexString
|
||||
import eu.kanade.tachiyomi.ui.player.viewer.ACTION_MEDIA_CONTROL
|
||||
import eu.kanade.tachiyomi.ui.player.viewer.AspectState
|
||||
|
|
@ -635,12 +636,20 @@ class PlayerActivity : BaseActivity() {
|
|||
)
|
||||
}
|
||||
|
||||
setVideoFilters()
|
||||
|
||||
MPVLib.setOptionString("input-default-bindings", "yes")
|
||||
|
||||
MPVLib.addLogObserver(playerObserver)
|
||||
player.addObserver(playerObserver)
|
||||
}
|
||||
|
||||
private fun setVideoFilters() {
|
||||
VideoFilters.entries.forEach {
|
||||
MPVLib.setPropertyInt(it.mpvProperty, it.preference(playerPreferences).get())
|
||||
}
|
||||
}
|
||||
|
||||
private fun setupPlayerAudio() {
|
||||
with(playerPreferences) {
|
||||
audioManager = getSystemService(Context.AUDIO_SERVICE) as AudioManager
|
||||
|
|
|
|||
|
|
@ -121,4 +121,10 @@ class PlayerPreferences(
|
|||
fun backgroundColorSubtitles() = preferenceStore.getInt("pref_background_color_subtitles", 0)
|
||||
|
||||
fun mpvScripts() = preferenceStore.getBoolean("mpv_scripts", false)
|
||||
|
||||
fun brightnessFilter() = preferenceStore.getInt("pref_player_filter_brightness")
|
||||
fun saturationFilter() = preferenceStore.getInt("pref_player_filter_saturation")
|
||||
fun contrastFilter() = preferenceStore.getInt("pref_player_filter_contrast")
|
||||
fun gammaFilter() = preferenceStore.getInt("pref_player_filter_gamma")
|
||||
fun hueFilter() = preferenceStore.getInt("pref_player_filter_hue")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ fun SubtitleSettingsSheet(
|
|||
TabbedDialog(
|
||||
onDismissRequest = onDismissRequest,
|
||||
tabTitles = persistentListOf(
|
||||
stringResource(MR.strings.player_subtitle_settings_filters),
|
||||
stringResource(MR.strings.player_subtitle_settings_delay_tab),
|
||||
stringResource(MR.strings.player_subtitle_settings_font_tab),
|
||||
stringResource(MR.strings.player_subtitle_settings_color_tab),
|
||||
|
|
@ -66,9 +67,10 @@ fun SubtitleSettingsSheet(
|
|||
.verticalScroll(rememberScrollState()),
|
||||
) {
|
||||
when (page) {
|
||||
0 -> StreamsDelayPage(screenModel)
|
||||
1 -> SubtitleFontPage(screenModel)
|
||||
2 -> SubtitleColorPage(screenModel)
|
||||
0 -> FiltersPage(screenModel)
|
||||
1 -> StreamsDelayPage(screenModel)
|
||||
2 -> SubtitleFontPage(screenModel)
|
||||
3 -> SubtitleColorPage(screenModel)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,89 @@
|
|||
package eu.kanade.tachiyomi.ui.player.settings.sheets.subtitle
|
||||
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.outlined.Info
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.unit.dp
|
||||
import dev.icerock.moko.resources.StringResource
|
||||
import eu.kanade.tachiyomi.ui.player.settings.PlayerPreferences
|
||||
import eu.kanade.tachiyomi.ui.player.settings.PlayerSettingsScreenModel
|
||||
import `is`.xyz.mpv.MPVLib
|
||||
import tachiyomi.core.common.preference.Preference
|
||||
import tachiyomi.i18n.MR
|
||||
import tachiyomi.presentation.core.components.SliderItem
|
||||
import tachiyomi.presentation.core.i18n.stringResource
|
||||
import tachiyomi.presentation.core.util.collectAsState
|
||||
|
||||
@Composable
|
||||
fun FiltersPage(
|
||||
screenModel: PlayerSettingsScreenModel,
|
||||
modifier: Modifier = Modifier,
|
||||
) {
|
||||
if (!screenModel.preferences.gpuNext().get()) {
|
||||
Row(
|
||||
modifier = Modifier.padding(16.dp),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(16.dp),
|
||||
) {
|
||||
Icon(Icons.Outlined.Info, null)
|
||||
Text(stringResource(MR.strings.player_filters_warning))
|
||||
}
|
||||
}
|
||||
Column(modifier) {
|
||||
VideoFilters.entries.forEach { filter ->
|
||||
val value by filter.preference(screenModel.preferences).collectAsState()
|
||||
SliderItem(
|
||||
label = stringResource(filter.title),
|
||||
value = value,
|
||||
valueText = value.toString(),
|
||||
onChange = {
|
||||
filter.preference(screenModel.preferences).set(it)
|
||||
MPVLib.setPropertyInt(filter.mpvProperty, it)
|
||||
},
|
||||
max = 100,
|
||||
min = -100,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
enum class VideoFilters(
|
||||
val title: StringResource,
|
||||
val preference: (PlayerPreferences) -> Preference<Int>,
|
||||
val mpvProperty: String,
|
||||
) {
|
||||
BRIGHTNESS(
|
||||
MR.strings.player_filters_brightness,
|
||||
{ it.brightnessFilter() },
|
||||
"brightness",
|
||||
),
|
||||
SATURATION(
|
||||
MR.strings.player_filters_saturation,
|
||||
{ it.saturationFilter() },
|
||||
"saturation",
|
||||
),
|
||||
CONTRAST(
|
||||
MR.strings.player_filters_contrast,
|
||||
{ it.contrastFilter() },
|
||||
"contrast",
|
||||
),
|
||||
GAMMA(
|
||||
MR.strings.player_filters_gamma,
|
||||
{ it.gammaFilter() },
|
||||
"gamma",
|
||||
),
|
||||
HUE(
|
||||
MR.strings.player_filters_hue,
|
||||
{ it.hueFilter() },
|
||||
"hue",
|
||||
),
|
||||
}
|
||||
|
|
@ -1108,9 +1108,16 @@
|
|||
<string name="pref_category_hide_hidden">Hide hidden categories from categories and storage screen</string>
|
||||
<string name="pref_update_anime_release_grace_period">Expected anime release grace period</string>
|
||||
<string name="player_subtitle_settings_example">Lorem ipsum dolor sit amet.</string>
|
||||
<string name="player_subtitle_settings_filters">Filters</string>
|
||||
<string name="player_subtitle_settings_delay_tab">Delay</string>
|
||||
<string name="player_subtitle_settings_font_tab">Font</string>
|
||||
<string name="player_subtitle_settings_color_tab">Color</string>
|
||||
<string name="player_filters_brightness">Brightness</string>
|
||||
<string name="player_filters_saturation">Saturation</string>
|
||||
<string name="player_filters_contrast">Contrast</string>
|
||||
<string name="player_filters_gamma">Gamma</string>
|
||||
<string name="player_filters_hue">Hue</string>
|
||||
<string name="player_filters_warning">Some filters may not work your current video driver</string>
|
||||
<string name="player_subtitle_settings">Subtitle settings</string>
|
||||
<string name="player_add_external_audio">Add external audio</string>
|
||||
<string name="player_add_external_audio_intent">Select an audio file.</string>
|
||||
|
|
|
|||
Loading…
Reference in a new issue