🎨 控制跳过同一VSync渲染多帧

yaoxieyoulei · yaoxieyoulei · commit 327c3fc58679 · 2024-12-07T12:19:54.000+08:00
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -22,8 +22,8 @@ compose-foundation = "1.7.0-beta07"
 tvMaterial = "1.0.0-rc01"
 navigationCompose = "2.7.7"
 minSdk = "21"
-targetSdk = "34"
-compileSdk = "34"
+targetSdk = "35"
+compileSdk = "35"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -26,3 +26,9 @@ include(":core:util")
 include(":core:designsystem")
 include(":tv")
 include(":mobile")
+
+val mediaSettingsFile = file("../media/core_settings.gradle")
+if (mediaSettingsFile.exists()) {
+    (gradle as ExtensionAware).extra["androidxMediaModulePrefix"] = "media3:"
+    apply(from = mediaSettingsFile)
+}
diff --git a/tv/build.gradle.kts b/tv/build.gradle.kts
@@ -87,9 +87,16 @@ dependencies {
     implementation(libs.androidx.material.icons.extended)
 
     // 播放器
-    implementation(libs.androidx.media3.exoplayer)
-    implementation(libs.androidx.media3.exoplayer.hls)
-    implementation(libs.androidx.media3.exoplayer.rtsp)
+    val mediaSettingsFile = file("../../media/core_settings.gradle")
+    if (mediaSettingsFile.exists()) {
+        implementation(project(":media3:lib-exoplayer"))
+        implementation(project(":media3:lib-exoplayer-hls"))
+        implementation(project(":media3:lib-exoplayer-rtsp"))
+    } else {
+        implementation(libs.androidx.media3.exoplayer)
+        implementation(libs.androidx.media3.exoplayer.hls)
+        implementation(libs.androidx.media3.exoplayer.rtsp)
+    }
 
     // 二维码
     implementation(libs.qrose)
diff --git a/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/settings/SettingsViewModel.kt b/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/settings/SettingsViewModel.kt
@@ -344,6 +344,14 @@ class SettingsViewModel : ViewModel() {
             Configs.videoPlayerStopPreviousMediaItem = value
         }
 
+    private var _videoPlayerSkipMultipleFramesOnSameVSync by mutableStateOf(false)
+    var videoPlayerSkipMultipleFramesOnSameVSync: Boolean
+        get() = _videoPlayerSkipMultipleFramesOnSameVSync
+        set(value) {
+            _videoPlayerSkipMultipleFramesOnSameVSync = value
+            Configs.videoPlayerSkipMultipleFramesOnSameVSync = value
+        }
+
     init {
         // 删除过期的预约
         _epgChannelReserveList = EpgProgrammeReserveList(
@@ -394,5 +402,6 @@ class SettingsViewModel : ViewModel() {
         _videoPlayerAspectRatio = Configs.videoPlayerDisplayMode
         _videoPlayerForceAudioSoftDecode = Configs.videoPlayerForceAudioSoftDecode
         _videoPlayerRenderMode = Configs.videoPlayerRenderMode
+        _videoPlayerSkipMultipleFramesOnSameVSync = Configs.videoPlayerSkipMultipleFramesOnSameVSync
     }
 }
diff --git a/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/settings/components/SettingsCategoryAbout.kt b/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/settings/components/SettingsCategoryAbout.kt
@@ -49,7 +49,7 @@ fun SettingsCategoryAbout(
         item {
             SettingsListItem(
                 headlineContent = "应用版本",
-                trailingContent = packageInfo.versionName,
+                trailingContent = packageInfo.versionName ?: "",
             )
         }
 
diff --git a/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/settings/components/SettingsCategoryVideoPlayer.kt b/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/settings/components/SettingsCategoryVideoPlayer.kt
@@ -66,6 +66,19 @@ fun SettingsCategoryVideoPlayer(
             )
         }
 
+        item {
+            SettingsListItem(
+                headlineContent = "跳过多帧渲染",
+                trailingContent = {
+                    Switch(settingsViewModel.videoPlayerSkipMultipleFramesOnSameVSync, null)
+                },
+                onSelected = {
+                    settingsViewModel.videoPlayerSkipMultipleFramesOnSameVSync =
+                        !settingsViewModel.videoPlayerSkipMultipleFramesOnSameVSync
+                },
+            )
+        }
+
         item {
             val popupManager = LocalPopupManager.current
             var visible by remember { mutableStateOf(false) }
diff --git a/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/update/UpdateScreen.kt b/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/update/UpdateScreen.kt
@@ -42,7 +42,10 @@ fun UpdateScreen(
 
     LaunchedEffect(Unit) {
         delay(3000)
-        updateViewModel.checkUpdate(packageInfo.versionName, settingsViewModel.updateChannel)
+        updateViewModel.checkUpdate(
+            packageInfo.versionName ?: "0.0.0",
+            settingsViewModel.updateChannel
+        )
 
         val latestRelease = updateViewModel.latestRelease
         if (
diff --git a/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/videoplayer/player/Media3VideoPlayer.kt b/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/videoplayer/player/Media3VideoPlayer.kt
@@ -23,6 +23,7 @@ import androidx.media3.exoplayer.rtsp.RtspMediaSource
 import androidx.media3.exoplayer.source.MediaSource
 import androidx.media3.exoplayer.source.ProgressiveMediaSource
 import androidx.media3.exoplayer.util.EventLogger
+import androidx.media3.exoplayer.video.MediaCodecVideoRenderer
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
@@ -65,6 +66,9 @@ class Media3VideoPlayer(
                 else DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON
             )
 
+
+        MediaCodecVideoRenderer.skipMultipleFramesOnSameVsync =
+            Configs.videoPlayerSkipMultipleFramesOnSameVSync
         return ExoPlayer
             .Builder(context)
             .setRenderersFactory(renderersFactory)
diff --git a/tv/src/main/java/top/yogiczy/mytv/tv/ui/utils/Configs.kt b/tv/src/main/java/top/yogiczy/mytv/tv/ui/utils/Configs.kt
@@ -145,6 +145,9 @@ object Configs {
 
         /** 播放器 停止上一媒体项 */
         VIDEO_PLAYER_STOP_PREVIOUS_MEDIA_ITEM,
+
+        /** 播放器 跳过同一VSync渲染多帧 */
+        VIDEO_PLAYER_SKIP_MULTIPLE_FRAMES_ON_SAME_VSYNC,
     }
 
     /** ==================== 应用 ==================== */
@@ -365,7 +368,7 @@ object Configs {
 
     /** 播放器 强制音频软解 */
     var videoPlayerForceAudioSoftDecode: Boolean
-        get() = SP.getBoolean(KEY.VIDEO_PLAYER_FORCE_AUDIO_SOFT_DECODE.name, true)
+        get() = SP.getBoolean(KEY.VIDEO_PLAYER_FORCE_AUDIO_SOFT_DECODE.name, false)
         set(value) = SP.putBoolean(KEY.VIDEO_PLAYER_FORCE_AUDIO_SOFT_DECODE.name, value)
 
     /** 播放器 渲染方式 */
@@ -377,9 +380,14 @@ object Configs {
 
     /** 播放器 停止上一媒体项 */
     var videoPlayerStopPreviousMediaItem: Boolean
-        get() = SP.getBoolean(KEY.VIDEO_PLAYER_STOP_PREVIOUS_MEDIA_ITEM.name, false)
+        get() = SP.getBoolean(KEY.VIDEO_PLAYER_STOP_PREVIOUS_MEDIA_ITEM.name, true)
         set(value) = SP.putBoolean(KEY.VIDEO_PLAYER_STOP_PREVIOUS_MEDIA_ITEM.name, value)
 
+    /** 播放器 跳过同一VSync渲染多帧 */
+    var videoPlayerSkipMultipleFramesOnSameVSync: Boolean
+        get() = SP.getBoolean(KEY.VIDEO_PLAYER_SKIP_MULTIPLE_FRAMES_ON_SAME_VSYNC.name, false)
+        set(value) = SP.putBoolean(KEY.VIDEO_PLAYER_SKIP_MULTIPLE_FRAMES_ON_SAME_VSYNC.name, value)
+
     enum class UiTimeShowMode(val value: Int) {
         /** 隐藏 */
         HIDDEN(0),

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ fun SettingsCategoryAbout(`
`49`	`49`	`item {`
`50`	`50`	`SettingsListItem(`
`51`	`51`	`headlineContent = "应用版本",`
`52`		`- trailingContent = packageInfo.versionName,`
	`52`	`+ trailingContent = packageInfo.versionName ?: "",`
`53`	`53`	`)`
`54`	`54`	`}`
`55`	`55`