feat: already set auto-fullscreen on shorts before rendering starts

Author: Bnyro

app/src/main/java/com/github/libretube/api/NewPipeMediaServiceRepository.kt

@@ -22,7 +22,6 @@ import com.github.libretube.api.obj.StreamItem.Companion.TYPE_STREAM
 import com.github.libretube.api.obj.Streams
 import com.github.libretube.api.obj.Subtitle
 import com.github.libretube.api.poToken.PoTokenGenerator
-import com.github.libretube.extensions.parallelMap
 import com.github.libretube.extensions.sha256Sum
 import com.github.libretube.extensions.toID
 import com.github.libretube.helpers.NewPipeExtractorInstance
@@ -48,9 +47,9 @@ import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem
 import org.schabi.newpipe.extractor.search.SearchInfo
 import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeStreamExtractor
 import org.schabi.newpipe.extractor.stream.AudioStream
+import org.schabi.newpipe.extractor.stream.ContentAvailability
 import org.schabi.newpipe.extractor.stream.StreamInfo
 import org.schabi.newpipe.extractor.stream.StreamInfoItem
-import org.schabi.newpipe.extractor.stream.ContentAvailability
 import org.schabi.newpipe.extractor.stream.VideoStream
 import kotlin.time.toKotlinInstant
 
@@ -348,7 +347,8 @@ class NewPipeMediaServiceRepository : MediaServiceRepository {
                     it.languageTag,
                     it.isAutoGenerated
                 )
-            }
+            },
+            isShort = resp.isShortFormContent
         )
     }
 

app/src/main/java/com/github/libretube/api/PipedMediaServiceRepository.kt

@@ -13,7 +13,6 @@ import com.github.libretube.api.obj.StreamItem
 import com.github.libretube.api.obj.Streams
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.helpers.PreferenceHelper
-import kotlinx.serialization.encodeToString
 import retrofit2.HttpException
 
 open class PipedMediaServiceRepository : MediaServiceRepository {
@@ -24,7 +23,11 @@ open class PipedMediaServiceRepository : MediaServiceRepository {
 
     override suspend fun getStreams(videoId: String): Streams {
         return try {
-            api.getStreams(videoId)
+            api.getStreams(videoId).also {
+                it.isShort = it.videoStreams.firstOrNull()?.let { stream ->
+                    (stream.height ?: 0) > (stream.width ?: 0)
+                } ?: false
+            }
         } catch (e: HttpException) {
             val errorMessage = e.response()?.errorBody()?.string()?.runCatching {
                 JsonHelper.json.decodeFromString<Message>(this).message

app/src/main/java/com/github/libretube/api/obj/Streams.kt

@@ -48,7 +48,8 @@ data class Streams(
     val proxyUrl: String? = null,
     val chapters: List<ChapterSegment> = emptyList(),
     val uploaderSubscriberCount: Long = 0,
-    val previewFrames: List<PreviewFrames> = emptyList()
+    val previewFrames: List<PreviewFrames> = emptyList(),
+    var isShort: Boolean = false
 ): Parcelable {
     @IgnoredOnParcel
     val isLive = livestream || duration <= 0

app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt

@@ -125,7 +125,7 @@ object PlayerHelper {
         }
     }
 
-    fun getOrientation(videoWidth: Int, videoHeight: Int): Int {
+    fun getFullscreenOrientation(isVerticalVideo: Boolean): Int {
         val fullscreenOrientationPref = PreferenceHelper.getString(
             PreferenceKeys.FULLSCREEN_ORIENTATION,
             "ratio"
@@ -134,7 +134,7 @@ object PlayerHelper {
         return when (fullscreenOrientationPref) {
             "ratio" -> {
                 // probably a youtube shorts video
-                if (videoHeight > videoWidth) {
+                if (isVerticalVideo) {
                     ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
                 } // a video with normal aspect ratio
                 else {

app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt

@@ -73,7 +73,6 @@ import com.github.libretube.extensions.updateIfChanged
 import com.github.libretube.helpers.BackgroundHelper
 import com.github.libretube.helpers.DownloadHelper
 import com.github.libretube.helpers.ImageHelper
-import com.github.libretube.helpers.NavBarHelper
 import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.helpers.PlayerHelper
 import com.github.libretube.helpers.PlayerHelper.getCurrentSegment
@@ -115,7 +114,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import kotlin.io.path.exists
-import kotlin.math.abs
 import kotlin.math.absoluteValue
 
 
@@ -142,15 +140,6 @@ class PlayerFragment : Fragment(R.layout.fragment_player), CustomPlayerCallback
 
     // data and objects stored for the player
     private lateinit var streams: Streams
-    private val isShort: Boolean
-        get() {
-            if (PlayingQueue.getCurrent()?.isShort == true) return true
-            if (!::playerController.isInitialized) return false
-
-            val currentVideoFormat = PlayerHelper.getCurrentVideoFormat(playerController)
-                ?: return false
-            return currentVideoFormat.height > currentVideoFormat.width
-        }
 
     private val handler = Handler(Looper.getMainLooper())
 
@@ -259,7 +248,6 @@ class PlayerFragment : Fragment(R.layout.fragment_player), CustomPlayerCallback
             }
         }
 
-        var fullscreenOnShortsAlreadyDone = false
         override fun onPlaybackStateChanged(playbackState: Int) {
             // set the playback speed to one if having reached the end of a livestream
             if (playbackState == Player.STATE_BUFFERING && binding.player.isLive &&
@@ -302,15 +290,6 @@ class PlayerFragment : Fragment(R.layout.fragment_player), CustomPlayerCallback
                 bufferingTimeoutTask?.let { handler.removeCallbacks(it) }
             }
 
-            if (playbackState == Player.STATE_READY && binding.playerMotionLayout.progress == 0f) {
-                if (PlayerHelper.autoFullscreenShortsEnabled && isShort && !fullscreenOnShortsAlreadyDone) {
-                    setFullscreen()
-                    fullscreenOnShortsAlreadyDone = true
-                }
-            }
-
-            if (playbackState == Player.STATE_ENDED) fullscreenOnShortsAlreadyDone = false
-
             super.onPlaybackStateChanged(playbackState)
         }
 
@@ -835,12 +814,7 @@ class PlayerFragment : Fragment(R.layout.fragment_player), CustomPlayerCallback
     private fun updateFullscreenOrientation() {
         if (PlayerHelper.autoFullscreenEnabled || !this::streams.isInitialized) return
 
-        val height = streams.videoStreams.firstOrNull()?.height
-            ?: playerController.videoSize.height
-        val width =
-            streams.videoStreams.firstOrNull()?.width ?: playerController.videoSize.width
-
-        baseActivity.requestedOrientation = PlayerHelper.getOrientation(width, height)
+        baseActivity.requestedOrientation = PlayerHelper.getFullscreenOrientation(streams.isShort)
     }
 
     private fun setFullscreen() {
@@ -1221,6 +1195,10 @@ class PlayerFragment : Fragment(R.layout.fragment_player), CustomPlayerCallback
             seekBarPreviewListener = listener
             playerControlsBinding.exoProgress.addSeekBarListener(listener)
         }
+
+        if (binding.playerMotionLayout.progress == 0f && PlayerHelper.autoFullscreenShortsEnabled && streams.isShort) {
+            setFullscreen()
+        }
     }
 
     private suspend fun showRelatedStreams() {
@@ -1472,6 +1450,6 @@ class PlayerFragment : Fragment(R.layout.fragment_player), CustomPlayerCallback
     }
 
     override fun isVideoShort(): Boolean {
-        return isShort
+        return streams.isShort
     }
 }