StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
Restore audio renderer recovery
David Nashashdf5a492a02ff
diff --git a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.ktindex 2f45d371..abc03009 100644--- a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt+++ b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt@@ -30,9 +30,6 @@ import androidx.media3.exoplayer.ScrubbingModeParametersimport androidx.media3.exoplayer.analytics.AnalyticsListenerimport androidx.media3.exoplayer.audio.AudioSinkimport androidx.media3.exoplayer.audio.AudioRendererEventListener-import androidx.media3.exoplayer.audio.AudioTrackAudioOutputProvider-import androidx.media3.exoplayer.audio.DefaultAudioSink-import androidx.media3.exoplayer.audio.DefaultAudioTrackBufferSizeProviderimport androidx.media3.exoplayer.mediacodec.MediaCodecInfoimport androidx.media3.exoplayer.mediacodec.MediaCodecSelectorimport androidx.media3.exoplayer.video.MediaCodecVideoRenderer@@ -54,6 +51,7 @@ import com.streamvault.domain.model.VideoFormatimport com.streamvault.domain.repository.PlaybackCompatibilityRepositoryimport com.streamvault.player.audio.PlayerAudioFocusControllerimport com.streamvault.player.playback.ActiveDecoderPolicy+import com.streamvault.player.playback.AudioRendererRecoveryPolicyimport com.streamvault.player.playback.AdaptiveDecodePressurePolicyimport com.streamvault.player.playback.DecodePressureSampleimport com.streamvault.player.playback.DefaultDecoderPreferencePolicy@@ -275,6 +273,7 @@ class Media3PlayerEngine @Inject constructor(private var currentBufferPolicy: PlaybackBufferPolicy? = nullprivate var playbackLoadControl: PlaybackLoadControl? = nullprivate var audioCodecUnsupportedReported = false+ private val audioRendererRecoveryPolicy = AudioRendererRecoveryPolicy()private var lastSupportErrorMessage: String? = nullprivate val isLowMemoryPlaybackDevice: Boolean = run {val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as? ActivityManager@@ -1257,6 +1256,7 @@ class Media3PlayerEngine @Inject constructor(}private fun resetEngineState(restartCollectors: Boolean) {+ audioRendererRecoveryPolicy.reset()clearAdaptiveDecodePressure()retryJob?.cancel()retryJob = null@@ -1802,18 +1802,9 @@ class Media3PlayerEngine @Inject constructor(enableFloatOutput: Boolean,enableAudioTrackPlaybackParams: Boolean): AudioSink {- // Reduced the first-cue offset in the V13 emulator capture without an observed underrun.- val bufferSizeProvider = DefaultAudioTrackBufferSizeProvider.Builder()- .setTargetPcmBufferDurationUs(100_000)- .build()- val audioOutputProvider = AudioTrackAudioOutputProvider.Builder(context)- .setAudioTrackBufferSizeProvider(bufferSizeProvider)- .build()- val audioSink = DefaultAudioSink.Builder(context)- .setEnableFloatOutput(enableFloatOutput)- .setEnableAudioOutputPlaybackParameters(enableAudioTrackPlaybackParams)- .setAudioOutputProvider(audioOutputProvider)- .build()+ val audioSink = requireNotNull(+ super.buildAudioSink(context, enableFloatOutput, enableAudioTrackPlaybackParams)+ ) { "DefaultRenderersFactory did not provide an AudioSink." }val syncAwareSink = if (rendererPlan.useAudioVideoSyncSink) {audioVideoSyncSinkActive = trueAudioVideoOffsetAudioSink(@@ -1962,6 +1953,20 @@ class Media3PlayerEngine @Inject constructor()}+ override fun onAudioSinkError(+ eventTime: AnalyticsListener.EventTime,+ audioSinkError: Exception+ ) {+ handleAudioRendererIssue(audioSinkError, "audio-sink")+ }++ override fun onAudioCodecError(+ eventTime: AnalyticsListener.EventTime,+ audioCodecError: Exception+ ) {+ handleAudioRendererIssue(audioCodecError, "audio-codec")+ }+override fun onDroppedVideoFrames(eventTime: AnalyticsListener.EventTime,droppedFrames: Int,@@ -2602,6 +2607,50 @@ class Media3PlayerEngine @Inject constructor(currentResolvedStreamType)+ private fun handleAudioRendererIssue(error: Exception, source: String) {+ val streamInfo = lastStreamInfo ?: return+ val mediaId = lastMediaId ?: return+ if (isDisposed || exoPlayer?.playWhenReady != true) return+ if (!audioRendererRecoveryPolicy.shouldRecover(mediaId, SystemClock.elapsedRealtime())) {+ Log.w(+ TAG,+ "audio-renderer-recovery-suppressed source=$source target=${PlaybackLogSanitizer.sanitizeUrl(streamInfo.url)} " ++ "message=${PlaybackLogSanitizer.sanitizeMessage(error.message)}"+ )+ return+ }++ Log.w(+ TAG,+ "audio-renderer-recover source=$source target=${PlaybackLogSanitizer.sanitizeUrl(streamInfo.url)} " ++ "message=${PlaybackLogSanitizer.sanitizeMessage(error.message)}"+ )+ val playerAtError = exoPlayer+ val generationAtError = retryGeneration+ preloadPriorityHandler.post {+ if (isDisposed || exoPlayer !== playerAtError ||+ retryGeneration != generationAtError || lastMediaId != mediaId+ ) return@post+ if (source == "audio-codec" && tryFfmpegAudioFallback(+ trigger = "audio-renderer-$source",+ mimeTypes = audioMimeTypes(),+ detail = error.message+ )+ ) return@post++ val seekPosition = exoPlayer?.currentPosition?.takeIf {+ currentResolvedStreamType == ResolvedStreamType.PROGRESSIVE && it > 0L+ }+ recreatePlayer() // A new sink is required after an AudioTrack failure.+ prepareInternal(+ streamInfo = streamInfo,+ preserveRetryState = true,+ seekPositionMs = seekPosition,+ autoPlay = true+ )+ }+ }+private fun tryFfmpegAudioFallback(trigger: String,mimeTypes: List<String>,diff --git a/player/src/main/java/com/streamvault/player/playback/AudioRendererRecoveryPolicy.kt b/player/src/main/java/com/streamvault/player/playback/AudioRendererRecoveryPolicy.ktnew file mode 100644index 00000000..2b43d9c5--- /dev/null+++ b/player/src/main/java/com/streamvault/player/playback/AudioRendererRecoveryPolicy.kt@@ -0,0 +1,34 @@+package com.streamvault.player.playback++/** Limits audio renderer restarts without resetting the budget on each reprepare. */+internal class AudioRendererRecoveryPolicy(+ private val cooldownMs: Long = 15_000L,+ private val stableIntervalMs: Long = 5 * 60_000L,+ private val maxAttemptsPerMedia: Int = 2+) {+ private var mediaId: String? = null+ private var attempts = 0+ private var lastAttemptAtMs = Long.MIN_VALUE++ fun reset() {+ mediaId = null+ attempts = 0+ lastAttemptAtMs = Long.MIN_VALUE+ }++ fun shouldRecover(currentMediaId: String, nowMs: Long): Boolean {+ if (mediaId != currentMediaId) {+ mediaId = currentMediaId+ attempts = 0+ lastAttemptAtMs = Long.MIN_VALUE+ }+ if (lastAttemptAtMs != Long.MIN_VALUE && nowMs - lastAttemptAtMs >= stableIntervalMs) {+ attempts = 0+ }+ if (attempts >= maxAttemptsPerMedia) return false+ if (lastAttemptAtMs != Long.MIN_VALUE && nowMs - lastAttemptAtMs < cooldownMs) return false+ attempts+++ lastAttemptAtMs = nowMs+ return true+ }+}diff --git a/player/src/test/java/com/streamvault/player/playback/AudioRendererRecoveryPolicyTest.kt b/player/src/test/java/com/streamvault/player/playback/AudioRendererRecoveryPolicyTest.ktnew file mode 100644index 00000000..b79cecde--- /dev/null+++ b/player/src/test/java/com/streamvault/player/playback/AudioRendererRecoveryPolicyTest.kt@@ -0,0 +1,34 @@+package com.streamvault.player.playback++import org.junit.Assert.assertFalse+import org.junit.Assert.assertTrue+import org.junit.Test++class AudioRendererRecoveryPolicyTest {+ @Test fun duplicateCallbacksAndRepeatedFailuresAreBounded() {+ val policy = AudioRendererRecoveryPolicy()++ assertTrue(policy.shouldRecover("channel-a", 1_000L))+ assertFalse(policy.shouldRecover("channel-a", 1_001L))+ assertTrue(policy.shouldRecover("channel-a", 16_000L))+ assertFalse(policy.shouldRecover("channel-a", 32_000L))+ }++ @Test fun changingMediaOrResettingEngineRestoresBudget() {+ val policy = AudioRendererRecoveryPolicy(maxAttemptsPerMedia = 1)++ assertTrue(policy.shouldRecover("channel-a", 1_000L))+ assertFalse(policy.shouldRecover("channel-a", 20_000L))+ assertTrue(policy.shouldRecover("channel-b", 20_001L))+ policy.reset()+ assertTrue(policy.shouldRecover("channel-b", 20_002L))+ }++ @Test fun stablePlaybackRestoresBudgetForLongRunningLiveChannel() {+ val policy = AudioRendererRecoveryPolicy(maxAttemptsPerMedia = 1)++ assertTrue(policy.shouldRecover("channel-a", 1_000L))+ assertFalse(policy.shouldRecover("channel-a", 100_000L))+ assertTrue(policy.shouldRecover("channel-a", 301_000L))+ }+}