feat: implement sabr streaming

app/build.gradle.kts

@@ -1,3 +1,5 @@
+import com.google.protobuf.gradle.id
+
 plugins {
     id("com.android.application")
     id("kotlin-android")
@@ -6,6 +8,7 @@ plugins {
     id("androidx.navigation.safeargs.kotlin")
     alias(libs.plugins.baselineprofile)
     alias(libs.plugins.ksp)
+    alias(libs.plugins.google.protobuf)
 }
 
 android {
@@ -136,6 +139,8 @@ dependencies {
     implementation(libs.kotlinx.serialization)
     implementation(libs.kotlinx.datetime)
     implementation(libs.converter.kotlinx.serialization)
+    implementation(libs.google.protobuf.javalite)
+    implementation(libs.google.protobuf.kotlin.lite)
 
     /* NewPipe Extractor */
     implementation(libs.newpipeextractor)
@@ -160,3 +165,23 @@ dependencies {
     /* Testing */
     testImplementation(libs.junit)
 }
+
+//TODO: exclude from release protobuf
+protobuf {
+    protoc {
+        artifact = libs.protobuf.protoc.get().toString()
+    }
+    generateProtoTasks {
+        all().forEach { task ->
+            task.plugins {
+                //TODO: only generate kotlin code
+                id("java") {
+                    option("lite")
+                }
+//                id("kotlin") {
+//                    option("lite")
+//                }
+            }
+        }
+    }
+}

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

@@ -70,7 +70,10 @@ private fun VideoStream.toPipedStream() = PipedStream(
     indexStart = indexStart,
     indexEnd = indexEnd,
     fps = fps,
-    contentLength = itagItem?.contentLength ?: 0L
+    contentLength = itagItem?.contentLength ?: 0L,
+    itag = itagItem?.id,
+    lastModified = itagItem?.lastModified,
+    xtags = itagItem?.xtags,
 )
 
 private fun AudioStream.toPipedStream() = PipedStream(
@@ -89,7 +92,11 @@ private fun AudioStream.toPipedStream() = PipedStream(
     audioTrackName = audioTrackName,
     audioTrackLocale = audioLocale?.toLanguageTag(),
     audioTrackType = audioTrackType?.name,
-    videoOnly = false
+    videoOnly = false,
+    itag = itagItem?.id,
+    lastModified = itagItem?.lastModified,
+    isDrc = itagItem?.isDrc,
+    xtags = itagItem?.xtags,
 )
 
 fun StreamInfoItem.toStreamItem(
@@ -328,8 +335,8 @@ class NewPipeMediaServiceRepository : MediaServiceRepository {
                 )
             },
             audioStreams = resp.audioStreams.map { it.toPipedStream() },
-            videoStreams = resp.videoOnlyStreams.map { it.toPipedStream().copy(videoOnly = true) } +
-                    resp.videoStreams.map { it.toPipedStream().copy(videoOnly = false) },
+            videoStreams = resp.videoOnlyStreams.map { it.toPipedStream().copy(videoOnly = true,) },
+                    //+ resp.videoStreams.map { it.toPipedStream().copy(videoOnly = false) },
             previewFrames = resp.previewFrames.map {
                 PreviewFrames(
                     it.urls,
@@ -349,7 +356,9 @@ class NewPipeMediaServiceRepository : MediaServiceRepository {
                     it.languageTag,
                     it.isAutoGenerated
                 )
-            }
+            },
+            serverAbrStreamingUrl = resp.serverAbrStreamingUrl,
+            videoPlaybackUstreamerConfig = resp.ustreamerConfig,
         )
     }
 

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

@@ -29,7 +29,11 @@ data class PipedStream(
     val audioTrackId: String? = null,
     val contentLength: Long = -1,
     val audioTrackType: String? = null,
-    val audioTrackLocale: String? = null
+    val audioTrackLocale: String? = null,
+    val itag: Int? = null,
+    val lastModified: Long? = null,
+    val isDrc: Boolean? = null,
+    val xtags: String? = null,
 ): Parcelable {
     private fun getQualityString(videoId: String): String {
         return "${videoId}_${quality?.replace(" ", "_")}_$format." +

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

@@ -48,7 +48,9 @@ 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(),
+    val serverAbrStreamingUrl: String? = null,
+    val videoPlaybackUstreamerConfig: String? = null
 ): Parcelable {
     @IgnoredOnParcel
     val isLive = livestream || duration <= 0

app/src/main/java/com/github/libretube/api/poToken/PoTokenGenerator.kt

@@ -19,7 +19,6 @@ class PoTokenGenerator : PoTokenProvider {
 
     private object WebPoTokenGenLock
     private var webPoTokenVisitorData: String? = null
-    private var webPoTokenStreamingPot: String? = null
     private var webPoTokenGenerator: PoTokenWebView? = null
 
 
@@ -37,10 +36,7 @@ class PoTokenGenerator : PoTokenProvider {
      * [PoTokenGenerator.getWebClientPoToken] was called
      */
     private fun getWebClientPoToken(videoId: String, forceRecreate: Boolean): PoTokenResult {
-        // just a helper class since Kotlin does not have builtin support for 4-tuples
-        data class Quadruple<T1, T2, T3, T4>(val t1: T1, val t2: T2, val t3: T3, val t4: T4)
-
-        val (poTokenGenerator, visitorData, streamingPot, hasBeenRecreated) =
+        val (poTokenGenerator, visitorData, hasBeenRecreated) =
             synchronized(WebPoTokenGenLock) {
                 val shouldRecreate = webPoTokenGenerator == null || forceRecreate || webPoTokenGenerator!!.isExpired()
 
@@ -66,22 +62,17 @@ class PoTokenGenerator : PoTokenProvider {
                         // create a new webPoTokenGenerator
                         webPoTokenGenerator = PoTokenWebView
                             .newPoTokenGenerator(LibreTubeApp.instance)
-
-                        // The streaming poToken needs to be generated exactly once before generating
-                        // any other (player) tokens.
-                        webPoTokenStreamingPot = webPoTokenGenerator!!.generatePoToken(webPoTokenVisitorData!!)
                     }
                 }
 
-                return@synchronized Quadruple(
+                return@synchronized Triple(
                     webPoTokenGenerator!!,
                     webPoTokenVisitorData!!,
-                    webPoTokenStreamingPot!!,
                     shouldRecreate
                 )
             }
 
-        val playerPot = try {
+        val poToken = try {
             // Not using synchronized here, since poTokenGenerator would be able to generate
             // multiple poTokens in parallel if needed. The only important thing is for exactly one
             // visitorData/streaming poToken to be generated before anything else.
@@ -105,13 +96,11 @@ class PoTokenGenerator : PoTokenProvider {
 
         if (BuildConfig.DEBUG) {
             Log.d(
-                TAG,
-                "poToken for $videoId: playerPot=$playerPot, " +
-                        "streamingPot=$streamingPot, visitor_data=$visitorData"
+                TAG, "poToken for $videoId: $poToken, visitor_data=$visitorData"
             )
         }
 
-        return PoTokenResult(visitorData, playerPot, streamingPot)
+        return PoTokenResult(visitorData, poToken, poToken)
     }
 
     override fun getWebEmbedClientPoToken(videoId: String?): PoTokenResult? = null