StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
refactor(player): own live audio encoding model
David Nashash5fe40f844d1c
diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/translation/LiveTranslationSession.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/translation/LiveTranslationSession.ktindex 1d73c7a8..74baa54f 100644--- a/feature/playback/src/main/java/com/streamvault/feature/playback/translation/LiveTranslationSession.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/translation/LiveTranslationSession.kt@@ -1,10 +1,8 @@-@file:androidx.media3.common.util.UnstableApi-package com.streamvault.feature.playback.translation-import androidx.media3.common.Cimport com.streamvault.player.LiveAudioPcmBufferimport com.streamvault.player.PlayerEngine+import com.streamvault.player.PlayerPcmEncodingimport java.io.ByteArrayOutputStreamimport kotlin.coroutines.coroutineContextimport kotlinx.coroutines.CoroutineScope@@ -217,7 +215,7 @@ internal suspend fun runCaptionDisplayLoop(}}-private data class ConvertedPcmChunk(+internal data class ConvertedPcmChunk(val data: ByteArray,val startMs: Long,val endMs: Long@@ -233,8 +231,8 @@ private fun newAudioChannel(): Channel<LiveAudioPcmBuffer> = Channel(// — show the most current state rather than replaying stale revisions.private fun newCaptionChannel(): Channel<CaptionTick> = Channel(Channel.CONFLATED)-private fun convertToPcm16Mono16k(buffer: LiveAudioPcmBuffer, fallbackStartMs: Long): ConvertedPcmChunk? {- if (buffer.encoding != C.ENCODING_PCM_16BIT || buffer.sampleRate <= 0 || buffer.channelCount <= 0) {+internal fun convertToPcm16Mono16k(buffer: LiveAudioPcmBuffer, fallbackStartMs: Long): ConvertedPcmChunk? {+ if (buffer.encoding != PlayerPcmEncoding.PCM_16_BIT || buffer.sampleRate <= 0 || buffer.channelCount <= 0) {return null}val inputFrameSize = buffer.channelCount * TARGET_BYTES_PER_SAMPLEdiff --git a/feature/playback/src/test/java/com/streamvault/feature/playback/translation/LiveTranslationPcmConversionTest.kt b/feature/playback/src/test/java/com/streamvault/feature/playback/translation/LiveTranslationPcmConversionTest.ktnew file mode 100644index 00000000..e5cc2bc6--- /dev/null+++ b/feature/playback/src/test/java/com/streamvault/feature/playback/translation/LiveTranslationPcmConversionTest.kt@@ -0,0 +1,42 @@+package com.streamvault.feature.playback.translation++import com.google.common.truth.Truth.assertThat+import com.streamvault.player.LiveAudioPcmBuffer+import com.streamvault.player.PlayerPcmEncoding+import org.junit.Test++class LiveTranslationPcmConversionTest {+ @Test+ fun `translation rejects unsupported player PCM encoding`() {+ val result = convertToPcm16Mono16k(+ buffer = LiveAudioPcmBuffer(+ data = byteArrayOf(0, 0),+ presentationTimeUs = 0,+ sampleRate = 16_000,+ channelCount = 1,+ encoding = PlayerPcmEncoding.UNSUPPORTED+ ),+ fallbackStartMs = 0+ )++ assertThat(result).isNull()+ }++ @Test+ fun `translation accepts player 16 bit PCM`() {+ val result = convertToPcm16Mono16k(+ buffer = LiveAudioPcmBuffer(+ data = byteArrayOf(1, 0),+ presentationTimeUs = 0,+ sampleRate = 16_000,+ channelCount = 1,+ encoding = PlayerPcmEncoding.PCM_16_BIT+ ),+ fallbackStartMs = 123+ )++ assertThat(result).isNotNull()+ assertThat(result!!.data).isEqualTo(byteArrayOf(1, 0))+ assertThat(result.startMs).isEqualTo(123)+ }+}diff --git a/player/src/main/java/com/streamvault/player/LiveAudioTap.kt b/player/src/main/java/com/streamvault/player/LiveAudioTap.ktindex 80f3e89b..531c4a93 100644--- a/player/src/main/java/com/streamvault/player/LiveAudioTap.kt+++ b/player/src/main/java/com/streamvault/player/LiveAudioTap.kt@@ -1,11 +1,16 @@package com.streamvault.player+enum class PlayerPcmEncoding {+ PCM_16_BIT,+ UNSUPPORTED+}+data class LiveAudioPcmBuffer(val data: ByteArray,val presentationTimeUs: Long,val sampleRate: Int,val channelCount: Int,- val encoding: Int+ val encoding: PlayerPcmEncoding)fun interface LiveAudioTap {diff --git a/player/src/main/java/com/streamvault/player/playback/LiveAudioTapAudioSink.kt b/player/src/main/java/com/streamvault/player/playback/LiveAudioTapAudioSink.ktindex 97c113ba..206133fa 100644--- a/player/src/main/java/com/streamvault/player/playback/LiveAudioTapAudioSink.kt+++ b/player/src/main/java/com/streamvault/player/playback/LiveAudioTapAudioSink.kt@@ -6,8 +6,16 @@ import androidx.media3.common.util.UnstableApiimport androidx.media3.exoplayer.audio.AudioSinkimport com.streamvault.player.LiveAudioPcmBufferimport com.streamvault.player.LiveAudioTap+import com.streamvault.player.PlayerPcmEncodingimport java.nio.ByteBuffer+internal fun toPlayerPcmEncoding(encoding: Int): PlayerPcmEncoding =+ if (encoding == C.ENCODING_PCM_16BIT) {+ PlayerPcmEncoding.PCM_16_BIT+ } else {+ PlayerPcmEncoding.UNSUPPORTED+ }+@UnstableApiinternal class LiveAudioTapAudioSink(private val delegate: AudioSink,@@ -43,7 +51,8 @@ internal class LiveAudioTapAudioSink(presentationTimeUs: Long) {val tap = tapProvider() ?: return- if (encoding != C.ENCODING_PCM_16BIT || sampleRate <= 0 || channelCount <= 0 || endPosition <= startPosition) {+ val playerEncoding = toPlayerPcmEncoding(encoding)+ if (playerEncoding == PlayerPcmEncoding.UNSUPPORTED || sampleRate <= 0 || channelCount <= 0 || endPosition <= startPosition) {return}val adjustedPresentationTimeUs = presentationTimeUs + consumedOffsetUs(startPosition)@@ -59,7 +68,7 @@ internal class LiveAudioTapAudioSink(presentationTimeUs = adjustedPresentationTimeUs,sampleRate = sampleRate,channelCount = channelCount,- encoding = encoding+ encoding = playerEncoding))}diff --git a/player/src/test/java/com/streamvault/player/playback/PlayerPcmEncodingTest.kt b/player/src/test/java/com/streamvault/player/playback/PlayerPcmEncodingTest.ktnew file mode 100644index 00000000..e56b808e--- /dev/null+++ b/player/src/test/java/com/streamvault/player/playback/PlayerPcmEncodingTest.kt@@ -0,0 +1,22 @@+package com.streamvault.player.playback++import androidx.media3.common.C+import com.google.common.truth.Truth.assertThat+import com.streamvault.player.PlayerPcmEncoding+import org.junit.Test++class PlayerPcmEncodingTest {+ @Test+ fun `16 bit Media3 PCM maps to player 16 bit encoding`() {+ assertThat(toPlayerPcmEncoding(C.ENCODING_PCM_16BIT))+ .isEqualTo(PlayerPcmEncoding.PCM_16_BIT)+ }++ @Test+ fun `all other Media3 encodings map to unsupported`() {+ assertThat(toPlayerPcmEncoding(C.ENCODING_PCM_FLOAT))+ .isEqualTo(PlayerPcmEncoding.UNSUPPORTED)+ assertThat(toPlayerPcmEncoding(C.ENCODING_INVALID))+ .isEqualTo(PlayerPcmEncoding.UNSUPPORTED)+ }+}