Compare commits

...

2 Commits

Author SHA1 Message Date
Niels van Velzen
3d3fa76771 Remove experimental audio codecs from transcoding profile
(cherry picked from commit 3c70b8abf5)
2023-01-10 13:45:37 +01:00
Niels van Velzen
521183d427 Fix BrowseGridFragment focus not restoring when going back
(cherry picked from commit b5b87fb625)
2023-01-10 13:45:36 +01:00
2 changed files with 5 additions and 22 deletions

View File

@@ -188,27 +188,6 @@ public class BrowseGridFragment extends Fragment implements View.OnKeyListener {
// Hide the description because we don't have room for it
binding.npBug.showDescription(false);
// NOTE: we only get the 100% correct grid size if we render it once, so hook into it here
binding.rowsFragment.post(() -> {
if (binding.rowsFragment.getHeight() > 0 && binding.rowsFragment.getWidth() > 0) {
if (mGridView == null) {
return;
}
// prevent adaption on minor size delta's
if (Math.abs(mGridHeight - binding.rowsFragment.getHeight()) > MIN_GRIDSIZE_CHANGE_DELTA || Math.abs(mGridWidth - binding.rowsFragment.getWidth()) > MIN_GRIDSIZE_CHANGE_DELTA) {
mGridHeight = Math.round(binding.rowsFragment.getHeight() / getResources().getDisplayMetrics().density);
mGridWidth = Math.round(binding.rowsFragment.getWidth() / getResources().getDisplayMetrics().density);
Timber.d("Auto-Adapting grid size to height <%s> width <%s>", binding.rowsFragment.getHeight(), binding.rowsFragment.getWidth());
mDirty = true;
determiningPosterSize = true;
setAutoCardGridValues();
createGrid();
loadGrid();
determiningPosterSize = false;
}
}
});
return binding.getRoot();
}

View File

@@ -53,6 +53,10 @@ class ExoPlayerProfile(
add(Codec.Audio.PCM_MULAW)
}.toTypedArray()
private val allSupportedAudioCodecsWithoutFFmpegExperimental = allSupportedAudioCodecs
.filterNot { it == Codec.Audio.DCA || it == Codec.Audio.TRUEHD }
.toTypedArray()
init {
name = "AndroidTV-ExoPlayer"
@@ -68,7 +72,7 @@ class ExoPlayerProfile(
}.joinToString(",")
audioCodec = when {
Utils.downMixAudio(context) -> downmixSupportedAudioCodecs
else -> allSupportedAudioCodecs
else -> allSupportedAudioCodecsWithoutFFmpegExperimental
}.joinToString(",")
protocol = "hls"
copyTimestamps = false