From a16f910ee39d76bdf6a8aaddc7c5fa08299fd6f3 Mon Sep 17 00:00:00 2001
From: jarnedemeulemeester <jarnedemeulemeester@gmail.com>
Date: Tue, 23 Jan 2024 14:48:15 +0100
Subject: [PATCH] feat(mpv): default to `gpu-next` and `mediacodec` and use
 `fast` profile

---
 core/src/main/res/xml/fragment_settings_player.xml          | 2 +-
 .../src/main/java/dev/jdtech/jellyfin/mpv/MPVPlayer.kt      | 6 +++---
 .../src/main/java/dev/jdtech/jellyfin/AppPreferences.kt     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/main/res/xml/fragment_settings_player.xml b/core/src/main/res/xml/fragment_settings_player.xml
index fcc8aeb4..ac367054 100644
--- a/core/src/main/res/xml/fragment_settings_player.xml
+++ b/core/src/main/res/xml/fragment_settings_player.xml
@@ -19,7 +19,7 @@
             app:title="@string/pref_player_mpv_hwdec"
             app:useSimpleSummaryProvider="true" />
         <ListPreference
-            app:defaultValue="gpu"
+            app:defaultValue="gpu-next"
             app:dependency="pref_player_mpv"
             app:entries="@array/mpv_vos"
             app:entryValues="@array/mpv_vos"
diff --git a/player/video/src/main/java/dev/jdtech/jellyfin/mpv/MPVPlayer.kt b/player/video/src/main/java/dev/jdtech/jellyfin/mpv/MPVPlayer.kt
index 6efbc2ee..6fb7a402 100644
--- a/player/video/src/main/java/dev/jdtech/jellyfin/mpv/MPVPlayer.kt
+++ b/player/video/src/main/java/dev/jdtech/jellyfin/mpv/MPVPlayer.kt
@@ -50,7 +50,7 @@ class MPVPlayer(
     private var trackSelectionParameters: TrackSelectionParameters = TrackSelectionParameters.Builder(context).build(),
     private val seekBackIncrement: Long = C.DEFAULT_SEEK_BACK_INCREMENT_MS,
     private val seekForwardIncrement: Long = C.DEFAULT_SEEK_FORWARD_INCREMENT_MS,
-    videoOutput: String = "gpu",
+    videoOutput: String = "gpu-next",
     audioOutput: String = "audiotrack",
     hwDec: String = "mediacodec",
 ) : BasePlayer(), MPVLib.EventObserver, AudioManager.OnAudioFocusChangeListener {
@@ -77,9 +77,11 @@ class MPVPlayer(
         // General
         MPVLib.setOptionString("config", "yes")
         MPVLib.setOptionString("config-dir", mpvDir.path)
+        MPVLib.setOptionString("profile", "fast")
         MPVLib.setOptionString("vo", videoOutput)
         MPVLib.setOptionString("ao", audioOutput)
         MPVLib.setOptionString("gpu-context", "android")
+        MPVLib.setOptionString("opengl-es", "yes")
 
         // Hardware video decoding
         MPVLib.setOptionString("hwdec", hwDec)
@@ -108,8 +110,6 @@ class MPVPlayer(
         MPVLib.setOptionString("save-position-on-quit", "no")
         MPVLib.setOptionString("sub-font-provider", "none")
         MPVLib.setOptionString("ytdl", "no")
-        // DR is known to ruin performance at least on Exynos devices, see mpv-android#508
-        MPVLib.setOptionString("vd-lavc-dr", "no")
 
         MPVLib.init()
 
diff --git a/preferences/src/main/java/dev/jdtech/jellyfin/AppPreferences.kt b/preferences/src/main/java/dev/jdtech/jellyfin/AppPreferences.kt
index 69905bb3..155b23fc 100644
--- a/preferences/src/main/java/dev/jdtech/jellyfin/AppPreferences.kt
+++ b/preferences/src/main/java/dev/jdtech/jellyfin/AppPreferences.kt
@@ -70,8 +70,8 @@ constructor(
         DEFAULT_SEEK_FORWARD_INCREMENT_MS.toString(),
     )!!.toLongOrNull() ?: DEFAULT_SEEK_FORWARD_INCREMENT_MS
     val playerMpv get() = sharedPreferences.getBoolean(Constants.PREF_PLAYER_MPV, false)
-    val playerMpvHwdec get() = sharedPreferences.getString(Constants.PREF_PLAYER_MPV_HWDEC, "mediacodec-copy")!!
-    val playerMpvVo get() = sharedPreferences.getString(Constants.PREF_PLAYER_MPV_VO, "gpu")!!
+    val playerMpvHwdec get() = sharedPreferences.getString(Constants.PREF_PLAYER_MPV_HWDEC, "mediacodec")!!
+    val playerMpvVo get() = sharedPreferences.getString(Constants.PREF_PLAYER_MPV_VO, "gpu-next")!!
     val playerMpvAo get() = sharedPreferences.getString(Constants.PREF_PLAYER_MPV_AO, "audiotrack")!!
     val playerIntroSkipper get() = sharedPreferences.getBoolean(Constants.PREF_PLAYER_INTRO_SKIPPER, true)
     val playerTrickPlay get() = sharedPreferences.getBoolean(Constants.PREF_PLAYER_TRICK_PLAY, true)