From 6863281755aed0b3ff06c3976ce061944f957622 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Mon, 2 Nov 2026 13:04:42 +0000 Subject: [PATCH 1/2] feat(player): add Exo loudness audio balance setting Integrate AGC-style loudness balance into the Exo PCM processor chain after DSP and before optional music SRC. Persist level in playback prefs with TV/WebUI controls and unit tests for core gain math. Co-authored-by: ModerRAS --- .../tv/audio/LoudnessBalanceProcessor.kt | 179 ++++++++++++++++++ .../tv/audio/LoudnessBalanceProcessorTest.kt | 69 +++++++ .../miruplay/tv/model/AudioBalanceLevel.kt | 21 ++ .../preferences/PlaybackPreferencesManager.kt | 14 ++ .../PlaybackPreferencesManagerTest.kt | 11 ++ .../tv/player/AudioBalanceAudioProcessor.kt | 137 ++++++++++++++ .../tv/player/AudioDspRuntimeConfig.kt | 20 +- .../miruplay/tv/player/DspRenderersFactory.kt | 8 +- .../tv/player/ExoPlaybackController.kt | 1 + .../tv/player/MusicSrcBypassPipelineTest.kt | 3 +- .../PlaybackPreferencesRepository.kt | 4 + .../tv/ui/settings/AddSourceScreen.kt | 90 +++++++++ .../tv/ui/settings/SettingsViewModel.kt | 10 + ui-tv/src/main/res/values-en/strings.xml | 10 + ui-tv/src/main/res/values/strings.xml | 10 + .../tv/webcontrol/WebControlModels.kt | 3 + .../webcontrol/WebControlSettingsRouteTest.kt | 2 + web-control/frontend/src/App.vue | 20 +- .../tv/webcontrol/WebControlService.kt | 7 + 19 files changed, 614 insertions(+), 5 deletions(-) create mode 100644 audio-dsp-core/src/main/kotlin/com/miruplay/tv/audio/LoudnessBalanceProcessor.kt create mode 100644 audio-dsp-core/src/test/kotlin/com/miruplay/tv/audio/LoudnessBalanceProcessorTest.kt create mode 100644 core/model/src/main/kotlin/com/miruplay/tv/model/AudioBalanceLevel.kt create mode 100644 player-core/src/main/kotlin/com/miruplay/tv/player/AudioBalanceAudioProcessor.kt diff --git a/audio-dsp-core/src/main/kotlin/com/miruplay/tv/audio/LoudnessBalanceProcessor.kt b/audio-dsp-core/src/main/kotlin/com/miruplay/tv/audio/LoudnessBalanceProcessor.kt new file mode 100644 index 00000000..af188c10 --- /dev/null +++ b/audio-dsp-core/src/main/kotlin/com/miruplay/tv/audio/LoudnessBalanceProcessor.kt @@ -0,0 +1,179 @@ +package com.miruplay.tv.audio + +import com.miruplay.tv.model.AudioBalanceLevel +import kotlin.math.ln +import kotlin.math.max +import kotlin.math.min +import kotlin.math.sqrt + +/** + * Streaming AGC-style loudness balance: chase RMS toward [params.targetRmsLinear] with separate + * attack/release, optional calibration window, noise gate, and a linked peak ceiling. + */ +class LoudnessBalanceProcessor( + level: AudioBalanceLevel, + sampleRateHz: Int, +) { + private var params: LoudnessBalanceParams? = LoudnessBalanceParams.forLevel(level) + private var sampleRate = sampleRateHz.coerceAtLeast(1) + + private var currentGain = 1f + private var smoothedRms = 0f + private var calibrationAccum = 0.0 + private var calibrationFrames = 0 + private var calibrated = false + + fun setLevel(level: AudioBalanceLevel, sampleRateHz: Int) { + val next = LoudnessBalanceParams.forLevel(level) + val rateChanged = sampleRateHz.coerceAtLeast(1) != sampleRate + sampleRate = sampleRateHz.coerceAtLeast(1) + if (next == params && !rateChanged) return + params = next + resetState() + } + + fun resetState() { + currentGain = 1f + smoothedRms = 0f + calibrationAccum = 0.0 + calibrationFrames = 0 + calibrated = false + } + + fun processInPlace(interleaved: FloatArray, channels: Int) { + val active = params ?: return + require(channels > 0) { "channels must be positive" } + if (interleaved.isEmpty()) return + val frames = interleaved.size / channels + val attackCoeff = timeCoefficient(active.attackMs) + val releaseCoeff = timeCoefficient(active.releaseMs) + val rmsSmoothCoeff = timeCoefficient(active.rmsSmoothMs) + val calibrateFrames = (active.calibrateMs * 0.001f * sampleRate).toInt().coerceAtLeast(1) + val gateLinear = dbToLinear(active.gateDb) + val targetLinear = active.targetRmsLinear + val minGain = dbToLinear(-active.maxCutDb) + val maxGain = dbToLinear(active.maxBoostDb) + val peakCeiling = active.peakCeiling + + for (frame in 0 until frames) { + val offset = frame * channels + var sumSquares = 0.0 + for (channel in 0 until channels) { + val sample = interleaved[offset + channel].toDouble() + sumSquares += sample * sample + } + val frameRms = sqrt(sumSquares / channels).toFloat() + + if (!calibrated) { + calibrationAccum += frameRms.toDouble() + calibrationFrames += 1 + if (calibrationFrames >= calibrateFrames) { + smoothedRms = (calibrationAccum / calibrationFrames).toFloat().coerceAtLeast(gateLinear) + calibrated = true + } else { + applyGain(interleaved, offset, channels, currentGain, peakCeiling) + continue + } + } + + smoothedRms += (frameRms - smoothedRms) * rmsSmoothCoeff + val measured = max(smoothedRms, gateLinear) + var desiredGain = if (measured <= gateLinear) { + min(currentGain, 1f) + } else { + (targetLinear / measured).coerceIn(minGain, maxGain) + } + + val coeff = if (desiredGain < currentGain) attackCoeff else releaseCoeff + currentGain += (desiredGain - currentGain) * coeff + applyGain(interleaved, offset, channels, currentGain, peakCeiling) + } + } + + private fun applyGain( + interleaved: FloatArray, + offset: Int, + channels: Int, + gain: Float, + peakCeiling: Float, + ) { + var peak = 0f + for (channel in 0 until channels) { + val index = offset + channel + val scaled = interleaved[index] * gain + interleaved[index] = scaled + peak = max(peak, kotlin.math.abs(scaled)) + } + if (peak <= peakCeiling || peak <= 0f) return + val limit = peakCeiling / peak + for (channel in 0 until channels) { + val index = offset + channel + interleaved[index] *= limit + } + currentGain *= limit + } + + private fun timeCoefficient(timeMs: Float): Float { + val ms = timeMs.coerceAtLeast(1f) + return (1f - kotlin.math.exp(-1f / (ms * 0.001f * sampleRate))).coerceIn(0f, 1f) + } + + private data class LoudnessBalanceParams( + val maxBoostDb: Float, + val maxCutDb: Float, + val attackMs: Float, + val releaseMs: Float, + val rmsSmoothMs: Float, + val gateDb: Float, + val calibrateMs: Float, + val targetRmsLinear: Float, + val peakCeiling: Float, + ) { + companion object { + private const val TARGET_RMS_DBFS = -20f + private const val PEAK_CEILING = 0.98f + + fun forLevel(level: AudioBalanceLevel): LoudnessBalanceParams? = when (level) { + AudioBalanceLevel.OFF -> null + AudioBalanceLevel.LOW -> LoudnessBalanceParams( + maxBoostDb = 6f, + maxCutDb = 6f, + attackMs = 120f, + releaseMs = 1800f, + rmsSmoothMs = 250f, + gateDb = -54f, + calibrateMs = 3500f, + targetRmsLinear = dbToLinear(TARGET_RMS_DBFS), + peakCeiling = PEAK_CEILING, + ) + AudioBalanceLevel.MEDIUM -> LoudnessBalanceParams( + maxBoostDb = 10f, + maxCutDb = 8f, + attackMs = 80f, + releaseMs = 1400f, + rmsSmoothMs = 180f, + gateDb = -50f, + calibrateMs = 2500f, + targetRmsLinear = dbToLinear(TARGET_RMS_DBFS), + peakCeiling = PEAK_CEILING, + ) + AudioBalanceLevel.HIGH -> LoudnessBalanceParams( + maxBoostDb = 14f, + maxCutDb = 10f, + attackMs = 50f, + releaseMs = 900f, + rmsSmoothMs = 120f, + gateDb = -48f, + calibrateMs = 1800f, + targetRmsLinear = dbToLinear(TARGET_RMS_DBFS), + peakCeiling = PEAK_CEILING, + ) + } + } + } +} + +internal fun dbToLinear(db: Float): Float { + if (db <= -120f) return 0f + return kotlin.math.exp((db * ln(10.0) / 20.0).toFloat()) +} diff --git a/audio-dsp-core/src/test/kotlin/com/miruplay/tv/audio/LoudnessBalanceProcessorTest.kt b/audio-dsp-core/src/test/kotlin/com/miruplay/tv/audio/LoudnessBalanceProcessorTest.kt new file mode 100644 index 00000000..4096af82 --- /dev/null +++ b/audio-dsp-core/src/test/kotlin/com/miruplay/tv/audio/LoudnessBalanceProcessorTest.kt @@ -0,0 +1,69 @@ +package com.miruplay.tv.audio + +import com.miruplay.tv.model.AudioBalanceLevel +import org.junit.Assert.assertTrue +import org.junit.Test +import kotlin.math.abs + +class LoudnessBalanceProcessorTest { + private val sampleRate = 48_000 + + @Test + fun `off level is a no-op`() { + val processor = LoudnessBalanceProcessor(AudioBalanceLevel.OFF, sampleRate) + val input = floatArrayOf(0.5f, 0.5f, -0.2f, -0.2f) + processor.processInPlace(input, channels = 2) + assertTrue(input.contentEquals(floatArrayOf(0.5f, 0.5f, -0.2f, -0.2f))) + } + + @Test + fun `silence stays silent after calibration`() { + val processor = LoudnessBalanceProcessor(AudioBalanceLevel.MEDIUM, sampleRate) + val silence = FloatArray(sampleRate / 10 * 2) { 0f } + repeat(40) { processor.processInPlace(silence, channels = 2) } + assertTrue(silence.all { abs(it) < 1e-4f }) + } + + @Test + fun `quiet segment is boosted toward target after calibration`() { + val processor = LoudnessBalanceProcessor(AudioBalanceLevel.HIGH, sampleRate) + val quiet = FloatArray(sampleRate * 3 * 2) { index -> + if (index % 2 == 0) 0.01f else 0.01f + } + processor.processInPlace(quiet, channels = 2) + val tailStart = quiet.size - sampleRate * 2 + val tailRms = rms(quiet, tailStart, quiet.size, channels = 2) + assertTrue("tailRms=$tailRms", tailRms > 0.03f) + } + + @Test + fun `peak is limited below ceiling`() { + val processor = LoudnessBalanceProcessor(AudioBalanceLevel.HIGH, sampleRate) + val warm = FloatArray(sampleRate * 2 * 2) { 0.12f } + processor.processInPlace(warm, channels = 2) + val peakBlock = floatArrayOf(1f, 1f, 1f, 1f) + processor.processInPlace(peakBlock, channels = 2) + assertTrue(peakBlock.maxOf { abs(it) } <= 0.985f) + } + + @Test + fun `level change resets calibration state`() { + val processor = LoudnessBalanceProcessor(AudioBalanceLevel.LOW, sampleRate) + val warm = FloatArray(sampleRate * 2 * 2) { 0.08f } + processor.processInPlace(warm, channels = 2) + processor.setLevel(AudioBalanceLevel.HIGH, sampleRate) + val after = FloatArray(4) { 0.08f } + processor.processInPlace(after, channels = 2) + assertTrue(after.all { it.isFinite() }) + } + + private fun rms(samples: FloatArray, start: Int, end: Int, channels: Int): Float { + var sum = 0.0 + var count = 0 + for (index in start until end) { + sum += samples[index] * samples[index] + count += 1 + } + return kotlin.math.sqrt(sum / count.coerceAtLeast(1)).toFloat() + } +} diff --git a/core/model/src/main/kotlin/com/miruplay/tv/model/AudioBalanceLevel.kt b/core/model/src/main/kotlin/com/miruplay/tv/model/AudioBalanceLevel.kt new file mode 100644 index 00000000..7142489f --- /dev/null +++ b/core/model/src/main/kotlin/com/miruplay/tv/model/AudioBalanceLevel.kt @@ -0,0 +1,21 @@ +package com.miruplay.tv.model + +import kotlinx.serialization.Serializable + +/** Exo/Media3 PCM loudness balance strength; IJK and MPV do not apply this today. */ +@Serializable +enum class AudioBalanceLevel(val storageValue: String) { + OFF("off"), + LOW("low"), + MEDIUM("medium"), + HIGH("high"); + + val isEnabled: Boolean + get() = this != OFF + + companion object { + fun fromStorageValue(value: String?): AudioBalanceLevel = + entries.firstOrNull { it.storageValue.equals(value?.trim()?.lowercase(), ignoreCase = true) } + ?: OFF + } +} diff --git a/data/src/main/kotlin/com/miruplay/tv/data/preferences/PlaybackPreferencesManager.kt b/data/src/main/kotlin/com/miruplay/tv/data/preferences/PlaybackPreferencesManager.kt index c15aaeb9..b59fe69c 100644 --- a/data/src/main/kotlin/com/miruplay/tv/data/preferences/PlaybackPreferencesManager.kt +++ b/data/src/main/kotlin/com/miruplay/tv/data/preferences/PlaybackPreferencesManager.kt @@ -7,6 +7,7 @@ import com.miruplay.tv.model.FormatAwareToneMappingPreferences import com.miruplay.tv.model.PlaybackEndAction import com.miruplay.tv.model.PlaybackRenderBackend import com.miruplay.tv.model.SubtitleLanguagePreference +import com.miruplay.tv.model.AudioBalanceLevel import com.miruplay.tv.model.AudioDspConfig import com.miruplay.tv.model.MusicSrcBypassMode import com.miruplay.tv.repository.MicCalibrationSettings @@ -99,6 +100,12 @@ class PlaybackPreferencesManager @Inject constructor( prefs.edit().putString(KEY_MUSIC_SRC_BYPASS_MODE, value.storageValue).apply() } + var audioBalanceLevel: AudioBalanceLevel + get() = AudioBalanceLevel.fromStorageValue(prefs.getString(KEY_AUDIO_BALANCE_LEVEL, null)) + set(value) { + prefs.edit().putString(KEY_AUDIO_BALANCE_LEVEL, value.storageValue).apply() + } + /** User-picked sweep-measurement microphone (AudioDeviceInfo.id), or null for the default. */ var audioMeasureMicId: Int? get() = prefs.getInt(KEY_AUDIO_MEASURE_MIC_ID, Int.MIN_VALUE).takeIf { it != Int.MIN_VALUE } @@ -178,6 +185,12 @@ class PlaybackPreferencesManager @Inject constructor( musicSrcBypassMode = mode } + override suspend fun getAudioBalanceLevel(): AudioBalanceLevel = audioBalanceLevel + + override suspend fun setAudioBalanceLevel(level: AudioBalanceLevel) { + audioBalanceLevel = level + } + companion object { private const val KEY_END_ACTION = "end_action" private const val KEY_EPISODE_VERSION_SELECTION_POLICY = "episode_version_selection_policy" @@ -189,6 +202,7 @@ class PlaybackPreferencesManager @Inject constructor( private const val KEY_AUDIO_MEASURE_CALIBRATIONS = "audio_measure_calibrations" private const val KEY_AUDIO_MEASURE_CALIBRATION_ACTIVE = "audio_measure_calibration_active" private const val KEY_MUSIC_SRC_BYPASS_MODE = "music_src_bypass_mode" + private const val KEY_AUDIO_BALANCE_LEVEL = "player_audio_balance_level" private const val KEY_AUDIO_MEASURE_MIC_ID = "audio_measure_mic_id" } } diff --git a/data/src/test/kotlin/com/miruplay/tv/data/preferences/PlaybackPreferencesManagerTest.kt b/data/src/test/kotlin/com/miruplay/tv/data/preferences/PlaybackPreferencesManagerTest.kt index 1f198782..7944d52e 100644 --- a/data/src/test/kotlin/com/miruplay/tv/data/preferences/PlaybackPreferencesManagerTest.kt +++ b/data/src/test/kotlin/com/miruplay/tv/data/preferences/PlaybackPreferencesManagerTest.kt @@ -11,6 +11,7 @@ import com.miruplay.tv.model.SubtitleLanguagePreference import com.miruplay.tv.model.ToneMappingCurvePreset import com.miruplay.tv.model.ToneMappingRuleSet import com.miruplay.tv.model.VideoRenderRuleKey +import com.miruplay.tv.model.AudioBalanceLevel import com.miruplay.tv.model.AudioDspConfig import com.miruplay.tv.model.AudioDspPreset import kotlinx.coroutines.runBlocking @@ -89,6 +90,16 @@ class PlaybackPreferencesManagerTest { assertEquals(true, manager.perfMonitorEnabled) } + @Test + fun `manager persists audio balance level default off`() = runBlocking { + assertEquals(AudioBalanceLevel.OFF, manager.getAudioBalanceLevel()) + + manager.setAudioBalanceLevel(AudioBalanceLevel.MEDIUM) + + assertEquals(AudioBalanceLevel.MEDIUM, manager.getAudioBalanceLevel()) + assertEquals(AudioBalanceLevel.MEDIUM, manager.audioBalanceLevel) + } + @Test fun `manager persists normalized audio dsp config`() = runBlocking { assertEquals(false, manager.getAudioDspConfig().enabled) diff --git a/player-core/src/main/kotlin/com/miruplay/tv/player/AudioBalanceAudioProcessor.kt b/player-core/src/main/kotlin/com/miruplay/tv/player/AudioBalanceAudioProcessor.kt new file mode 100644 index 00000000..d3a08104 --- /dev/null +++ b/player-core/src/main/kotlin/com/miruplay/tv/player/AudioBalanceAudioProcessor.kt @@ -0,0 +1,137 @@ +@file:Suppress("UnsafeOptInUsageError") + +package com.miruplay.tv.player + +import androidx.media3.common.C +import androidx.media3.common.audio.AudioProcessor +import androidx.media3.common.audio.BaseAudioProcessor +import com.miruplay.tv.audio.LoudnessBalanceProcessor +import com.miruplay.tv.model.AudioBalanceLevel +import java.nio.ByteBuffer +import java.nio.ByteOrder + +/** + * Exo/Media3 hook for [LoudnessBalanceProcessor]. Sits after [DspAudioProcessor] and before + * optional [MusicSrcBypassProcessor] so EQ/downmix/limiter run first, then loudness balance, + * then SRC to the device mixer rate. + */ +class AudioBalanceAudioProcessor( + private val runtimeConfig: AudioDspRuntimeConfig, +) : BaseAudioProcessor() { + private var balance: LoudnessBalanceProcessor? = null + private var channels = 0 + private var encoding = C.ENCODING_INVALID + private var sampleRateHz = 0 + private var appliedRevision = -1L + private var appliedLevel = AudioBalanceLevel.OFF + private var configuredPcm = false + + override fun onConfigure(inputAudioFormat: AudioProcessor.AudioFormat): AudioProcessor.AudioFormat { + val isPcm = inputAudioFormat.encoding == C.ENCODING_PCM_16BIT || + inputAudioFormat.encoding == C.ENCODING_PCM_FLOAT + if (!isPcm) { + configuredPcm = false + balance = null + return inputAudioFormat + } + channels = inputAudioFormat.channelCount + encoding = inputAudioFormat.encoding + sampleRateHz = inputAudioFormat.sampleRate + configuredPcm = true + syncProcessor(forceReset = true) + return inputAudioFormat + } + + override fun isActive(): Boolean = + configuredPcm && appliedLevel.isEnabled && balance != null && super.isActive() + + override fun queueInput(inputBuffer: ByteBuffer) { + syncProcessor(forceReset = false) + val active = balance + if (active == null || !appliedLevel.isEnabled) { + passThrough(inputBuffer) + return + } + val bytesPerSample = if (encoding == C.ENCODING_PCM_FLOAT) 4 else 2 + val frameSize = channels * bytesPerSample + val byteCount = inputBuffer.remaining() - (inputBuffer.remaining() % frameSize) + val frames = byteCount / frameSize + if (frames == 0) { + inputBuffer.position(inputBuffer.limit()) + return + } + val source = inputBuffer.duplicate().order(ByteOrder.LITTLE_ENDIAN) + val samples = FloatArray(frames * channels) + for (index in samples.indices) { + samples[index] = if (encoding == C.ENCODING_PCM_FLOAT) { + source.float + } else { + source.short / 32_768f + } + } + inputBuffer.position(inputBuffer.position() + byteCount) + active.processInPlace(samples, channels) + val output = replaceOutputBuffer(byteCount).order(ByteOrder.LITTLE_ENDIAN) + var sampleIndex = 0 + repeat(frames * channels) { + if (encoding == C.ENCODING_PCM_FLOAT) { + output.putFloat(samples[sampleIndex++]) + } else { + output.putShort((samples[sampleIndex++].coerceIn(-1f, 1f) * 32_767f).toInt().toShort()) + } + } + output.flip() + } + + override fun onFlush() { + balance?.resetState() + } + + override fun onReset() { + balance = null + channels = 0 + encoding = C.ENCODING_INVALID + sampleRateHz = 0 + appliedRevision = -1L + appliedLevel = AudioBalanceLevel.OFF + configuredPcm = false + } + + private fun syncProcessor(forceReset: Boolean) { + val snapshot = runtimeConfig.snapshot() + val level = snapshot.audioBalanceLevel + if (!forceReset && snapshot.revision == appliedRevision && level == appliedLevel) return + appliedRevision = snapshot.revision + appliedLevel = level + if (!configuredPcm || !level.isEnabled) { + balance = null + return + } + val existing = balance + if (existing == null || forceReset) { + balance = LoudnessBalanceProcessor(level, sampleRateHz) + } else { + existing.setLevel(level, sampleRateHz) + } + } + + private fun passThrough(inputBuffer: ByteBuffer) { + val bytesPerSample = if (encoding == C.ENCODING_PCM_FLOAT) 4 else 2 + val frameSize = channels * bytesPerSample + if (frameSize <= 0) { + inputBuffer.position(inputBuffer.limit()) + return + } + val byteCount = inputBuffer.remaining() - (inputBuffer.remaining() % frameSize) + if (byteCount <= 0) { + inputBuffer.position(inputBuffer.limit()) + return + } + val output = replaceOutputBuffer(byteCount) + val source = inputBuffer.duplicate() + source.limit(source.position() + byteCount) + output.put(source) + inputBuffer.position(inputBuffer.position() + byteCount) + output.flip() + } +} diff --git a/player-core/src/main/kotlin/com/miruplay/tv/player/AudioDspRuntimeConfig.kt b/player-core/src/main/kotlin/com/miruplay/tv/player/AudioDspRuntimeConfig.kt index 588855d4..01c7d5ca 100644 --- a/player-core/src/main/kotlin/com/miruplay/tv/player/AudioDspRuntimeConfig.kt +++ b/player-core/src/main/kotlin/com/miruplay/tv/player/AudioDspRuntimeConfig.kt @@ -1,5 +1,6 @@ package com.miruplay.tv.player +import com.miruplay.tv.model.AudioBalanceLevel import com.miruplay.tv.model.AudioDspConfig import com.miruplay.tv.model.MusicSrcBypassMode @@ -7,6 +8,7 @@ class AudioDspRuntimeConfig { data class Snapshot( val config: AudioDspConfig, val revision: Long, + val audioBalanceLevel: AudioBalanceLevel = AudioBalanceLevel.OFF, ) @Volatile @@ -21,6 +23,9 @@ class AudioDspRuntimeConfig { val revision: Long get() = state.revision + val audioBalanceLevel: AudioBalanceLevel + get() = state.audioBalanceLevel + val musicBypassMode: MusicSrcBypassMode get() = musicBypassModeState @@ -30,7 +35,20 @@ class AudioDspRuntimeConfig { val normalized = value.normalized() while (true) { val current = state - val next = Snapshot(normalized, current.revision + 1L) + val next = Snapshot(normalized, current.revision + 1L, current.audioBalanceLevel) + synchronized(this) { + if (state === current) { + state = next + return + } + } + } + } + + fun updateAudioBalanceLevel(level: AudioBalanceLevel) { + while (true) { + val current = state + val next = Snapshot(current.config, current.revision + 1L, level) synchronized(this) { if (state === current) { state = next diff --git a/player-core/src/main/kotlin/com/miruplay/tv/player/DspRenderersFactory.kt b/player-core/src/main/kotlin/com/miruplay/tv/player/DspRenderersFactory.kt index 49ec76d7..5dd736ce 100644 --- a/player-core/src/main/kotlin/com/miruplay/tv/player/DspRenderersFactory.kt +++ b/player-core/src/main/kotlin/com/miruplay/tv/player/DspRenderersFactory.kt @@ -33,9 +33,13 @@ class DspRenderersFactory( val processors = when (mode) { MusicSrcBypassMode.SOFTWARE -> arrayOf( DspAudioProcessor(runtimeConfig), - MusicSrcBypassProcessor(nativeRate) + AudioBalanceAudioProcessor(runtimeConfig), + MusicSrcBypassProcessor(nativeRate), + ) + else -> arrayOf( + DspAudioProcessor(runtimeConfig), + AudioBalanceAudioProcessor(runtimeConfig), ) - else -> arrayOf(DspAudioProcessor(runtimeConfig)) } return DefaultAudioSink.Builder(context) .setEnableFloatOutput(enableFloatOutput || policy.forcePcm) diff --git a/player-core/src/main/kotlin/com/miruplay/tv/player/ExoPlaybackController.kt b/player-core/src/main/kotlin/com/miruplay/tv/player/ExoPlaybackController.kt index 8cdf5c78..0ed62ff4 100644 --- a/player-core/src/main/kotlin/com/miruplay/tv/player/ExoPlaybackController.kt +++ b/player-core/src/main/kotlin/com/miruplay/tv/player/ExoPlaybackController.kt @@ -180,6 +180,7 @@ class ExoPlaybackController @Inject constructor( .normalized() audioDspRuntimeConfig.update(playbackPreferencesRepository.getAudioDspConfig()) audioDspRuntimeConfig.updateMusicMode(playbackPreferencesRepository.getMusicSrcBypassMode()) + audioDspRuntimeConfig.updateAudioBalanceLevel(playbackPreferencesRepository.getAudioBalanceLevel()) preferredSubtitleLanguage = playbackPreferencesRepository.getPreferredSubtitleLanguage() subtitleSelectionWasManual = false _requestedRenderBackend.value = sessionState.effectiveRequestedBackend(playbackPreferences.defaultBackend) diff --git a/player-core/src/test/kotlin/com/miruplay/tv/player/MusicSrcBypassPipelineTest.kt b/player-core/src/test/kotlin/com/miruplay/tv/player/MusicSrcBypassPipelineTest.kt index 6bbb0236..5bbabaf4 100644 --- a/player-core/src/test/kotlin/com/miruplay/tv/player/MusicSrcBypassPipelineTest.kt +++ b/player-core/src/test/kotlin/com/miruplay/tv/player/MusicSrcBypassPipelineTest.kt @@ -26,8 +26,9 @@ class MusicSrcBypassPipelineTest { private fun makePipeline(dspEnabled: Boolean, nativeRate: Int, sampleRate: Int, channels: Int): AudioProcessingPipeline { val runtime = AudioDspRuntimeConfig().also { it.update(AudioDspConfig(enabled = dspEnabled)) } val dsp = DspAudioProcessor(runtime) + val balance = AudioBalanceAudioProcessor(runtime) val musicSrc = MusicSrcBypassProcessor(nativeRate) - val chain = DefaultAudioSink.DefaultAudioProcessorChain(dsp, musicSrc) + val chain = DefaultAudioSink.DefaultAudioProcessorChain(dsp, balance, musicSrc) val pipeline = AudioProcessingPipeline(ImmutableList.copyOf(chain.audioProcessors)) val format = AudioProcessor.AudioFormat(sampleRate, channels, C.ENCODING_PCM_16BIT) pipeline.configure(format) diff --git a/repository-api/src/main/kotlin/com/miruplay/tv/repository/PlaybackPreferencesRepository.kt b/repository-api/src/main/kotlin/com/miruplay/tv/repository/PlaybackPreferencesRepository.kt index 27eb03b2..766273fe 100644 --- a/repository-api/src/main/kotlin/com/miruplay/tv/repository/PlaybackPreferencesRepository.kt +++ b/repository-api/src/main/kotlin/com/miruplay/tv/repository/PlaybackPreferencesRepository.kt @@ -4,6 +4,7 @@ import com.miruplay.tv.model.EpisodeVersionSelectionPolicy import com.miruplay.tv.model.FormatAwareToneMappingPreferences import com.miruplay.tv.model.PlaybackEndAction import com.miruplay.tv.model.SubtitleLanguagePreference +import com.miruplay.tv.model.AudioBalanceLevel import com.miruplay.tv.model.AudioDspConfig import com.miruplay.tv.model.MusicSrcBypassMode import kotlinx.serialization.Serializable @@ -27,6 +28,9 @@ interface PlaybackPreferencesRepository { suspend fun setAudioDspConfig(config: AudioDspConfig) = Unit suspend fun getMusicSrcBypassMode(): MusicSrcBypassMode = MusicSrcBypassMode.SOFTWARE suspend fun setMusicSrcBypassMode(mode: MusicSrcBypassMode) = Unit + /** Exo/Media3 loudness balance strength; default off. */ + suspend fun getAudioBalanceLevel(): AudioBalanceLevel = AudioBalanceLevel.OFF + suspend fun setAudioBalanceLevel(level: AudioBalanceLevel) = Unit /** All saved mic calibrations plus the id of the active one (null = none). */ /** User-picked sweep-measurement microphone (AudioDeviceInfo.id); null = default. */ suspend fun getAudioMeasureMicId(): Int? = null diff --git a/ui-tv/src/main/kotlin/com/miruplay/tv/ui/settings/AddSourceScreen.kt b/ui-tv/src/main/kotlin/com/miruplay/tv/ui/settings/AddSourceScreen.kt index faf67190..9780e9b7 100644 --- a/ui-tv/src/main/kotlin/com/miruplay/tv/ui/settings/AddSourceScreen.kt +++ b/ui-tv/src/main/kotlin/com/miruplay/tv/ui/settings/AddSourceScreen.kt @@ -61,6 +61,8 @@ import androidx.compose.material.icons.filled.PowerSettingsNew import androidx.compose.material.icons.filled.Send import androidx.compose.material.icons.filled.Speaker import androidx.compose.material.icons.filled.Usb +import androidx.compose.material.icons.filled.VolumeDown +import androidx.compose.material.icons.filled.VolumeOff import androidx.compose.material.icons.filled.VolumeUp import androidx.compose.material.icons.filled.Warning import androidx.compose.material.icons.filled.GraphicEq @@ -149,6 +151,7 @@ import com.miruplay.tv.model.cloudDriveRootDisplayName import com.miruplay.tv.model.FormatAwareToneMappingPreferences import com.miruplay.tv.model.AudioDspChannelTarget import com.miruplay.tv.model.AudioDspConfig +import com.miruplay.tv.model.AudioBalanceLevel import com.miruplay.tv.model.MusicSrcBypassMode import com.miruplay.tv.model.MediaContentMode import com.miruplay.tv.model.MediaRecognitionMode @@ -459,6 +462,7 @@ fun AddSourceScreen( val audioDspConfig by viewModel.audioDspConfig.collectAsStateWithLifecycle() val audioMeasure by viewModel.audioMeasure.collectAsStateWithLifecycle() val musicSrcBypassMode by viewModel.musicSrcBypassMode.collectAsStateWithLifecycle() + val audioBalanceLevel by viewModel.audioBalanceLevel.collectAsStateWithLifecycle() val savedTmdbToken by viewModel.tmdbToken.collectAsStateWithLifecycle() val webUiUrls by viewModel.webUiUrls.collectAsStateWithLifecycle() val webControlEnabled by viewModel.webControlEnabled.collectAsStateWithLifecycle() @@ -800,6 +804,8 @@ fun AddSourceScreen( onOpenCalibrationWizard = { calibrationWizardOpen = true }, musicSrcBypassMode = musicSrcBypassMode, onMusicSrcBypassModeSelected = viewModel::setMusicSrcBypassMode, + audioBalanceLevel = audioBalanceLevel, + onAudioBalanceLevelSelected = viewModel::setAudioBalanceLevel, savedToken = savedToken, tokenInput = tokenInput, tokenSaved = tokenSaved, @@ -1314,6 +1320,8 @@ private fun SettingsContent( onOpenCalibrationWizard: () -> Unit, musicSrcBypassMode: MusicSrcBypassMode, onMusicSrcBypassModeSelected: (MusicSrcBypassMode) -> Unit, + audioBalanceLevel: AudioBalanceLevel, + onAudioBalanceLevelSelected: (AudioBalanceLevel) -> Unit, savedToken: String, tokenInput: String, tokenSaved: Boolean, @@ -1590,6 +1598,8 @@ private fun SettingsContent( onToneMappingPresetSelected = onToneMappingPresetSelected, musicSrcBypassMode = musicSrcBypassMode, onMusicSrcBypassModeSelected = onMusicSrcBypassModeSelected, + audioBalanceLevel = audioBalanceLevel, + onAudioBalanceLevelSelected = onAudioBalanceLevelSelected, ) } @@ -3412,6 +3422,8 @@ private fun PlaybackPanel( onToneMappingPresetSelected: (VideoRenderRuleKey, ToneMappingProfilePreset) -> Unit, musicSrcBypassMode: MusicSrcBypassMode, onMusicSrcBypassModeSelected: (MusicSrcBypassMode) -> Unit, + audioBalanceLevel: AudioBalanceLevel, + onAudioBalanceLevelSelected: (AudioBalanceLevel) -> Unit, ) { SettingsPanel { Row(verticalAlignment = Alignment.CenterVertically) { @@ -3466,6 +3478,11 @@ private fun PlaybackPanel( onModeSelected = onMusicSrcBypassModeSelected, ) + AudioBalanceTvControls( + level = audioBalanceLevel, + onLevelSelected = onAudioBalanceLevelSelected, + ) + Spacer(Modifier.height(24.dp)) Text(text = stringResource(R.string.settings_version_policy_title), style = TvTypography.subtitle, color = TextPrimary) Spacer(Modifier.height(6.dp)) @@ -4071,6 +4088,79 @@ private fun MusicSrcBypassTvControls( ) } +@Composable +private fun AudioBalanceTvControls( + level: AudioBalanceLevel, + onLevelSelected: (AudioBalanceLevel) -> Unit, +) { + Spacer(Modifier.height(24.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + Icon( + imageVector = Icons.Filled.VolumeUp, + contentDescription = null, + tint = TextPrimary, + modifier = Modifier.size(26.dp), + ) + Spacer(Modifier.width(10.dp)) + Text( + text = stringResource(R.string.settings_audio_balance_title), + style = TvTypography.subtitle, + color = TextPrimary, + ) + } + Spacer(Modifier.height(6.dp)) + Text( + text = stringResource(R.string.settings_audio_balance_desc), + style = TvTypography.body, + color = TextSecondary, + ) + Spacer(Modifier.height(14.dp)) + Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + ScanOptionChip( + text = stringResource(R.string.settings_audio_balance_off), + icon = Icons.Filled.VolumeOff, + selected = level == AudioBalanceLevel.OFF, + enabled = true, + onClick = { onLevelSelected(AudioBalanceLevel.OFF) }, + modifier = Modifier.width(90.dp), + ) + ScanOptionChip( + text = stringResource(R.string.settings_audio_balance_low), + icon = Icons.Filled.VolumeDown, + selected = level == AudioBalanceLevel.LOW, + enabled = true, + onClick = { onLevelSelected(AudioBalanceLevel.LOW) }, + modifier = Modifier.width(90.dp), + ) + ScanOptionChip( + text = stringResource(R.string.settings_audio_balance_medium), + icon = Icons.Filled.VolumeUp, + selected = level == AudioBalanceLevel.MEDIUM, + enabled = true, + onClick = { onLevelSelected(AudioBalanceLevel.MEDIUM) }, + modifier = Modifier.width(90.dp), + ) + ScanOptionChip( + text = stringResource(R.string.settings_audio_balance_high), + icon = Icons.Filled.GraphicEq, + selected = level == AudioBalanceLevel.HIGH, + enabled = true, + onClick = { onLevelSelected(AudioBalanceLevel.HIGH) }, + modifier = Modifier.width(90.dp), + ) + } + StatusMessage( + icon = Icons.Filled.CheckCircle, + text = when (level) { + AudioBalanceLevel.OFF -> stringResource(R.string.settings_audio_balance_off_desc) + AudioBalanceLevel.LOW -> stringResource(R.string.settings_audio_balance_low_desc) + AudioBalanceLevel.MEDIUM -> stringResource(R.string.settings_audio_balance_medium_desc) + AudioBalanceLevel.HIGH -> stringResource(R.string.settings_audio_balance_high_desc) + }, + color = if (level == AudioBalanceLevel.MEDIUM) ProgressGreen else TextSecondary, + ) +} + @Composable private fun ToppingDacControls(viewModel: SettingsViewModel = hiltViewModel()) { val topping by viewModel.topping.collectAsStateWithLifecycle() diff --git a/ui-tv/src/main/kotlin/com/miruplay/tv/ui/settings/SettingsViewModel.kt b/ui-tv/src/main/kotlin/com/miruplay/tv/ui/settings/SettingsViewModel.kt index 21c8b0dd..f822c820 100644 --- a/ui-tv/src/main/kotlin/com/miruplay/tv/ui/settings/SettingsViewModel.kt +++ b/ui-tv/src/main/kotlin/com/miruplay/tv/ui/settings/SettingsViewModel.kt @@ -20,6 +20,7 @@ import com.miruplay.tv.model.EpisodeVersionSelectionPolicy import com.miruplay.tv.model.FormatAwareToneMappingPreferences import com.miruplay.tv.model.AudioDspBand import com.miruplay.tv.model.AudioDspChannelTarget +import com.miruplay.tv.model.AudioBalanceLevel import com.miruplay.tv.model.AudioDspConfig import com.miruplay.tv.model.MusicSrcBypassMode import com.miruplay.tv.measure.AutoEqFitter @@ -528,6 +529,9 @@ class SettingsViewModel @Inject constructor( private val _musicSrcBypassMode = MutableStateFlow(playbackPreferences.musicSrcBypassMode) val musicSrcBypassMode: StateFlow = _musicSrcBypassMode.asStateFlow() + private val _audioBalanceLevel = MutableStateFlow(playbackPreferences.audioBalanceLevel) + val audioBalanceLevel: StateFlow = _audioBalanceLevel.asStateFlow() + private val _webUiUrls = MutableStateFlow>(emptyList()) val webUiUrls: StateFlow> = _webUiUrls.asStateFlow() @@ -1356,6 +1360,12 @@ class SettingsViewModel @Inject constructor( _musicSrcBypassMode.value = mode } + fun setAudioBalanceLevel(level: AudioBalanceLevel) { + playbackPreferences.audioBalanceLevel = level + audioDspRuntimeConfig.updateAudioBalanceLevel(level) + _audioBalanceLevel.value = level + } + fun setDefaultPlaybackBackend(backend: PlaybackRenderBackend) { val updated = _formatAwareToneMappingPreferences.value.normalized().copy( defaultBackend = backend diff --git a/ui-tv/src/main/res/values-en/strings.xml b/ui-tv/src/main/res/values-en/strings.xml index 550a2b27..7ee8205e 100644 --- a/ui-tv/src/main/res/values-en/strings.xml +++ b/ui-tv/src/main/res/values-en/strings.xml @@ -911,6 +911,16 @@ System mixer SRC (most compatible; may pass Speex resampling) High-quality soft SRC to native rate (coexists with DSP; skips low-grade system SRC) Passthrough/offload (bit-perfect without DSP; falls back to soft SRC with DSP) + Audio balance + Exo playback only: tracks loudness to reduce swings within an episode. Not supported on IJK/MPV. + Off + Low + Medium + High + No loudness balancing; original dynamics. + Gentle balancing with slower gain changes. + Recommended: moderate strength for dialogue and effects. + Stronger, faster tracking; dense mixes may feel slightly compressed. Topping DAC control Probing for a USB DAC… No Topping DAC detected diff --git a/ui-tv/src/main/res/values/strings.xml b/ui-tv/src/main/res/values/strings.xml index aee1f4c7..44c892ce 100644 --- a/ui-tv/src/main/res/values/strings.xml +++ b/ui-tv/src/main/res/values/strings.xml @@ -952,6 +952,16 @@ 系统混音器 SRC(兼容最好,可能经 Speex 重采样) 高质软 SRC 到本机速率(DSP 共存,绕过系统低质 SRC) 直通/Offload(无 DSP 时 bit-perfect,有 DSP 时回落软 SRC) + 音频平衡 + Exo 播放时自动追踪响度,减轻同一集内忽大忽小。IJK/MPV 暂不支持。 + 关 + 低 + 中 + 高 + 关闭响度平衡,保持原始动态。 + 轻度平衡,较慢的增益变化,适合对话为主的番剧。 + 默认推荐:中等强度,兼顾对白与音效。 + 较强平衡,更快追踪;复杂混音可能略感压缩。 Topping DAC 控制 正在检测 USB DAC… 未检测到 Topping DAC diff --git a/web-control-core/src/main/kotlin/com/miruplay/tv/webcontrol/WebControlModels.kt b/web-control-core/src/main/kotlin/com/miruplay/tv/webcontrol/WebControlModels.kt index 7742e0c5..de4f014a 100644 --- a/web-control-core/src/main/kotlin/com/miruplay/tv/webcontrol/WebControlModels.kt +++ b/web-control-core/src/main/kotlin/com/miruplay/tv/webcontrol/WebControlModels.kt @@ -349,12 +349,14 @@ data class PlaybackSettingsDto( val preferredSubtitleLanguage: String, val subtitleBackgroundTransparent: Boolean = false, val perfMonitorEnabled: Boolean = false, + val audioBalanceLevel: String = "off", val formatAwareToneMapping: FormatAwareToneMappingPreferences, val backendOptions: List = emptyList(), val endActionOptions: List = listOf("return_to_detail", "play_next_episode"), val episodeVersionSelectionPolicyOptions: List = listOf("auto_nearest", "manual"), val preferredSubtitleLanguageOptions: List = listOf("auto", "zh_hans", "zh_hant", "zh", "en", "ja"), + val audioBalanceLevelOptions: List = listOf("off", "low", "medium", "high"), ) @Serializable @@ -364,6 +366,7 @@ data class PlaybackSettingsRequest( val preferredSubtitleLanguage: String? = null, val subtitleBackgroundTransparent: Boolean? = null, val perfMonitorEnabled: Boolean? = null, + val audioBalanceLevel: String? = null, val formatAwareToneMapping: FormatAwareToneMappingPreferences? = null, ) diff --git a/web-control-core/src/test/kotlin/com/miruplay/tv/webcontrol/WebControlSettingsRouteTest.kt b/web-control-core/src/test/kotlin/com/miruplay/tv/webcontrol/WebControlSettingsRouteTest.kt index 6478f64d..3aeab2d7 100644 --- a/web-control-core/src/test/kotlin/com/miruplay/tv/webcontrol/WebControlSettingsRouteTest.kt +++ b/web-control-core/src/test/kotlin/com/miruplay/tv/webcontrol/WebControlSettingsRouteTest.kt @@ -99,6 +99,8 @@ class WebControlSettingsRouteTest { assertTrue(body.contains("\"preferredSubtitleLanguage\":\"zh_hans\"")) assertTrue(body.contains("\"subtitleBackgroundTransparent\":true")) assertTrue(body.contains("\"preferredSubtitleLanguageOptions\"")) + assertTrue(body.contains("\"audioBalanceLevel\"")) + assertTrue(body.contains("\"audioBalanceLevelOptions\"")) assertTrue(body.contains("\"formatAwareToneMapping\"")) assertTrue(body.contains("\"backendOptions\"")) assertTrue(body.contains("\"value\":\"EXPERIMENTAL_IJKPLAYER\"")) diff --git a/web-control/frontend/src/App.vue b/web-control/frontend/src/App.vue index d89da08c..a957838d 100644 --- a/web-control/frontend/src/App.vue +++ b/web-control/frontend/src/App.vue @@ -1109,6 +1109,17 @@ />
记录解码掉帧/主线程卡顿/字幕耗时并写入日志,下次播放生效
+ + + + +
仅 Exo/Media3 生效;IJK/MPV 暂不支持。切换后正在播放的会话会立即应用。
+
PlaybackBackendOptionDto( @@ -852,6 +854,11 @@ class WebControlService @Inject constructor( playbackPreferencesRepository.setPerfMonitorEnabled(enabled) playbackDebugOverrides.libassSubtitleMonitorEnabled = enabled } + request.audioBalanceLevel?.let { value -> + val level = AudioBalanceLevel.fromStorageValue(value) + playbackPreferencesRepository.setAudioBalanceLevel(level) + audioDspRuntimeConfig.updateAudioBalanceLevel(level) + } request.formatAwareToneMapping?.let { prefs -> playbackPreferencesRepository.setFormatAwareToneMappingPreferences(prefs.normalized()) } From fb8b9cb9fee261759e3f2b6088ab8909ebf8465a Mon Sep 17 00:00:00 2001 From: MiruPlay CI Fix Date: Mon, 2 Nov 2026 22:38:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(pr97):=20=E8=A1=A5=20TW/HK=20=E7=BF=BB?= =?UTF-8?q?=E8=AF=91=20+=20TokenTest=20audioBalance=20stub=20+=20checklist?= =?UTF-8?q?=20=E7=9C=9F=E6=9C=BA=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - lint MissingTranslation: values-zh-rTW / values-zh-rHK 补 10 条 audio balance 文案 - SettingsViewModelTokenTest: 严格 mock 补 audioBalanceLevel=OFF (构造器新增读取,7 例 MockKException) - docs/agents/pre-pr-checklist.md: 追加音频平衡 feature log(HK1 真机证据) --- docs/agents/pre-pr-checklist.md | 23 +++++++++++++++++++ ui-tv/src/main/res/values-zh-rHK/strings.xml | 10 ++++++++ ui-tv/src/main/res/values-zh-rTW/strings.xml | 10 ++++++++ .../ui/settings/SettingsViewModelTokenTest.kt | 2 ++ 4 files changed, 45 insertions(+) diff --git a/docs/agents/pre-pr-checklist.md b/docs/agents/pre-pr-checklist.md index 3779b452..4dc7257d 100644 --- a/docs/agents/pre-pr-checklist.md +++ b/docs/agents/pre-pr-checklist.md @@ -288,3 +288,26 @@ Cross-checks: New failure class (section 1 candidate): - **Offline-index-at-query-time** —— 离线 archive/索引文件在每次查询时全量解析 + 全排序,单测里几行 fixture 毫秒级全过,真机上 1GB 文件把 50MB 堆的 TV 盒子拖进 10 分钟 GC 泥潭。检查:任何“加载本地大文件再查询”的路径,必须验证真实量级文件在目标设备上的单次耗时;查询必须是流式 + 有界内存 + 可取消;耗时型预处理只做一次(构建期/下载期),绝不在查询热路径上 + +### Exo 音频平衡(响度 AGC) + +Own checks(HK1 真机证据 + 单测): + +- [真机] 冷启动无崩溃;test_local_path + test_scan_after_add 建库(AudioTest 1 文件);详情页播完回详情且标“已看”(进度记录正常) +- [真机] 设置 → 播放 → 音频平衡四档(关/低/中/高)渲染正常,默认关;切中/高档即时落盘 `player_audio_balance_level`,分档文案正确 +- [真机] TV→WebAPI:`GET /api/settings/playback` 返回 `audioBalanceLevel=medium`;WebAPI→TV:`PUT` 高/低档后 prefs 与 TV 面板一致 +- [真机] Exo 播放 AudioTest(balance=高/中/低):position 正常推进,无 error;播放中 `PUT low` 热更新后继续播到 EOF,无 error;全程 logcat 无 `AndroidRuntime:E` / `Player error` / `Fatal signal` +- [真机] IJK 后端播同片无崩溃(功能按设计不生效);MPV 内嵌在该盒子因 OpenGL 版本过旧起不来 VO(pre-existing 环境问题,与本 PR 无关),进程存活无崩溃 +- [真机] 外挂 ASS 字幕渲染正常(`EXTERNAL ASS TRACK 1` 可见),`MiruLibass: Resolved libass API from packaged libmpv.so`,`Skipped malformed ASS` = 0 +- 单测:`LoudnessBalanceProcessorTest`(静音/quiet boost/峰值限制/档位切换)、`PlaybackPreferencesManagerTest`、`MusicSrcBypassPipelineTest`(新处理器链路组合回归)、`WebControlSettingsRouteTest` 全过 +- CI 修灯:补 `values-zh-rTW` / `values-zh-rHK` 10 条翻译(lint MissingTranslation),`SettingsViewModelTokenTest` 补 `audioBalanceLevel` mock stub(构造器新增读取导致严格 mock 抛 MockKException) + +Cross-checks: + +- 字幕/libass 单 `libc++_shared.so` 路径未动(`MiruLibass` 日志确认);DSP/音乐 SRC/进度/媒体会话等既有行为无改动(本 PR 只在 `DspRenderersFactory` 追加一个 Exo PCM 处理器 + 设置面字段) +- IJK/MPV 不接入平衡(设置文案已说明);WebUI 播放表单新增档位选择,浏览器侧未实测(本机无浏览器环境),TV 与 WebAPI 双向已验证 + +Not device-verified: + +- 长片(>10 分钟)连续播放下的响度曲线主观听感 —— 手头 fixture 最长 2 分钟;算法分支由单测覆盖,真机只验证链路不断、无崩溃、无可闻爆音 +- WebUI 浏览器端点选(无浏览器环境;TV/WebAPI 双向 parity 已覆盖同一 DTO) diff --git a/ui-tv/src/main/res/values-zh-rHK/strings.xml b/ui-tv/src/main/res/values-zh-rHK/strings.xml index 3b9080c3..f145724a 100644 --- a/ui-tv/src/main/res/values-zh-rHK/strings.xml +++ b/ui-tv/src/main/res/values-zh-rHK/strings.xml @@ -911,6 +911,16 @@ 系統混音器 SRC(兼容最好,可能經 Speex 重採樣) 高質軟 SRC 到本機速率(DSP 共存,繞過系統低質 SRC) 直通/Offload(冇 DSP 嗰陣 bit-perfect,有 DSP 嗰陣回落軟 SRC) + 音頻平衡 + Exo 播放嗰陣自動追蹤響度,減輕同一集內忽大忽小。IJK/MPV 暫時唔支援。 + 關 + 低 + 中 + 高 + 閂咗響度平衡,保持原始動態。 + 輕度平衡,增益變化較慢,啱對白為主嘅番劇。 + 預設推薦:中等強度,對白同音效兼顧。 + 較強平衡,追蹤更快;複雜混音可能覺得有啲壓縮。 Topping DAC 控制 檢測緊 USB DAC… 搵唔到 Topping DAC diff --git a/ui-tv/src/main/res/values-zh-rTW/strings.xml b/ui-tv/src/main/res/values-zh-rTW/strings.xml index eed1cf3b..54c6e1c8 100644 --- a/ui-tv/src/main/res/values-zh-rTW/strings.xml +++ b/ui-tv/src/main/res/values-zh-rTW/strings.xml @@ -911,6 +911,16 @@ 系統混音器 SRC(相容最好,可能經 Speex 重取樣) 高質軟 SRC 到本機速率(DSP 共存,繞過系統低質 SRC) 直通/Offload(無 DSP 時 bit-perfect,有 DSP 時回落軟 SRC) + 音訊平衡 + Exo 播放時自動追蹤響度,減輕同一集內忽大忽小。IJK/MPV 暫不支援。 + 關 + 低 + 中 + 高 + 關閉響度平衡,保持原始動態。 + 輕度平衡,較慢的增益變化,適合對話為主的番劇。 + 預設推薦:中等強度,兼顧對白與音效。 + 較強平衡,更快追蹤;複雜混音可能略感壓縮。 Topping DAC 控制 正在偵測 USB DAC… 未偵測到 Topping DAC diff --git a/ui-tv/src/test/kotlin/com/miruplay/tv/ui/settings/SettingsViewModelTokenTest.kt b/ui-tv/src/test/kotlin/com/miruplay/tv/ui/settings/SettingsViewModelTokenTest.kt index 1043acc7..39619153 100644 --- a/ui-tv/src/test/kotlin/com/miruplay/tv/ui/settings/SettingsViewModelTokenTest.kt +++ b/ui-tv/src/test/kotlin/com/miruplay/tv/ui/settings/SettingsViewModelTokenTest.kt @@ -8,6 +8,7 @@ import com.miruplay.tv.data.preferences.ScanPreferencesManager import com.miruplay.tv.mediasource.MediaSourceFactory import com.miruplay.tv.model.CloudDriveAutomationConfig import com.miruplay.tv.model.EpisodeVersionSelectionPolicy +import com.miruplay.tv.model.AudioBalanceLevel import com.miruplay.tv.model.AudioDspConfig import com.miruplay.tv.model.FormatAwareToneMappingPreferences import com.miruplay.tv.model.MusicSrcBypassMode @@ -110,6 +111,7 @@ class SettingsViewModelTokenTest { every { playbackPreferences.formatAwareToneMappingPreferences } returns FormatAwareToneMappingPreferences() every { playbackPreferences.audioDspConfig } returns AudioDspConfig.neutral() every { playbackPreferences.musicSrcBypassMode } returns MusicSrcBypassMode.SOFTWARE + every { playbackPreferences.audioBalanceLevel } returns AudioBalanceLevel.OFF every { webControlPreferences.webControlEnabled } returns false every { webControlPreferences.accessToken } returns "test-token"