Add preferences to configure audio codecs and 4k transcoding/direct play #3110
There are no files selected for viewing
This file contains 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 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,23 @@ | ||
| package org.jellyfin.androidtv.preference.constant | ||
|
|
||
| import org.jellyfin.androidtv.R | ||
| import org.jellyfin.preference.PreferenceEnum | ||
|
|
||
| enum class AudioTranscodeTarget( | ||
| override val nameRes: Int, | ||
| ) : PreferenceEnum { | ||
| /** | ||
| * Enable all codecs | ||
| */ | ||
| AUTO(R.string.lbl_audiotarget_auto), | ||
|
|
||
| PCM(R.string.lbl_codec_pcm), | ||
|
|
||
| AAC(R.string.lbl_codec_aac), | ||
|
|
||
| AC3(R.string.lbl_codec_ac3), | ||
|
|
||
| EAC3(R.string.lbl_codec_eac3), | ||
|
|
||
| DTS(R.string.lbl_codec_dts) | ||
| } |
This file contains 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 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 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 |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ import org.jellyfin.androidtv.R | |
| import org.jellyfin.androidtv.constant.getQualityProfiles | ||
| import org.jellyfin.androidtv.preference.UserPreferences | ||
| import org.jellyfin.androidtv.preference.constant.AudioBehavior | ||
| import org.jellyfin.androidtv.preference.constant.AudioTranscodeTarget | ||
| import org.jellyfin.androidtv.preference.constant.NEXTUP_TIMER_DISABLED | ||
| import org.jellyfin.androidtv.preference.constant.NextUpBehavior | ||
| import org.jellyfin.androidtv.preference.constant.PreferredVideoPlayer | ||
|
|
@@ -107,6 +108,12 @@ class PlaybackPreferencesScreen : OptionsFragment() { | |
| bind(userPreferences, UserPreferences.refreshRateSwitchingBehavior) | ||
| depends { DeviceUtils.is60() && userPreferences[UserPreferences.videoPlayer] != PreferredVideoPlayer.EXTERNAL } | ||
| } | ||
|
|
||
| checkbox { | ||
| setTitle(R.string.pref_enable_4k_support) | ||
| setContent(R.string.pref_enable_4k_support_description) | ||
| bind(userPreferences, UserPreferences.enable4kSupport) | ||
| } | ||
| } | ||
|
|
||
| category { | ||
|
|
@@ -171,27 +178,19 @@ class PlaybackPreferencesScreen : OptionsFragment() { | |
| depends { userPreferences[UserPreferences.videoPlayer] != PreferredVideoPlayer.EXTERNAL } | ||
| } | ||
|
|
||
| enum<AudioTranscodeTarget> { | ||
| setTitle(R.string.pref_audio_transcodetarget) | ||
| bind(userPreferences, UserPreferences.audioTranscodeTarget) | ||
| depends { userPreferences[UserPreferences.videoPlayer] != PreferredVideoPlayer.EXTERNAL } | ||
| } | ||
|
|
||
| checkbox { | ||
| setTitle(R.string.pref_audio_night_mode) | ||
| setContent(R.string.desc_audio_night_mode) | ||
| bind(userPreferences, UserPreferences.audioNightMode) | ||
| depends { Build.VERSION.SDK_INT >= Build.VERSION_CODES.P } | ||
| } | ||
|
|
||
| @Suppress("MagicNumber") | ||
| seekbar { | ||
| setTitle(R.string.pref_libvlc_audio_delay_title) | ||
|
|
@@ -204,6 +203,66 @@ class PlaybackPreferencesScreen : OptionsFragment() { | |
| } | ||
| } | ||
|
|
||
| category { | ||
| setTitle(R.string.pref_audio_directplay) | ||
|
Comment on lines
+206
to
+207
There was a problem hiding this comment. I think it would be better if add a new preference screen for this category. You can look at |
||
|
|
||
| checkbox { | ||
| setTitle(R.string.lbl_codec_mpeg) | ||
| setContent(R.string.desc_bitstream_generic) | ||
| bind(userPreferences, UserPreferences.mpegEnabled) | ||
| depends { userPreferences[UserPreferences.videoPlayer] != PreferredVideoPlayer.EXTERNAL } | ||
| } | ||
|
|
||
| checkbox { | ||
| setTitle(R.string.lbl_codec_pcm) | ||
| setContent(R.string.desc_bitstream_generic) | ||
| bind(userPreferences, UserPreferences.pcmEnabled) | ||
| depends { userPreferences[UserPreferences.videoPlayer] != PreferredVideoPlayer.EXTERNAL } | ||
| } | ||
|
|
||
| checkbox { | ||
| setTitle(R.string.lbl_codec_aac) | ||
| setContent(R.string.desc_bitstream_generic) | ||
| bind(userPreferences, UserPreferences.aacEnabled) | ||
| depends { userPreferences[UserPreferences.videoPlayer] != PreferredVideoPlayer.EXTERNAL } | ||
| } | ||
|
|
||
| checkbox { | ||
| setTitle(R.string.lbl_codec_dts) | ||
| setContent(R.string.desc_bitstream_generic) | ||
| bind(userPreferences, UserPreferences.dtsEnabled) | ||
| depends { userPreferences[UserPreferences.videoPlayer] != PreferredVideoPlayer.EXTERNAL } | ||
| } | ||
|
|
||
| checkbox { | ||
| setTitle(R.string.lbl_codec_ac3) | ||
| setContent(R.string.desc_bitstream_generic) | ||
| bind(userPreferences, UserPreferences.ac3Enabled) | ||
| depends { userPreferences[UserPreferences.videoPlayer] != PreferredVideoPlayer.EXTERNAL } | ||
| } | ||
|
|
||
| checkbox { | ||
| setTitle(R.string.lbl_codec_eac3) | ||
| setContent(R.string.desc_bitstream_generic) | ||
| bind(userPreferences, UserPreferences.eac3Enabled) | ||
| depends { userPreferences[UserPreferences.videoPlayer] != PreferredVideoPlayer.EXTERNAL } | ||
| } | ||
|
|
||
| checkbox { | ||
| setTitle(R.string.lbl_codec_thd) | ||
| setContent(R.string.desc_bitstream_generic) | ||
| bind(userPreferences, UserPreferences.thdEnabled) | ||
| depends { userPreferences[UserPreferences.videoPlayer] != PreferredVideoPlayer.EXTERNAL } | ||
| } | ||
|
|
||
| checkbox { | ||
| setTitle(R.string.lbl_codec_other) | ||
| setContent(R.string.desc_bitstream_generic) | ||
| bind(userPreferences, UserPreferences.otherAudioEnabled) | ||
|
There was a problem hiding this comment. As commented above, I think it makes sense to split out OPUS and FLAC as separate options. |
||
| depends { userPreferences[UserPreferences.videoPlayer] != PreferredVideoPlayer.EXTERNAL } | ||
| } | ||
| } | ||
|
|
||
| category { | ||
| setTitle(R.string.pref_music_cat) | ||
|
|
||
|
|
||
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.
Preference keys should not start with
pref_. This is only used on old keys for compatibility reasons (creating a migration just for a rename of the key is kinda pointless)