Merge branch 'develop' into feature/mobile

aaa1115910 · aaa1115910 · commit 9ef3f363a8e1 · 2025-05-18T15:02:31.000+08:00
# Conflicts:
#	app/build.gradle.kts
#	buildSrc/src/main/kotlin/ProtobufConfiguration.kt
#	player/core/build.gradle.kts
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -158,6 +158,13 @@ android {
     }
 }
 
+composeCompiler {
+    reportsDestination = layout.buildDirectory.dir("compose_build_reports")
+    stabilityConfigurationFiles.addAll(
+        layout.projectDirectory.file("compose_compiler_config.conf")
+    )
+}
+
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(17))
diff --git a/app/compose_compiler_config.conf b/app/compose_compiler_config.conf
@@ -0,0 +1,6 @@
+kotlin.collections.*
+kotlin.time.Duration
+
+kotlinx.coroutines.CoroutineScope
+
+androidx.paging.compose.LazyPagingItems
diff --git a/app/shared/build.gradle.kts b/app/shared/build.gradle.kts
@@ -74,10 +74,10 @@ android {
     lint{
         targetSdk = AppConfiguration.targetSdk
     }
+}
 
-    ksp {
-        arg("room.schemaLocation", "$projectDir/schemas")
-    }
+ksp {
+    arg("room.schemaLocation", "$projectDir/schemas")
 }
 
 java {
diff --git a/app/shared/src/main/kotlin/dev/aaa1115910/bv/component/buttons/FavoriteButton.kt b/app/shared/src/main/kotlin/dev/aaa1115910/bv/component/buttons/FavoriteButton.kt
@@ -5,7 +5,11 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Done
 import androidx.compose.material.icons.rounded.Favorite
@@ -105,6 +109,10 @@ private fun FavoriteDialog(
             title = { Text(text = stringResource(R.string.favorite_dialog_title)) },
             text = {
                 FlowRow(
+                    modifier = Modifier
+                        .heightIn(max = 320.dp)
+                        .verticalScroll(rememberScrollState())
+                        .padding(vertical = 8.dp),
                     horizontalArrangement = Arrangement.spacedBy(8.dp),
                     verticalArrangement = Arrangement.spacedBy(8.dp)
                 ) {
diff --git a/app/shared/src/main/kotlin/dev/aaa1115910/bv/util/Prefs.kt b/app/shared/src/main/kotlin/dev/aaa1115910/bv/util/Prefs.kt
@@ -285,6 +285,17 @@ object Prefs {
             dsm.getPreferenceFlow(PrefKeys.prefDefaultDanmakuMaskRequest).first()
         }
         set(value) = runBlocking { dsm.editPreference(PrefKeys.prefDefaultDanmakuMask, value) }
+
+    var enableFfmpegAudioRenderer: Boolean
+        get() = runBlocking {
+            dsm.getPreferenceFlow(PrefKeys.prefEnableFfmpegEndererRequest).first()
+        }
+        set(value) = runBlocking {
+            dsm.editPreference(
+                PrefKeys.prefEnableFfmpegAudioRenderer,
+                value
+            )
+        }
 }
 
 object PrefKeys {
@@ -327,6 +338,7 @@ object PrefKeys {
     val prefShowedRemoteControllerPanelDemoKey = booleanPreferencesKey("showed_rcpd")
     val prefPreferOfficialCdn = booleanPreferencesKey("prefer_official_cdn")
     val prefDefaultDanmakuMask = booleanPreferencesKey("prefer_enable_webmark")
+    val prefEnableFfmpegAudioRenderer = booleanPreferencesKey("enable_ffmpeg_audio_renderer")
 
     val prefIsLoginRequest = PreferenceRequest(prefIsLoginKey, false)
     val prefUidRequest = PreferenceRequest(prefUidKey, 0)
@@ -377,4 +389,5 @@ object PrefKeys {
         PreferenceRequest(prefShowedRemoteControllerPanelDemoKey, false)
     val prefPreferOfficialCdnRequest = PreferenceRequest(prefPreferOfficialCdn, false)
     val prefDefaultDanmakuMaskRequest = PreferenceRequest(prefDefaultDanmakuMask, false)
+    val prefEnableFfmpegEndererRequest = PreferenceRequest(prefEnableFfmpegAudioRenderer, false)
 }
diff --git a/app/shared/src/main/res/values/strings.xml b/app/shared/src/main/res/values/strings.xml
@@ -210,6 +210,8 @@
     <string name="settings_other_alpha_title">Alpha 版更新</string>
     <string name="settings_other_cookies_text">该功能不适合使用遥控器操作</string>
     <string name="settings_other_cookies_title">Cookies 导入/导出</string>
+    <string name="settings_other_ffmpeg_audio_renderer_text">尝试使用 FFmpeg 播放硬解不兼容的音频</string>
+    <string name="settings_other_ffmpeg_audio_renderer_title">启用音频软解</string>
     <string name="settings_other_firebase_text">这将帮助开发者更快地发现与解决大部分问题</string>
     <string name="settings_other_firebase_title">发送错误日志</string>
     <string name="settings_other_fps_text">在屏幕左上角显示 FPS，这需要重启 App</string>
diff --git a/app/tv/src/main/kotlin/dev/aaa1115910/bv/tv/activities/video/VideoPlayerV3Activity.kt b/app/tv/src/main/kotlin/dev/aaa1115910/bv/tv/activities/video/VideoPlayerV3Activity.kt
@@ -95,7 +95,8 @@ class VideoPlayerV3Activity : ComponentActivity() {
             referer = when (Prefs.apiType) {
                 ApiType.Web -> getString(R.string.video_player_referer)
                 ApiType.App -> null
-            }
+            },
+            enableFfmpegAudioRenderer = Prefs.enableFfmpegAudioRenderer
         )
         val videoPlayer = when (Prefs.playerType) {
             PlayerType.Media3 -> ExoPlayerFactory().create(this, options)
diff --git a/app/tv/src/main/kotlin/dev/aaa1115910/bv/tv/screens/settings/content/OtherSetting.kt b/app/tv/src/main/kotlin/dev/aaa1115910/bv/tv/screens/settings/content/OtherSetting.kt
@@ -39,6 +39,7 @@ fun OtherSetting(
     var showCookiesDialog by remember { mutableStateOf(false) }
     var showFps by remember { mutableStateOf(Prefs.showFps) }
     var updateAlpha by remember { mutableStateOf(Prefs.updateAlpha) }
+    var enableFfmpegAudioRenderer by remember { mutableStateOf(Prefs.enableFfmpegAudioRenderer) }
 
     Column(
         modifier = modifier.fillMaxSize(),
@@ -117,6 +118,17 @@ fun OtherSetting(
                     )
                 }
             }
+            item {
+                SettingSwitchListItem(
+                    title = stringResource(R.string.settings_other_ffmpeg_audio_renderer_title),
+                    supportText = stringResource(R.string.settings_other_ffmpeg_audio_renderer_text),
+                    checked = enableFfmpegAudioRenderer,
+                    onCheckedChange = {
+                        enableFfmpegAudioRenderer = it
+                        Prefs.enableFfmpegAudioRenderer = it
+                    }
+                )
+            }
         }
     }
 
diff --git a/bili-api/src/main/kotlin/dev/aaa1115910/biliapi/entity/video/VideoDetail.kt b/bili-api/src/main/kotlin/dev/aaa1115910/biliapi/entity/video/VideoDetail.kt
@@ -183,8 +183,8 @@ data class VideoDetail(
             fun fromPlayerIcon(playerIcon: dev.aaa1115910.biliapi.http.entity.season.AppSeasonData.PlayerIcon?) =
                 playerIcon?.let {
                     PlayerIcon(
-                        idle = playerIcon.url2,
-                        moving = playerIcon.url1
+                        idle = playerIcon.url2 ?: return@let null,
+                        moving = playerIcon.url1 ?: return@let null
                     )
                 }
         }
diff --git a/bili-api/src/main/kotlin/dev/aaa1115910/biliapi/http/entity/season/AppSeasonData.kt b/bili-api/src/main/kotlin/dev/aaa1115910/biliapi/http/entity/season/AppSeasonData.kt
@@ -325,12 +325,12 @@ data class AppSeasonData(
         val ctime: Int,
         @SerialName("drag_data")
         val dragData: JsonElement? = null,
-        val hash1: String,
-        val hash2: String,
+        val hash1: String? = null,
+        val hash2: String? = null,
         @SerialName("no_drag_data")
         val noDragData: JsonElement? = null,
-        val url1: String,
-        val url2: String
+        val url1: String? = null,
+        val url2: String? = null
     )
 
     @Serializable
diff --git a/buildSrc/src/main/kotlin/ProtobufConfiguration.kt b/buildSrc/src/main/kotlin/ProtobufConfiguration.kt
@@ -39,7 +39,7 @@ object ProtobufConfiguration {
         val protoFiles = mutableSetOf<String>()
         rootDir.walk().forEach {
             if (it.isFile && it.extension == "proto") {
-                protoFiles.add(it.relativeTo(rootDir).path)
+                protoFiles.add(it.relativeTo(rootDir).invariantSeparatorsPath)
             }
         }
         return protoFiles
diff --git a/libs b/libs
@@ -1 +1 @@
-Subproject commit c17c1f1c08b8820f84f9ab0a49fde3a4eea3db35
+Subproject commit c11b45471bf9328fb436f7573fe2435b827d3da7
diff --git a/player/core/build.gradle.kts b/player/core/build.gradle.kts
@@ -56,7 +56,6 @@ java {
 }
 
 dependencies {
-    implementation(project(":player:shared"))
     implementation(androidx.activity.compose)
     implementation(androidx.compose.material)
     implementation(androidx.compose.tv.foundation)
@@ -72,6 +71,10 @@ dependencies {
     implementation(androidx.media3.ui)
     implementation(libs.logging)
     implementation(libs.material)
+    implementation(project(":libs:ffmpegDecoder"))
+    implementation(project(":player:shared"))
+    testImplementation(libs.kotlin.test)
+    androidTestImplementation(androidx.compose.ui.test.junit4)
     debugImplementation(androidx.compose.ui.test.manifest)
     debugImplementation(androidx.compose.ui.tooling)
 }
diff --git a/player/core/src/main/kotlin/dev/aaa1115910/bv/player/VideoPlayerOptions.kt b/player/core/src/main/kotlin/dev/aaa1115910/bv/player/VideoPlayerOptions.kt
@@ -2,5 +2,6 @@ package dev.aaa1115910.bv.player
 
 data class VideoPlayerOptions(
     val userAgent: String? = null,
-    val referer: String? = null
+    val referer: String? = null,
+    val enableFfmpegAudioRenderer: Boolean = false
 )
diff --git a/player/core/src/main/kotlin/dev/aaa1115910/bv/player/impl/exo/ExoMediaPlayer.kt b/player/core/src/main/kotlin/dev/aaa1115910/bv/player/impl/exo/ExoMediaPlayer.kt
@@ -2,12 +2,15 @@ package dev.aaa1115910.bv.player.impl.exo
 
 import android.content.Context
 import androidx.annotation.OptIn
+import androidx.media3.common.C
 import androidx.media3.common.MediaItem
 import androidx.media3.common.PlaybackException
 import androidx.media3.common.Player
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.datasource.okhttp.OkHttpDataSource
+import androidx.media3.exoplayer.DefaultRenderersFactory
 import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.exoplayer.Renderer
 import androidx.media3.exoplayer.source.MediaSource
 import androidx.media3.exoplayer.source.MergingMediaSource
 import androidx.media3.exoplayer.source.ProgressiveMediaSource
@@ -37,8 +40,17 @@ class ExoMediaPlayer(
 
     @OptIn(UnstableApi::class)
     override fun initPlayer() {
+        val renderersFactory = DefaultRenderersFactory(context).apply {
+            setExtensionRendererMode(
+                when (options.enableFfmpegAudioRenderer) {
+                    true -> DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON
+                    false -> DefaultRenderersFactory.EXTENSION_RENDERER_MODE_OFF
+                }
+            )
+        }
         mPlayer = ExoPlayer
             .Builder(context)
+            .setRenderersFactory(renderersFactory)
             .setSeekForwardIncrementMs(1000 * 10)
             .setSeekBackIncrementMs(1000 * 5)
             .build()
@@ -156,9 +168,22 @@ class ExoMediaPlayer(
                 resolution: ${mPlayer?.videoSize?.width} x ${mPlayer?.videoSize?.height}
                 audio: ${mPlayer?.audioFormat?.bitrate ?: 0} kbps
                 video codec: ${mPlayer?.videoFormat?.sampleMimeType ?: "null"}
-                audio codec: ${mPlayer?.audioFormat?.sampleMimeType ?: "null"}
-            """.trimIndent()
+                audio codec: ${mPlayer?.audioFormat?.sampleMimeType ?: "null"} (${getAudioRendererName()})
+            """.trimIndent().also {
+                println(mPlayer?.audioFormat)
+            }
+        }
+
+    private fun getAudioRendererName(): String {
+        val rendererCount = mPlayer?.rendererCount ?: return "UnknownRenderer"
+        for (i in 0 until rendererCount) {
+            val renderer = mPlayer!!.getRenderer(i)
+            if (renderer.trackType == C.TRACK_TYPE_AUDIO && renderer.state == Renderer.STATE_STARTED) {
+                return renderer.name
+            }
         }
+        return "UnknownRenderer"
+    }
 
     override val videoWidth: Int
         get() = mPlayer?.videoSize?.width ?: 0
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -34,6 +34,7 @@ include(":app:tv")
 include(":bili-api")
 include(":bili-subtitle")
 include(":libs:av1Decoder")
+include(":libs:ffmpegDecoder")
 include(":libs:libVLC")
 include(":bili-api-grpc")
 include(":player")

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,13 @@ android {`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`
	`161`	`+composeCompiler {`
	`162`	`+ reportsDestination = layout.buildDirectory.dir("compose_build_reports")`
	`163`	`+ stabilityConfigurationFiles.addAll(`
	`164`	`+ layout.projectDirectory.file("compose_compiler_config.conf")`
	`165`	`+ )`
	`166`	`+}`
	`167`	`+`
`161`	`168`	`java {`
`162`	`169`	`toolchain {`
`163`	`170`	`languageVersion.set(JavaLanguageVersion.of(17))`
Original file line number	Diff line number	Diff line change
`@@ -74,10 +74,10 @@ android {`
`74`	`74`	`lint{`
`75`	`75`	`targetSdk = AppConfiguration.targetSdk`
`76`	`76`	`}`
	`77`	`+}`
`77`	`78`
`78`		`- ksp {`
`79`		`- arg("room.schemaLocation", "$projectDir/schemas")`
`80`		`- }`
	`79`	`+ksp {`
	`80`	`+ arg("room.schemaLocation", "$projectDir/schemas")`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`java {`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ fun OtherSetting(`
`39`	`39`	`var showCookiesDialog by remember { mutableStateOf(false) }`
`40`	`40`	`var showFps by remember { mutableStateOf(Prefs.showFps) }`
`41`	`41`	`var updateAlpha by remember { mutableStateOf(Prefs.updateAlpha) }`
	`42`	`+ var enableFfmpegAudioRenderer by remember { mutableStateOf(Prefs.enableFfmpegAudioRenderer) }`
`42`	`43`
`43`	`44`	`Column(`
`44`	`45`	`modifier = modifier.fillMaxSize(),`
`@@ -117,6 +118,17 @@ fun OtherSetting(`
`117`	`118`	`)`
`118`	`119`	`}`
`119`	`120`	`}`
	`121`	`+ item {`
	`122`	`+ SettingSwitchListItem(`
	`123`	`+ title = stringResource(R.string.settings_other_ffmpeg_audio_renderer_title),`
	`124`	`+ supportText = stringResource(R.string.settings_other_ffmpeg_audio_renderer_text),`
	`125`	`+ checked = enableFfmpegAudioRenderer,`
	`126`	`+ onCheckedChange = {`
	`127`	`+ enableFfmpegAudioRenderer = it`
	`128`	`+ Prefs.enableFfmpegAudioRenderer = it`
	`129`	`+ }`
	`130`	`+ )`
	`131`	`+ }`
`120`	`132`	`}`
`121`	`133`	`}`
`122`	`134`
Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,8 @@ data class VideoDetail(`
`183`	`183`	`fun fromPlayerIcon(playerIcon: dev.aaa1115910.biliapi.http.entity.season.AppSeasonData.PlayerIcon?) =`
`184`	`184`	`playerIcon?.let {`
`185`	`185`	`PlayerIcon(`
`186`		`- idle = playerIcon.url2,`
`187`		`- moving = playerIcon.url1`
	`186`	`+ idle = playerIcon.url2 ?: return@let null,`
	`187`	`+ moving = playerIcon.url1 ?: return@let null`
`188`	`188`	`)`
`189`	`189`	`}`
`190`	`190`	`}`