Clean up the player and made playing videos better

brahmkshatriya · Dec 13, 2024 · ef208bb · ef208bb
1 parent 2552ee0
commit ef208bb
Show file tree

Hide file tree

Showing 23 changed files with 162 additions and 797 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -54,8 +54,8 @@ dependencies {
 
     implementation("androidx.fragment:fragment-ktx:1.6.2")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7")
-    implementation("androidx.paging:paging-common-ktx:3.3.4")
-    implementation("androidx.paging:paging-runtime-ktx:3.3.4")
+    implementation("androidx.paging:paging-common-ktx:3.3.5")
+    implementation("androidx.paging:paging-runtime-ktx:3.3.5")
     implementation("androidx.preference:preference-ktx:1.2.1")
 
     implementation("androidx.room:room-runtime:2.6.1")
@@ -84,7 +84,6 @@ dependencies {
     implementation("com.github.bosphere.android-fadingedgelayout:fadingedgelayout:1.0.0")
     implementation("me.zhanghai.android.fastscroll:library:1.3.0")
     implementation("com.flaviofaria:kenburnsview:1.0.7")
-    implementation("com.github.paramsen:noise:2.0.0")
 
     testImplementation("org.jetbrains.kotlin:kotlin-reflect:1.9.24")
     testImplementation("junit:junit:4.13.2")

diff --git a/app/src/main/java/dev/brahmkshatriya/echo/PlayerService.kt b/app/src/main/java/dev/brahmkshatriya/echo/PlayerService.kt
@@ -27,7 +27,6 @@ import dev.brahmkshatriya.echo.playback.listeners.PlayerEventListener
 import dev.brahmkshatriya.echo.playback.listeners.Radio
 import dev.brahmkshatriya.echo.playback.listeners.TrackingListener
 import dev.brahmkshatriya.echo.playback.loading.StreamableMediaSource
-import dev.brahmkshatriya.echo.playback.render.FFTAudioProcessor
 import dev.brahmkshatriya.echo.playback.render.PlayerBitmapLoader
 import dev.brahmkshatriya.echo.playback.render.RenderersFactory
 import dev.brahmkshatriya.echo.ui.settings.AudioFragment.AudioPreference.Companion.CLOSE_PLAYER
@@ -69,9 +68,6 @@ class PlayerService : MediaLibraryService() {
     @Inject
     lateinit var currentServers: MutableStateFlow<Map<String, Streamable.Media.Server>>
 
-    @Inject
-    lateinit var fftAudioProcessor: FFTAudioProcessor
-
     private val scope = CoroutineScope(Dispatchers.Main)
 
     @OptIn(UnstableApi::class)
@@ -93,7 +89,7 @@ class PlayerService : MediaLibraryService() {
         )
 
         ExoPlayer.Builder(this, factory)
-            .setRenderersFactory(RenderersFactory(this, fftAudioProcessor))
+            .setRenderersFactory(RenderersFactory(this))
             .setHandleAudioBecomingNoisy(true)
             .setWakeMode(C.WAKE_MODE_NETWORK)
             .setSkipSilenceEnabled(settings.getBoolean(SKIP_SILENCE, true))

diff --git a/app/src/main/java/dev/brahmkshatriya/echo/di/AppModule.kt b/app/src/main/java/dev/brahmkshatriya/echo/di/AppModule.kt
@@ -17,7 +17,6 @@ import dev.brahmkshatriya.echo.common.models.Streamable
 import dev.brahmkshatriya.echo.db.models.UserEntity
 import dev.brahmkshatriya.echo.playback.Current
 import dev.brahmkshatriya.echo.playback.listeners.Radio
-import dev.brahmkshatriya.echo.playback.render.FFTAudioProcessor
 import dev.brahmkshatriya.echo.ui.settings.AudioFragment.AudioPreference.Companion.CACHE_SIZE
 import dev.brahmkshatriya.echo.viewmodels.SnackBar
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -77,8 +76,4 @@ class AppModule {
     @Provides
     @Singleton
     fun provideExtensionListFlow() = MutableStateFlow<Radio.State>(Radio.State.Empty)
-
-    @Provides
-    @Singleton
-    fun providesAudioProcessor() = FFTAudioProcessor()
 }
diff --git a/app/src/main/java/dev/brahmkshatriya/echo/offline/TestExtension.kt b/app/src/main/java/dev/brahmkshatriya/echo/offline/TestExtension.kt
@@ -86,7 +86,7 @@ class TestExtension : ExtensionClient, LoginClient.UsernamePassword, TrackClient
             Streamable.MediaType.Server -> {
                 val srcs = Srcs.valueOf(streamable.id)
                 when (srcs) {
-                    Srcs.Single -> throw Exception("Single source not supported")
+                    Srcs.Single -> FUN.toServerMedia()
                     Srcs.Merged -> Streamable.Media.Server(
                         listOf(
                             BUNNY.toSource(),

diff --git a/app/src/main/java/dev/brahmkshatriya/echo/playback/render/FFTAudioProcessor.kt b/app/src/main/java/dev/brahmkshatriya/echo/playback/render/FFTAudioProcessor.kt
diff --git a/app/src/main/java/dev/brahmkshatriya/echo/playback/render/RenderersFactory.kt b/app/src/main/java/dev/brahmkshatriya/echo/playback/render/RenderersFactory.kt
@@ -2,7 +2,6 @@ package dev.brahmkshatriya.echo.playback.render
 
 import android.content.Context
 import androidx.annotation.OptIn
-import androidx.media3.common.audio.AudioProcessor
 import androidx.media3.common.audio.SonicAudioProcessor
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.DefaultRenderersFactory
@@ -11,8 +10,7 @@ import androidx.media3.exoplayer.audio.SilenceSkippingAudioProcessor
 
 @OptIn(UnstableApi::class)
 class RenderersFactory(
-    context: Context,
-    private val audioProcessor: AudioProcessor
+    context: Context
 ) : DefaultRenderersFactory(context) {
     override fun buildAudioSink(
         context: Context,
@@ -32,7 +30,7 @@ class RenderersFactory(
             .setEnableAudioTrackPlaybackParams(enableAudioTrackPlaybackParams)
             .setAudioProcessorChain(
                 DefaultAudioSink.DefaultAudioProcessorChain(
-                    arrayOf(audioProcessor), silenceSkippingAudioProcessor, SonicAudioProcessor()
+                    emptyArray(), silenceSkippingAudioProcessor, SonicAudioProcessor()
                 )
             )
             .build()