Ziad/new playback endpoints

player/playback-engine/src/androidTest/kotlin/com/tidal/sdk/player/playbackengine/ExoPlayerPlaybackEngineLooperTest.kt

@@ -25,6 +25,7 @@ internal class ExoPlayerPlaybackEngineLooperTest {
                 InstrumentationRegistry.getInstrumentation().targetContext,
                 mock(),
                 true,
+                false,
                 MutableSharedFlow(),
                 BufferConfiguration(),
                 AssetTimeoutConfig(),

player/playback-engine/src/main/kotlin/com/tidal/sdk/player/playbackengine/PlaybackEngineModuleRoot.kt

@@ -28,6 +28,7 @@ class PlaybackEngineModuleRoot(
     context: Context,
     connectivityManager: ConnectivityManager,
     useLibflacAudioRenderer: Boolean,
+    useTopPlaybackInfo: Boolean,
     events: MutableSharedFlow<Event>,
     bufferConfiguration: BufferConfiguration,
     assetTimeoutConfig: AssetTimeoutConfig,
@@ -61,6 +62,7 @@ class PlaybackEngineModuleRoot(
                 cacheProvider,
                 configuration,
                 useLibflacAudioRenderer,
+                useTopPlaybackInfo,
                 appSpecificCacheDir,
                 streamingApi,
                 okHttpClient,

player/playback-engine/src/main/kotlin/com/tidal/sdk/player/playbackengine/di/ExoPlayerPlaybackEngineComponent.kt

@@ -47,6 +47,7 @@ interface ExoPlayerPlaybackEngineComponent {
             @BindsInstance cacheProvider: CacheProvider,
             @BindsInstance configuration: Configuration,
             @BindsInstance @Named("useLibflacAudioRenderer") useLibflacAudioRenderer: Boolean,
+            @BindsInstance @Named("useTopPlaybackInfo") useTopPlaybackInfo: Boolean,
             @BindsInstance appSpecificCacheDir: File,
             @BindsInstance streamingApi: StreamingApi,
             @BindsInstance @Local okHttpClient: OkHttpClient,

player/src/main/kotlin/com/tidal/sdk/player/Player.kt

@@ -45,6 +45,7 @@ class Player(
     credentialsProvider: CredentialsProvider,
     eventSender: EventSender,
     useLibflacAudioRenderer: Boolean = true,
+    useTopPlaybackInfo: Boolean = false,
     userClientIdSupplier: (() -> Int)? = null,
     bufferConfiguration: BufferConfiguration = BufferConfiguration(),
     assetTimeoutConfig: AssetTimeoutConfig = AssetTimeoutConfig(),
@@ -67,6 +68,7 @@ class Player(
                 credentialsProvider,
                 eventSender,
                 useLibflacAudioRenderer,
+                useTopPlaybackInfo,
                 userClientIdSupplier,
                 version,
                 bufferConfiguration,

player/src/main/kotlin/com/tidal/sdk/player/di/PlaybackEngineModule.kt

@@ -42,6 +42,7 @@ internal object PlaybackEngineModule {
         context: Context,
         connectivityManager: ConnectivityManager,
         @Named("useLibflacAudioRenderer") useLibflacAudioRenderer: Boolean,
+        @Named("useTopPlaybackInfo") useTopPlaybackInfo: Boolean,
         events: MutableSharedFlow<Event>,
         bufferConfiguration: BufferConfiguration,
         assetTimeoutConfig: AssetTimeoutConfig,
@@ -66,6 +67,7 @@ internal object PlaybackEngineModule {
                 context,
                 connectivityManager,
                 useLibflacAudioRenderer,
+                useTopPlaybackInfo,
                 events,
                 bufferConfiguration,
                 assetTimeoutConfig,

player/src/main/kotlin/com/tidal/sdk/player/di/PlayerComponent.kt

@@ -45,6 +45,7 @@ internal interface PlayerComponent {
             @BindsInstance credentialsProvider: CredentialsProvider,
             @BindsInstance eventSender: EventSender,
             @BindsInstance @Named("useLibflacAudioRenderer") useLibflacAudioRenderer: Boolean,
+            @BindsInstance @Named("useTopPlaybackInfo") useTopPlaybackInfo: Boolean,
             @BindsInstance userClientIdSupplier: (() -> Int)?,
             @BindsInstance version: String,
             @BindsInstance bufferConfiguration: BufferConfiguration,

player/src/main/kotlin/com/tidal/sdk/player/di/StreamingApiModule.kt

@@ -1,13 +1,15 @@
 package com.tidal.sdk.player.di
 
 import com.google.gson.Gson
+import com.tidal.sdk.auth.CredentialsProvider
 import com.tidal.sdk.player.common.model.ApiError
 import com.tidal.sdk.player.offlineplay.OfflinePlayProvider
 import com.tidal.sdk.player.streamingapi.StreamingApiModuleRoot
 import com.tidal.sdk.player.streamingapi.StreamingApiTimeoutConfig
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
+import javax.inject.Named
 import javax.inject.Singleton
 import okhttp3.OkHttpClient
 
@@ -24,13 +26,17 @@ internal object StreamingApiModule {
         gson: Gson,
         apiErrorFactory: ApiError.Factory,
         offlinePlayProvider: OfflinePlayProvider?,
+        credentialsProvider: CredentialsProvider,
+        @Named("useTopPlaybackInfo") useTopPlaybackInfo: Boolean,
     ) =
         StreamingApiModuleRoot(
                 okHttpClient,
                 streamingApiTimeoutConfig,
                 gson,
                 apiErrorFactory,
                 offlinePlayProvider?.offlinePlaybackInfoProvider,
+                credentialsProvider,
+                useTopPlaybackInfo,
             )
             .streamingApi
 }

player/streaming-api/build.gradle.kts

@@ -1,12 +1,14 @@
 plugins {
-    alias(libs.plugins.tidal.kotlin.jvm)
+    alias(libs.plugins.tidal.android.library)
     alias(libs.plugins.google.devtools.ksp)
 }
 
+android { namespace = "com.tidal.sdk.player.streamingapi" }
+
 dependencies {
     ksp(libs.dagger.compiler)
 
-    compileOnly(libs.androidx.annotations)
+    implementation(libs.androidx.annotations)
 
     implementation(libs.dagger)
     implementation(libs.gson)
@@ -15,6 +17,7 @@ dependencies {
     implementation(libs.retrofit.converter.gson)
     api(libs.retrofit)
     implementation(project(":player:common"))
+    implementation(project(":tidalapi"))
 
     testImplementation(libs.kotlin.reflect)
     testImplementation(libs.kotlinxCoroutinesCore)

player/streaming-api/src/main/AndroidManifest.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.tidal.sdk.player.streamingapi">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+</manifest>

player/streaming-api/src/main/kotlin/com/tidal/sdk/player/streamingapi/StreamingApiDefault.kt

@@ -17,6 +17,7 @@ import com.tidal.sdk.player.streamingapi.playbackinfo.repository.PlaybackInfoRep
 internal class StreamingApiDefault(
     private val playbackInfoRepository: PlaybackInfoRepository,
     private val drmLicenseRepository: DrmLicenseRepository,
+    private val useTopPlaybackInfo: Boolean,
 ) : StreamingApi {
 
     override suspend fun getTrackPlaybackInfo(
@@ -27,14 +28,25 @@ internal class StreamingApiDefault(
         streamingSessionId: String,
         playlistUuid: String?,
     ) =
-        playbackInfoRepository.getTrackPlaybackInfo(
-            trackId,
-            audioQuality,
-            playbackMode,
-            immersiveAudio,
-            streamingSessionId,
-            playlistUuid,
-        )
+        if (useTopPlaybackInfo) {
+            playbackInfoRepository.getTrackPlaybackInfoTop(
+                trackId,
+                audioQuality,
+                playbackMode,
+                immersiveAudio,
+                streamingSessionId,
+                playlistUuid,
+            )
+        } else {
+            playbackInfoRepository.getTrackPlaybackInfo(
+                trackId,
+                audioQuality,
+                playbackMode,
+                immersiveAudio,
+                streamingSessionId,
+                playlistUuid,
+            )
+        }
 
     override suspend fun getVideoPlaybackInfo(
         videoId: String,

player/streaming-api/src/main/kotlin/com/tidal/sdk/player/streamingapi/StreamingApiModuleRoot.kt

@@ -1,6 +1,7 @@
 package com.tidal.sdk.player.streamingapi
 
 import com.google.gson.Gson
+import com.tidal.sdk.auth.CredentialsProvider
 import com.tidal.sdk.player.common.model.ApiError
 import com.tidal.sdk.player.streamingapi.di.DaggerStreamingApiComponent
 import com.tidal.sdk.player.streamingapi.playbackinfo.offline.OfflinePlaybackInfoProvider
@@ -12,6 +13,8 @@ class StreamingApiModuleRoot(
     gson: Gson,
     apiErrorFactory: ApiError.Factory,
     offlinePlaybackInfoProvider: OfflinePlaybackInfoProvider?,
+    credentialsProvider: CredentialsProvider,
+    useTopPlaybackInfo: Boolean,
 ) {
 
     val streamingApi =
@@ -22,6 +25,8 @@ class StreamingApiModuleRoot(
                 gson,
                 apiErrorFactory,
                 offlinePlaybackInfoProvider,
+                credentialsProvider,
+                useTopPlaybackInfo,
             )
             .streamingApi
 }

player/streaming-api/src/main/kotlin/com/tidal/sdk/player/streamingapi/di/PlaybackInfoModule.kt

@@ -5,6 +5,7 @@ import com.tidal.sdk.player.streamingapi.playbackinfo.mapper.ApiErrorMapper
 import com.tidal.sdk.player.streamingapi.playbackinfo.offline.OfflinePlaybackInfoProvider
 import com.tidal.sdk.player.streamingapi.playbackinfo.repository.PlaybackInfoRepository
 import com.tidal.sdk.player.streamingapi.playbackinfo.repository.PlaybackInfoRepositoryDefault
+import com.tidal.sdk.tidalapi.generated.apis.TrackManifests
 import dagger.Lazy
 import dagger.Module
 import dagger.Provides
@@ -18,12 +19,14 @@ internal object PlaybackInfoModule {
     fun providePlaybackInfoRepository(
         offlinePlaybackInfoProvider: OfflinePlaybackInfoProvider?,
         playbackInfoService: PlaybackInfoService,
+        trackManifests: TrackManifests,
         apiErrorMapperLazy: Lazy<ApiErrorMapper>,
     ): PlaybackInfoRepository {
         return PlaybackInfoRepositoryDefault(
             offlinePlaybackInfoProvider,
             playbackInfoService,
             apiErrorMapperLazy,
+            trackManifests,
         )
     }
 }

player/streaming-api/src/main/kotlin/com/tidal/sdk/player/streamingapi/di/StreamingApiComponent.kt

@@ -1,12 +1,14 @@
 package com.tidal.sdk.player.streamingapi.di
 
 import com.google.gson.Gson
+import com.tidal.sdk.auth.CredentialsProvider
 import com.tidal.sdk.player.common.model.ApiError
 import com.tidal.sdk.player.streamingapi.StreamingApi
 import com.tidal.sdk.player.streamingapi.StreamingApiTimeoutConfig
 import com.tidal.sdk.player.streamingapi.playbackinfo.offline.OfflinePlaybackInfoProvider
 import dagger.BindsInstance
 import dagger.Component
+import javax.inject.Named
 import javax.inject.Qualifier
 import javax.inject.Singleton
 import okhttp3.OkHttpClient
@@ -34,6 +36,8 @@ interface StreamingApiComponent {
             @BindsInstance gson: Gson,
             @BindsInstance apiErrorFactory: ApiError.Factory,
             @BindsInstance offlinePlaybackInfoProvider: OfflinePlaybackInfoProvider?,
+            @BindsInstance credentialsProvider: CredentialsProvider,
+            @BindsInstance @Named("useTopPlaybackInfo") useTopPlaybackInfo: Boolean,
         ): StreamingApiComponent
     }
 

player/streaming-api/src/main/kotlin/com/tidal/sdk/player/streamingapi/di/StreamingApiModule.kt

@@ -1,16 +1,20 @@
 package com.tidal.sdk.player.streamingapi.di
 
 import com.google.gson.Gson
+import com.tidal.sdk.auth.CredentialsProvider
 import com.tidal.sdk.player.common.model.ApiError
 import com.tidal.sdk.player.streamingapi.StreamingApi
 import com.tidal.sdk.player.streamingapi.StreamingApiDefault
 import com.tidal.sdk.player.streamingapi.drm.repository.DrmLicenseRepository
 import com.tidal.sdk.player.streamingapi.playbackinfo.mapper.ApiErrorMapper
 import com.tidal.sdk.player.streamingapi.playbackinfo.model.ManifestMimeType
 import com.tidal.sdk.player.streamingapi.playbackinfo.repository.PlaybackInfoRepository
+import com.tidal.sdk.tidalapi.generated.TidalApiClient
+import com.tidal.sdk.tidalapi.generated.apis.TrackManifests
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
+import javax.inject.Named
 import retrofit2.Converter
 import retrofit2.converter.gson.GsonConverterFactory
 
@@ -40,10 +44,22 @@ internal object StreamingApiModule {
     @Reusable
     fun provideApiErrorMapper(apiErrorFactory: ApiError.Factory) = ApiErrorMapper(apiErrorFactory)
 
+    @Provides
+    @Reusable
+    fun provideTidalApiClient(credentialsProvider: CredentialsProvider): TidalApiClient =
+        TidalApiClient(credentialsProvider)
+
+    @Provides
+    @Reusable
+    fun provideTrackManifests(tidalApiClient: TidalApiClient): TrackManifests =
+        tidalApiClient.createTrackManifests()
+
     @Provides
     @Reusable
     fun streamingApiDefault(
         playbackInfoRepository: PlaybackInfoRepository,
         drmLicenseRepository: DrmLicenseRepository,
-    ): StreamingApi = StreamingApiDefault(playbackInfoRepository, drmLicenseRepository)
+        @Named("useTopPlaybackInfo") useTopPlaybackInfo: Boolean,
+    ): StreamingApi =
+        StreamingApiDefault(playbackInfoRepository, drmLicenseRepository, useTopPlaybackInfo)
 }

player/streaming-api/src/main/kotlin/com/tidal/sdk/player/streamingapi/playbackinfo/repository/PlaybackInfoRepository.kt

@@ -28,6 +28,26 @@ internal interface PlaybackInfoRepository {
         playlistUuid: String?,
     ): PlaybackInfo
 
+    /**
+     * Returns a [PlaybackInfo] which we can use for playback of a track from Top.
+     *
+     * @param[trackId] The requested track id as [String].
+     * @param[audioQuality] The requested audio quality as [AudioQuality].
+     * @param[playbackMode] The requested playback mode as [PlaybackMode].
+     * @param[immersiveAudio] The requested option to include immersive audio or not.
+     * @param[streamingSessionId] The streaming session uuid as [String], created by the client, for
+     *   this streaming session.
+     * @param[playlistUuid] The playlistUuid this play originates from as [String]. May be null.
+     */
+    suspend fun getTrackPlaybackInfoTop(
+        trackId: String,
+        audioQuality: AudioQuality,
+        playbackMode: PlaybackMode,
+        immersiveAudio: Boolean,
+        streamingSessionId: String,
+        playlistUuid: String?,
+    ): PlaybackInfo
+
     /**
      * Returns a [PlaybackInfo] which we can use for playback of a video.
      *