Drop support for playback of partially encrypted content

tidal-music · Aug 21, 2024 · 90620b7 · 90620b7
1 parent bcdf084
commit 90620b7
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 273 deletions.
diff --git a/...droidTest/kotlin/com/tidal/sdk/player/playbackengine/ExoPlayerPlaybackEngineLooperTest.kt b/...droidTest/kotlin/com/tidal/sdk/player/playbackengine/ExoPlayerPlaybackEngineLooperTest.kt
@@ -41,7 +41,7 @@ internal class ExoPlayerPlaybackEngineLooperTest {
         TrueTimeWrapper(),
         mock(),
         mock(),
-        mock(),
+        null,
         Base64Codec(),
         Dispatchers.IO,
         CoroutineScope(Dispatchers.IO),

diff --git a/player/playback-engine/src/main/kotlin/com/tidal/sdk/player/playbackengine/Encryption.kt b/player/playback-engine/src/main/kotlin/com/tidal/sdk/player/playbackengine/Encryption.kt
diff --git a/...ck-engine/src/main/kotlin/com/tidal/sdk/player/playbackengine/PlaybackEngineModuleRoot.kt b/...ck-engine/src/main/kotlin/com/tidal/sdk/player/playbackengine/PlaybackEngineModuleRoot.kt
@@ -45,7 +45,7 @@ class PlaybackEngineModuleRoot(
     trueTimeWrapper: TrueTimeWrapper,
     playbackPrivilegeProvider: PlaybackPrivilegeProvider,
     offlineCacheProvider: OfflineCacheProvider?,
-    encryption: Encryption?,
+    offlineSecretKey: ByteArray?,
     base64Codec: Base64Codec,
     coroutineDispatcher: CoroutineDispatcher,
     coroutineScope: CoroutineScope,
@@ -72,7 +72,7 @@ class PlaybackEngineModuleRoot(
             trueTimeWrapper,
             playbackPrivilegeProvider,
             offlineCacheProvider,
-            encryption,
+            offlineSecretKey,
             base64Codec,
             coroutineDispatcher,
             coroutineScope,

diff --git a/...m/tidal/sdk/player/playbackengine/datasource/CacheKeyAesCipherDataSourceFactoryFactory.kt b/...m/tidal/sdk/player/playbackengine/datasource/CacheKeyAesCipherDataSourceFactoryFactory.kt
@@ -3,18 +3,17 @@ package com.tidal.sdk.player.playbackengine.datasource
 import androidx.media3.datasource.cache.Cache
 import androidx.media3.datasource.cache.CacheDataSource
 import androidx.media3.datasource.cache.CacheKeyFactory
-import com.tidal.sdk.player.playbackengine.Encryption
 import com.tidal.sdk.player.playbackengine.offline.crypto.CacheKeyAesCipherDataSourceFactory
 
 internal class CacheKeyAesCipherDataSourceFactoryFactory(
     private val cacheDataSourceFactory: CacheDataSource.Factory,
     private val cacheKeyFactory: CacheKeyFactory,
-    private val encryption: Encryption?,
+    private val offlineSecretKey: ByteArray?,
 ) {
 
     fun create(cache: Cache) = CacheKeyAesCipherDataSourceFactory(
         cacheKeyFactory,
-        encryption!!.secretKey,
+        offlineSecretKey,
         cacheDataSourceFactory.setCache(cache)
             .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR),
     )

diff --git a/...rc/main/kotlin/com/tidal/sdk/player/playbackengine/di/ExoPlayerPlaybackEngineComponent.kt b/...rc/main/kotlin/com/tidal/sdk/player/playbackengine/di/ExoPlayerPlaybackEngineComponent.kt
@@ -8,7 +8,6 @@ import com.tidal.sdk.player.common.UUIDWrapper
 import com.tidal.sdk.player.commonandroid.Base64Codec
 import com.tidal.sdk.player.commonandroid.TrueTimeWrapper
 import com.tidal.sdk.player.events.EventReporter
-import com.tidal.sdk.player.playbackengine.Encryption
 import com.tidal.sdk.player.playbackengine.PlaybackEngine
 import com.tidal.sdk.player.playbackengine.model.AssetTimeoutConfig
 import com.tidal.sdk.player.playbackengine.model.BufferConfiguration
@@ -58,7 +57,7 @@ interface ExoPlayerPlaybackEngineComponent {
             @BindsInstance trueTimeWrapper: TrueTimeWrapper,
             @BindsInstance playbackPrivilegeProvider: PlaybackPrivilegeProvider,
             @BindsInstance offlineCacheProvider: OfflineCacheProvider?,
-            @BindsInstance encryption: Encryption?,
+            @BindsInstance offlineSecretKey: ByteArray?,
             @BindsInstance base64Codec: Base64Codec,
             @BindsInstance coroutineDispatcher: CoroutineDispatcher,
             @BindsInstance coroutineScope: CoroutineScope,

diff --git a/...r/playbackengine/mediasource/PlayerDecryptedHeaderProgressiveOfflineMediaSourceFactory.kt b/...r/playbackengine/mediasource/PlayerDecryptedHeaderProgressiveOfflineMediaSourceFactory.kt
diff --git a/...rc/main/kotlin/com/tidal/sdk/player/playbackengine/mediasource/TidalMediaSourceCreator.kt b/...rc/main/kotlin/com/tidal/sdk/player/playbackengine/mediasource/TidalMediaSourceCreator.kt
@@ -15,7 +15,6 @@ internal class TidalMediaSourceCreator(
     private val playerProgressiveMediaSourceFactory: PlayerProgressiveMediaSourceFactory,
     private val playerDashMediaSourceFactory: PlayerDashMediaSourceFactory,
     private val playerHlsMediaSourceFactory: PlayerHlsMediaSourceFactory,
-    @Suppress("MaxLineLength") private val playerDecryptedHeaderProgressiveOfflineMediaSourceFactory: PlayerDecryptedHeaderProgressiveOfflineMediaSourceFactory, // ktlint-disable max-line-length parameter-wrapping
     @Suppress("MaxLineLength") private val playerProgressiveOfflineMediaSourceFactory: PlayerProgressiveOfflineMediaSourceFactory, // ktlint-disable max-line-length parameter-wrapping
     private val playerDashOfflineMediaSourceFactory: PlayerDashOfflineMediaSourceFactory,
     private val drmSessionManagerFactory: DrmSessionManagerFactory,
@@ -26,35 +25,23 @@ internal class TidalMediaSourceCreator(
     override fun invoke(mediaItem: MediaItem, playbackInfo: PlaybackInfo): MediaSource {
         return if (playbackInfo is PlaybackInfo.Offline) {
             when (playbackInfo.manifestMimeType) {
-                ManifestMimeType.BTS -> {
-                    if (playbackInfo.partiallyEncrypted) {
-                        playerDecryptedHeaderProgressiveOfflineMediaSourceFactory.create(
-                            mediaItem,
-                            playbackInfo.manifest,
-                            playbackInfo.productId,
-                        )
-                    } else {
-                        playerProgressiveOfflineMediaSourceFactory.create(
-                            mediaItem,
-                            playbackInfo.manifest,
-                            playbackInfo.storage!!,
-                        )
-                    }
-                }
+                ManifestMimeType.BTS -> playerProgressiveOfflineMediaSourceFactory.create(
+                    mediaItem,
+                    playbackInfo.manifest,
+                    playbackInfo.storage!!,
+                )
 
-                ManifestMimeType.DASH -> {
-                    playerDashOfflineMediaSourceFactory.create(
-                        mediaItem,
-                        playbackInfo.manifest,
-                        playbackInfo.offlineLicense!!,
-                        playbackInfo.storage!!,
-                        drmSessionManagerProviderFactory.create(
-                            drmSessionManagerFactory.createDrmSessionManagerForOfflinePlay(
-                                playbackInfo,
-                            ),
+                ManifestMimeType.DASH -> playerDashOfflineMediaSourceFactory.create(
+                    mediaItem,
+                    playbackInfo.manifest,
+                    playbackInfo.offlineLicense!!,
+                    playbackInfo.storage!!,
+                    drmSessionManagerProviderFactory.create(
+                        drmSessionManagerFactory.createDrmSessionManagerForOfflinePlay(
+                            playbackInfo,
                         ),
-                    )
-                }
+                    ),
+                )
 
                 else -> throw IllegalArgumentException(
                     "No valid manifestMimeType for offline playback: " +
@@ -99,11 +86,4 @@ internal class TidalMediaSourceCreator(
             }
         }
     }
-
-    private val PlaybackInfo.Offline.productId: String
-        get() = when (this) {
-            is PlaybackInfo.Offline.Track -> track.trackId.toString()
-            is PlaybackInfo.Offline.Video -> video.videoId.toString()
-            else -> throw IllegalArgumentException("Not a valid delegate for PlaybackInfo.Offline")
-        }
 }
diff --git a/.../com/tidal/sdk/player/playbackengine/offline/crypto/CacheKeyAesCipherDataSourceFactory.kt b/.../com/tidal/sdk/player/playbackengine/offline/crypto/CacheKeyAesCipherDataSourceFactory.kt
@@ -29,12 +29,12 @@ import androidx.media3.datasource.cache.CacheKeyFactory
  */
 class CacheKeyAesCipherDataSourceFactory(
     private val cacheKeyFactory: CacheKeyFactory,
-    private val secretKey: ByteArray,
+    private val secretKey: ByteArray?,
     private val upstream: DataSource.Factory,
 ) : DataSource.Factory {
 
     override fun createDataSource(): DataSource {
-        val aesCipherDataSource = AesCipherDataSource(secretKey, upstream.createDataSource())
+        val aesCipherDataSource = AesCipherDataSource(secretKey!!, upstream.createDataSource())
         return CacheKeyAesCipherDataSource(cacheKeyFactory, aesCipherDataSource)
     }
 }
diff --git a/...ine/src/main/kotlin/com/tidal/sdk/player/playbackengine/player/di/MediaSourcererModule.kt b/...ine/src/main/kotlin/com/tidal/sdk/player/playbackengine/player/di/MediaSourcererModule.kt
@@ -28,7 +28,6 @@ import com.tidal.sdk.player.common.UUIDWrapper
 import com.tidal.sdk.player.commonandroid.Base64Codec
 import com.tidal.sdk.player.commonandroid.TrueTimeWrapper
 import com.tidal.sdk.player.events.EventReporter
-import com.tidal.sdk.player.playbackengine.Encryption
 import com.tidal.sdk.player.playbackengine.PlayerLoadErrorHandlingPolicy
 import com.tidal.sdk.player.playbackengine.StreamingApiRepository
 import com.tidal.sdk.player.playbackengine.TidalExtractorsFactory
@@ -49,7 +48,6 @@ import com.tidal.sdk.player.playbackengine.mediasource.MediaSourcerer
 import com.tidal.sdk.player.playbackengine.mediasource.PlaybackInfoMediaSourceFactory
 import com.tidal.sdk.player.playbackengine.mediasource.PlayerDashMediaSourceFactory
 import com.tidal.sdk.player.playbackengine.mediasource.PlayerDashOfflineMediaSourceFactory
-import com.tidal.sdk.player.playbackengine.mediasource.PlayerDecryptedHeaderProgressiveOfflineMediaSourceFactory
 import com.tidal.sdk.player.playbackengine.mediasource.PlayerHlsMediaSourceFactory
 import com.tidal.sdk.player.playbackengine.mediasource.PlayerProgressiveMediaSourceFactory
 import com.tidal.sdk.player.playbackengine.mediasource.PlayerProgressiveOfflineMediaSourceFactory
@@ -239,11 +237,11 @@ internal object MediaSourcererModule {
         @Named("cacheDataSourceFactoryForOfflinePlay")
         cacheDataSourceFactory: CacheDataSource.Factory,
         cacheKeyFactory: CacheKeyFactory,
-        encryption: Encryption?,
+        offlineSecretKey: ByteArray?,
     ) = CacheKeyAesCipherDataSourceFactoryFactory(
         cacheDataSourceFactory,
         cacheKeyFactory,
-        encryption,
+        offlineSecretKey,
     )
 
     @Provides
@@ -295,20 +293,6 @@ internal object MediaSourcererModule {
         upstream: FileDataSource.Factory,
     ) = DecryptedHeaderFileDataSourceFactoryFactory(upstream)
 
-    @Provides
-    @Reusable
-    fun playerDecryptedHeaderProgressiveOfflineMediaSourceFactory(
-        progressiveMediaSourceFactoryFactory: ProgressiveMediaSourceFactoryFactory,
-        decryptedHeaderFileDataSourceFactoryFactory: DecryptedHeaderFileDataSourceFactoryFactory,
-        encryption: Encryption?,
-        btsManifestFactory: DefaultBtsManifestFactory,
-    ) = PlayerDecryptedHeaderProgressiveOfflineMediaSourceFactory(
-        progressiveMediaSourceFactoryFactory,
-        decryptedHeaderFileDataSourceFactoryFactory,
-        encryption,
-        btsManifestFactory,
-    )
-
     @Provides
     @Reusable
     fun dashManifestParser(): ParsingLoadable.Parser<DashManifest> = DashManifestParser()
@@ -440,7 +424,6 @@ internal object MediaSourcererModule {
         playerProgressiveMediaSourceFactory: PlayerProgressiveMediaSourceFactory,
         playerDashMediaSourceFactory: PlayerDashMediaSourceFactory,
         playerHlsMediaSourceFactory: PlayerHlsMediaSourceFactory,
-        @Suppress("MaxLineLength") playerDecryptedHeaderProgressiveOfflineMediaSourceFactory: PlayerDecryptedHeaderProgressiveOfflineMediaSourceFactory, // ktlint-disable max-line-length parameter-wrapping
         playerProgressiveOfflineMediaSourceFactory: PlayerProgressiveOfflineMediaSourceFactory,
         playerDashOfflineMediaSourceFactory: PlayerDashOfflineMediaSourceFactory,
         drmSessionManagerFactory: DrmSessionManagerFactory,
@@ -449,7 +432,6 @@ internal object MediaSourcererModule {
         playerProgressiveMediaSourceFactory,
         playerDashMediaSourceFactory,
         playerHlsMediaSourceFactory,
-        playerDecryptedHeaderProgressiveOfflineMediaSourceFactory,
         playerProgressiveOfflineMediaSourceFactory,
         playerDashOfflineMediaSourceFactory,
         drmSessionManagerFactory,

diff --git a/...aybackengine/mediasource/PlayerDecryptedHeaderProgressiveOfflineMediaSourceFactoryTest.kt b/...aybackengine/mediasource/PlayerDecryptedHeaderProgressiveOfflineMediaSourceFactoryTest.kt