Add preferences to configure audio codecs and 4k transcoding/direct play #3110

t0mas · 2023-10-09T11:40:12Z

Allow users to select which audio codecs to direct play, and in case of transcoding select the preferred codec to transcode into. Main use-case is for systems where the connected audio equipment fails to play some codecs. For example transcode Dolby TrueHD and DTS into AC3 or EAC3 if those are supported by the audio receiver or select AAC if more advanced formats are not supported.

Allow users to select whether 4k video streams can be accepted or not. Main example is the "Chromecast with Google TV" device, which in the old method will request 4k streams but is unable to play those (there exists a 4K version of the device). The new preference allows users to disable 4k if their player is not capable of playing it. The setting defaults to the same as the original behaviour (device detection).

I saw PR #3109 by @MichaelRUSF overlaps with this but only does AAC to DolbyDigital and not the other options.

Changes

Add user preferences to enable audio codecs
Add user preference to select transcode audio target
Add user preference to enable/disable 4k video
Changed ExoPlayerProfile to be based on the selected preferences

Issues
Fixes #2867, #2602, #2991 for audio and #2971, #2516 for video

…t setting)

t0mas · 2023-10-09T13:17:52Z

Looking at older issues, this also fixes #2432, #1765, #618

Could be useful to keep all those issue numbers together when either this PR or another solution is merged to close a lot of older ones.

nielsvanvelzen · 2023-10-09T19:27:17Z

I'm currently focusing on getting 0.16 out and bugfixes can still be merged but larger changes (especially those with string changes) are unfortunately going to wait for 0.17. This also means it will take some time before I'll review the pull request.

Additionally, my focus with 0.17 is to implement the new playback code for all video playback and completely removing the old implementation which will basically remove all changes from this PR again. The profiles will work quite differently in the rewrite (with fancy auto detection and such) so it won't be easy to port these changes over. Individual toggles for all codecs/formats are planned though.

SplitMilky · 2023-10-24T19:59:50Z

I think #520 would be fixed as well.

nielsvanvelzen

Sorry for the long wait. I've done an initial review on the changes and got some small comments.

nielsvanvelzen · 2024-01-20T16:14:29Z

app/src/main/java/org/jellyfin/androidtv/preference/UserPreferences.kt

+		/**
+		 * Enable 4k codecs for direct play and transcode target
+		 */
+		var enable4kSupport = booleanPreference("pref_enable_4k_support", DeviceUtils.has4kVideoSupport())


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)

nielsvanvelzen · 2024-01-20T16:17:33Z

app/src/main/java/org/jellyfin/androidtv/preference/UserPreferences.kt

+		/**
+		 * Enable TrueUD
+		 */
+		var thdEnabled = booleanPreference("pref_bitstream_thd", false)


I don't think we should shorten this to thd, doesn't seem like an "official" abbreviation.

nielsvanvelzen · 2024-01-20T16:21:36Z

app/src/main/java/org/jellyfin/androidtv/util/profile/ExoPlayerProfile.kt

+	audioDirectPlayCodecs : Array<String>,
+	audioTranscodeTarget : Array<String>,
+	enable4KSupport : Boolean


This is not correctly formatted.

Suggested change

audioDirectPlayCodecs : Array<String>,

audioTranscodeTarget : Array<String>,

enable4KSupport : Boolean

audioDirectPlayCodecs: Array<String>,

audioTranscodeTarget: Array<String>,

enable4KSupport: Boolean

nielsvanvelzen · 2024-01-20T16:22:12Z

app/src/main/res/values/strings.xml

@@ -175,8 +177,18 @@
    <string name="msg_item_added">" item added"</string>
    <string name="desc_automatic_fav_songs">Automatic playlist of favorite songs</string>
    <string name="lbl_new_premieres">New premieres</string>
-    <string name="lbl_bitstream_ac3">Bitstream Dolby Digital audio</string>
-    <string name="desc_bitstream_ac3">Requires capable hardware</string>
+    <string name="pref_audio_directplay">Direct Play Audio Codecs</string>


Suggested change

<string name="pref_audio_directplay">Direct Play Audio Codecs</string>

<string name="pref_audio_directplay">Direct play audio codecs</string>

nielsvanvelzen · 2024-01-20T16:24:01Z

app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java

+            case AUTO:
+                String[] directPlayCodecs = getDirectPlayPreferences();
+                // If any codecs are enabled, return those
+                if(directPlayCodecs.length > 0) return directPlayCodecs;


Suggested change

if(directPlayCodecs.length > 0) return directPlayCodecs;

if (directPlayCodecs.length > 0) return directPlayCodecs;

nielsvanvelzen · 2024-01-20T16:27:46Z

app/src/main/java/org/jellyfin/androidtv/ui/preference/screen/PlaybackPreferencesScreen.kt

+		category {
+			setTitle(R.string.pref_audio_directplay)


I think it would be better if add a new preference screen for this category. You can look at UserPreferencesScreen to see how to link to one.

zkhcohen · 2024-01-21T07:11:06Z

This is a great addition to Jellyfin's config.

It would also serve as a workaround for: #3227

PriceChild · 2024-01-22T19:28:58Z

This is awesome. I have a 1st gen fire TV and this makes it very easy to disable aac. Audio is being transcoded to my preferred format using the debug build I built myself from this branch.

Unfortunately (and identical to one of the other branches solution) although I get perfect 5.1 audio, the video takes seconds per frame, skipping.

Using the debug build, with aac disabled, If I check the server dashboard when playing a specific file, I see under reasons for transcode is that both audio and video are not supported by the player.

Using the debug build, with aac enabled, I get perfect video and stereo audio. The server dashboard explaining it is transcoding for video.

If I use the fire TV store's release build, I see under reasons for transcode only video being the reason.

So the server is transcoding in both cases, about 80fps reported by the server.

Is there any more troubleshooting I can provide to understand why taking advantage of this change helps, but also regresses my device's performance?

anym001 · 2024-02-02T07:52:02Z

Where can I find these settings for audio codec directplay?

PriceChild · 2024-02-02T16:32:13Z

@anym001 This isn't in a released build. Have you installed a build based on this branch?

anym001 · 2024-02-02T16:34:43Z

@PriceChild Oh okay, I wasn't aware of that. I am currently on the stable release.

Is it already foreseeable when this build will be released?

nielsvanvelzen · 2024-02-03T11:52:29Z

Is it already foreseeable when this build will be released?

The pull request is currently waiting on @t0mas to update it so I can re-review and potentially merge. It will then be included in 0.17 (no ETA). If no activity happens the pull request will eventually be closed as stale.

t0mas · 2024-02-04T07:40:01Z

@nielsvanvelzen Ok, thanks for reviewing! I'll look into the separate screen option. Quite busy at the moment so it may take a while.

t0mas · 2024-02-04T07:44:00Z

@PriceChild:

Is there any more troubleshooting I can provide to understand why taking advantage of this change helps, but also regresses my device's performance?

This branch also adds a setting to enable and disable 4k video playback. The Fire stick is one of the devices that is explicitly listed in the original code to disable 4k playback, because it doesn't have enough performance to play it. Did you test with a 1080p video or with a 4k one?

MichaelRUSF · 2024-02-04T16:14:31Z

app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java

+        }
+
+        if(userPreferences.getValue().get(UserPreferences.Companion.getDtsEnabled())) {
+            codecs.add(Codec.Audio.DTS);


Suggested change

codecs.add(Codec.Audio.DTS);

codecs.add(Codec.Audio.DCA);

codecs.add(Codec.Audio.DTS);

MichaelRUSF · 2024-02-04T16:46:51Z

app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java

+            case AAC:
+                return new String[] { Codec.Audio.AAC, Codec.Audio.AAC_LATM };
+            case DTS:
+                return new String[]{ Codec.Audio.DTS };


Suggested change

return new String[]{ Codec.Audio.DTS };

return new String[]{ Codec.Audio.DCA, Codec.Audio.DTS};

MichaelRUSF · 2024-02-04T16:52:25Z

app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java

+            case DTS:
+                return new String[]{ Codec.Audio.DTS };
+            case PCM:
+                return new String[]{ Codec.Audio.PCM_ALAW, Codec.Audio.PCM_MULAW };


When trying to transcode to DTS or PCM (original files in an MKV container), the server sends an incompatible file container message and remuxes the file with the original audio and video. I would consider removing these as transcoding options.

MichaelRUSF · 2024-02-04T17:03:27Z

app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java

+            codecs.add(Codec.Audio.OPUS);
+            codecs.add(Codec.Audio.FLAC);


Since you’re adding a new panel and there are only two other codecs, I would add them as separate options.

MichaelRUSF · 2024-02-04T17:12:25Z

app/src/main/java/org/jellyfin/androidtv/ui/preference/screen/PlaybackPreferencesScreen.kt

+			checkbox {
+				setTitle(R.string.lbl_codec_other)
+				setContent(R.string.desc_bitstream_generic)
+				bind(userPreferences, UserPreferences.otherAudioEnabled)


As commented above, I think it makes sense to split out OPUS and FLAC as separate options.

MichaelRUSF · 2024-02-04T19:58:20Z

app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java

+        }
+
+        if(userPreferences.getValue().get(UserPreferences.Companion.getThdEnabled())) {
+            codecs.add(Codec.Audio.TRUEHD);


Suggested change

codecs.add(Codec.Audio.TRUEHD);

codecs.add(Codec.Audio.MLP);

codecs.add(Codec.Audio.TRUEHD);

MichaelRUSF · 2024-02-04T19:58:57Z

app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java

+            codecs.add(Codec.Audio.DCA);
+            codecs.add(Codec.Audio.MLP);


Suggested change

codecs.add(Codec.Audio.DCA);

codecs.add(Codec.Audio.MLP);

cgernert · 2024-02-20T16:14:19Z

I have a Sony (Google) TV and am also trying to solve "AAC Plays as Stereo" #2602

I have built
https://github.com/t0mas/jellyfin-androidtv/tree/transcode-preferences
and it does not work despite trying different configurations: Transcoding to PCM, DD, DTS. AAC checked and unchecked as supported format. I got 2.0 or 2.1 PCM (depending on TV audio settings) from the 5.1 AAC stream. No transcoding.

On the other hand, I built
https://github.com/MichaelRUSF/jellyfin-androidtv/tree/master
and it works. I get 5.1 PCM from the 5.1 AAC stream.

I do not know if this behavior is intended or not. I hope an effective fix will be included in the official release soon.

nielsvanvelzen · 2024-02-20T17:59:07Z

I have built t0mas/jellyfin-androidtv@transcode-preferences and it does not work despite trying different configurations: Transcoding to PCM, DD, DTS. AAC checked and unchecked as supported format. I got 2.0 or 2.1 PCM (depending on TV audio settings) from the 5.1 AAC stream. No transcoding.

On the other hand, I built MichaelRUSF/jellyfin-androidtv@master and it works. I get 5.1 PCM from the 5.1 AAC stream.

You're comparing a pull request that is almost 300 commits behind with a fork that is only 11 behind. Not sure what you're getting at.

SplitMilky · 2024-02-21T00:36:53Z

So what are we waiting on here? For nielsvanvelzen comments to be incorporated in? Can i do this directly or do I have to make a fork of this fork to add suggested comment changes?

cgernert · 2024-02-21T07:59:26Z

You're comparing a pull request that is almost 300 commits behind with a fork that is only 11 behind. Not sure what you're getting at.

So the code that was recently (2 weeks ago) reviewed by MichaelRUSF on https://github.com/jellyfin/jellyfin-androidtv/pull/3110/files/7e36ca6af03d11c4f1dc93bf4e97ccf3c435d2b5 is just the settings in the UI?
I just wonder why this code was recently reviewed, resulting in an incomplete(?) fix for the issue.

cgernert · 2024-02-21T08:01:22Z

So what are we waiting on here? For nielsvanvelzen comments to be incorporated in? Can i do this directly or do I have to make a fork of this fork to add suggested comment changes?

I just built MichaelRUSF's master branch.

nielsvanvelzen · 2024-04-14T08:05:50Z

@t0mas have you been able to look at this PR again?

dandud100 · 2024-04-19T14:30:00Z

@t0mas have you been able to look at this PR again?

It's been a week without a reply from @t0mas, and I'd like to inquire about the status of this PR. Could someone else possibly take over to finalize it, or could you provide an update on how we'll proceed from here?

nielsvanvelzen · 2024-04-19T19:45:44Z

If the pull request becomes stale (e.g. author is unresponsive/unwilling to continue with the PR) it will eventually be closed. Someone else can of course take over (with permission from the author).

t0mas · 2024-04-23T18:57:04Z

@dandud100 I unfortunately don't have time at the moment, but of course no objections if someone else wants to make the required changes.

dandud100 · 2024-04-27T15:23:52Z

Someone else can of course take over (with permission from the author).

t0mas don't have time at this moment but replied here to give the permission for someone to take over.

@MichaelRUSF are you able to continue this pr?

t0mas added 2 commits October 9, 2023 13:44

Add preferences to select audio codecs for direct play

81513d2

Make 4k support configurable (using old device based method as defaul…

7e36ca6

…t setting)

t0mas force-pushed the transcode-preferences branch from 97f206d to 7e36ca6 Compare October 9, 2023 11:44

saxobroko approved these changes Nov 27, 2023

View reviewed changes

BobbyWibowo mentioned this pull request Dec 15, 2023

Feature to force transcode. #3122

Open

nielsvanvelzen mentioned this pull request Jan 20, 2024

Add option to transcode AAC to AC3 #3109

Closed

nielsvanvelzen requested changes Jan 20, 2024

View reviewed changes

nielsvanvelzen added the enhancement New feature or request label Jan 20, 2024

jellyfin-bot added the merge conflict Conflicts prevent merging label Jan 21, 2024

PriceChild mentioned this pull request Jan 27, 2024

AAC Plays as Stereo #2602

Open

MichaelRUSF reviewed Feb 4, 2024

View reviewed changes

puerto-rico mentioned this pull request Feb 13, 2024

Issues playing content, specific to Apple TV HD. jellyfin/Swiftfin#972

Open

tlambertz mentioned this pull request Mar 16, 2024

Chromecast HD cannot play 4k HEVC, but chooses direct-play anyways #3451

Open

	<string name="pref_audio_directplay">Direct Play Audio Codecs</string>
	<string name="pref_audio_directplay">Direct play audio codecs</string>

	if(directPlayCodecs.length > 0) return directPlayCodecs;
	if (directPlayCodecs.length > 0) return directPlayCodecs;

	codecs.add(Codec.Audio.DTS);
	codecs.add(Codec.Audio.DCA);
	codecs.add(Codec.Audio.DTS);

	return new String[]{ Codec.Audio.DTS };
	return new String[]{ Codec.Audio.DCA, Codec.Audio.DTS};

	codecs.add(Codec.Audio.TRUEHD);
	codecs.add(Codec.Audio.MLP);
	codecs.add(Codec.Audio.TRUEHD);

Add preferences to configure audio codecs and 4k transcoding/direct play #3110

Are you sure you want to change the base?

Add preferences to configure audio codecs and 4k transcoding/direct play #3110

Conversation

t0mas commented Oct 9, 2023

t0mas commented Oct 9, 2023

nielsvanvelzen commented Oct 9, 2023

SplitMilky commented Oct 24, 2023

nielsvanvelzen left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zkhcohen commented Jan 21, 2024

PriceChild commented Jan 22, 2024

anym001 commented Feb 2, 2024

PriceChild commented Feb 2, 2024

anym001 commented Feb 2, 2024 • edited

nielsvanvelzen commented Feb 3, 2024

t0mas commented Feb 4, 2024

t0mas commented Feb 4, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cgernert commented Feb 20, 2024 • edited

nielsvanvelzen commented Feb 20, 2024

SplitMilky commented Feb 21, 2024

cgernert commented Feb 21, 2024

cgernert commented Feb 21, 2024

nielsvanvelzen commented Apr 14, 2024

dandud100 commented Apr 19, 2024

nielsvanvelzen commented Apr 19, 2024

t0mas commented Apr 23, 2024

dandud100 commented Apr 27, 2024 • edited

anym001 commented Feb 2, 2024 •

edited

t0mas commented Feb 4, 2024 •

edited

cgernert commented Feb 20, 2024 •

edited

dandud100 commented Apr 27, 2024 •

edited