speedup

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

app/src/main/java/com/nextcloud/client/player/media3/PlaybackModel.kt

@@ -11,7 +11,6 @@ import android.content.ComponentName
 import android.content.Context
 import android.view.SurfaceView
 import androidx.annotation.OptIn
-import androidx.media3.common.Player
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.session.MediaController
 import androidx.media3.session.MediaSession
@@ -35,6 +34,7 @@ import com.nextcloud.client.player.util.PlayerUtil.updateMediaItems
 import com.owncloud.android.datamodel.OCFile
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.Flow
@@ -82,16 +82,20 @@ class PlaybackModel @Inject constructor(
     private val controllerListener = object : MediaController.Listener {
         override fun onDisconnected(controller: MediaController) {
             controller.removeListener(playerListener)
+            if (this@PlaybackModel.controller === controller) {
+                this@PlaybackModel.controller = null
+            }
             videoSurfaceView = null
             invalidateCurrentFiles()
-            controllerScope?.cancel()
+            stopFilesFlow()
             checkProgressPeriodicAction.stop()
             notifyPlaybackUpdate()
         }
     }
 
     private var controllerScope: CoroutineScope? = null
-    private var controller: Player? = null
+    private var controller: MediaController? = null
+    private var filesFlowJob: Job? = null
 
     private var mediaSession: MediaSession? = null
 
@@ -126,6 +130,12 @@ class PlaybackModel @Inject constructor(
     }
 
     suspend fun start() {
+        if (controller?.isConnected == true) {
+            return
+        }
+
+        releaseController()
+
         videoSurfaceView = null
         val sessionToken = SessionToken(context, ComponentName(context, PlaybackService::class.java))
         controller = MediaController.Builder(context, sessionToken)
@@ -136,8 +146,26 @@ class PlaybackModel @Inject constructor(
                 addListener(playerListener)
                 setRepeatMode(playbackSettings.repeatMode)
                 shuffleModeEnabled = playbackSettings.isShuffle
-                controllerScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
             }
+        controllerScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
+    }
+
+    private fun releaseController() {
+        stopFilesFlow()
+        checkProgressPeriodicAction.stop()
+        invalidateCurrentFiles()
+
+        val current = controller ?: return
+        controller = null
+        current.removeListener(playerListener)
+        current.release()
+    }
+
+    private fun stopFilesFlow() {
+        filesFlowJob?.cancel()
+        filesFlowJob = null
+        controllerScope?.cancel()
+        controllerScope = null
     }
 
     @Suppress("TooGenericExceptionCaught")
@@ -161,7 +189,8 @@ class PlaybackModel @Inject constructor(
     }
 
     fun setFilesFlow(filesFlow: Flow<PlaybackFiles>) {
-        controllerScope?.launch {
+        filesFlowJob?.cancel()
+        filesFlowJob = controllerScope?.launch {
             filesFlow
                 .catch {
                     notifyPlaybackError(it)
@@ -177,21 +206,22 @@ class PlaybackModel @Inject constructor(
             return
         }
 
-        controller?.let { controller ->
-            val currentFile = controller.currentMediaItem?.mediaMetadata?.playbackFile
-            val mediaItems = files.list.map { it.toMediaItem() }
-
-            if (currentFile == null) {
-                controller.setMediaItems(mediaItems)
-            } else if (files.list.any { it.id == currentFile.id }) {
-                controller.updateMediaItems(mediaItems)
-            } else {
-                val nextFileIndex = getNextFileIndex(files, currentFile)
-                controller.setMediaItems(mediaItems, nextFileIndex, 0)
-            }
+        val controller = controller ?: return
+        val mediaItems = files.list.map { it.toMediaItem() }
+
+        if (controller.readMediaIds() == mediaItems.map { it.mediaId }) {
+            return
+        }
 
-            controller.prepare()
+        val currentFile = controller.currentMediaItem?.mediaMetadata?.playbackFile
+
+        when {
+            currentFile == null -> controller.setMediaItems(mediaItems)
+            files.list.any { it.id == currentFile.id } -> controller.updateMediaItems(mediaItems)
+            else -> controller.setMediaItems(mediaItems, getNextFileIndex(files, currentFile), 0)
         }
+
+        controller.prepare()
     }
 
     private fun getNextFileIndex(files: PlaybackFiles, currentFile: PlaybackFile): Int = (files.list + currentFile)
@@ -201,7 +231,7 @@ class PlaybackModel @Inject constructor(
 
     fun release() {
         videoSurfaceView = null
-        controller?.release()
+        releaseController()
         mediaSession?.player?.release()
         mediaSession?.release()
         mediaSession = null

app/src/main/java/com/nextcloud/client/player/media3/datasource/PlaybackDataSourceFactory.kt

@@ -19,20 +19,21 @@ import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.network.ClientFactory
 import com.owncloud.android.MainApp
 import com.owncloud.android.datamodel.FileDataStorageManager
+import dagger.Lazy
 import javax.inject.Inject
 
 @UnstableApi
 class PlaybackDataSourceFactory @Inject constructor(
     private val context: Context,
-    private val cache: Cache,
+    private val cache: Lazy<Cache>,
     private val fileDataStorageManager: FileDataStorageManager,
     private val clientFactory: ClientFactory,
     private val accountManager: UserAccountManager
 ) : DataSource.Factory {
 
     override fun createDataSource(): DataSource = CacheDataSource.Factory()
         .setUpstreamDataSourceFactory(createUpstreamDataSourceFactory())
-        .setCache(cache)
+        .setCache(cache.get())
         .createDataSource()
 
     private fun createUpstreamDataSourceFactory() = DataSource.Factory {

app/src/main/java/com/nextcloud/client/player/ui/PlayerActivity.kt

@@ -69,8 +69,6 @@ class PlayerActivity :
 
     private var keepPlaybackAliveOnFinish = false
 
-    private var configurationChangedInPictureInPicture = false
-
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge()
         super.onCreate(savedInstanceState)
@@ -144,19 +142,12 @@ class PlayerActivity :
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
 
+        val videoPlayerView = playerView as? VideoPlayerView ?: return
         if (isInPictureInPictureMode) {
-            configurationChangedInPictureInPicture = true
-            (playerView as? VideoPlayerView)?.hideControls()
-            return
+            videoPlayerView.hideControls()
+        } else {
+            videoPlayerView.showControls()
         }
-
-        rebuildPlayerViewForCurrentConfiguration()
-    }
-
-    private fun rebuildPlayerViewForCurrentConfiguration() {
-        configurationChangedInPictureInPicture = false
-        recreatePlayerView()
-        (playerView as? VideoPlayerView)?.showControls()
     }
 
     override fun onUserLeaveHint() {
@@ -183,8 +174,8 @@ class PlayerActivity :
             return
         }
 
-        if (!isInPictureInPictureMode && configurationChangedInPictureInPicture) {
-            rebuildPlayerViewForCurrentConfiguration()
+        if (!isInPictureInPictureMode) {
+            (playerView as? VideoPlayerView)?.showControls()
         }
     }
 

app/src/main/java/com/nextcloud/client/player/ui/video/VideoFileFragment.kt

@@ -52,6 +52,8 @@ class VideoFileFragment :
     private var _binding: PlayerVideoFileFragmentBinding? = null
     private val binding get() = checkNotNull(_binding) { "Binding accessed outside of the view lifecycle" }
 
+    private var renderedVideoSize: VideoSize? = null
+
     private val file by lazy {
         requireNotNull(arguments.getPlaybackFile(ARGUMENT_FILE)) {
             "VideoFileFragment requires a $ARGUMENT_FILE argument"
@@ -115,6 +117,7 @@ class VideoFileFragment :
             return
         }
 
+        renderedVideoSize = null
         binding.surfaceView.isVisible = false
         if (currentItemState == null) {
             playerModel.setVideoSurfaceView(null)
@@ -125,11 +128,15 @@ class VideoFileFragment :
         if (ownsPlayback(binding.surfaceView)) {
             playerModel.setVideoSurfaceView(binding.surfaceView)
         }
+
+        val size = videoSize ?: renderedVideoSize
+        renderedVideoSize = size
+
         binding.surfaceView.isVisible = true
-        binding.surfaceView.alpha = if (videoSize == null) SURFACE_ALPHA_HIDDEN else SURFACE_ALPHA_VISIBLE
+        binding.surfaceView.alpha = if (size == null) SURFACE_ALPHA_HIDDEN else SURFACE_ALPHA_VISIBLE
 
-        if (videoSize == null) return
+        if (size == null) return
 
-        binding.surfaceView.applyVideoSize(videoSize)
+        binding.surfaceView.applyVideoSize(size)
     }
 }