1052 remove playbackservice from library (#1078)

Co-authored-by: Gaëtan Muller <[email protected]>

Author: StaehliJ

pillarbox-demo/src/main/AndroidManifest.xml

@@ -66,10 +66,6 @@
             android:launchMode="singleTask"
             android:supportsPictureInPicture="true" />
 
-        <service
-            android:name=".service.DemoPlaybackService"
-            android:foregroundServiceType="mediaPlayback" />
-
         <service
             android:name=".service.DemoMediaSessionService"
             android:exported="true"

pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/service/DemoPlaybackService.kt

@@ -5,15 +5,12 @@
 package ch.srgssr.pillarbox.demo.ui.player
 
 import android.app.PictureInPictureParams
-import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
-import android.content.ServiceConnection
 import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
-import android.os.IBinder
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
@@ -34,25 +31,23 @@ import androidx.lifecycle.lifecycleScope
 import androidx.media3.common.Player
 import ch.srgssr.pillarbox.analytics.SRGAnalytics
 import ch.srgssr.pillarbox.demo.DemoPageView
-import ch.srgssr.pillarbox.demo.service.DemoPlaybackService
 import ch.srgssr.pillarbox.demo.shared.data.DemoItem
 import ch.srgssr.pillarbox.demo.shared.data.Playlist
 import ch.srgssr.pillarbox.demo.trackPagView
 import ch.srgssr.pillarbox.demo.ui.theme.PillarboxTheme
-import ch.srgssr.pillarbox.player.service.PlaybackService
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 
 /**
  * Simple player activity that can handle picture in picture.
  *
- * It handles basic background playback, as it will stop playback when the Activity is destroyed!
+ * This implementation doesn't support background playback, it doesn't stop when the `Activity` starts picture in picture.
  * To have pure background playback with good integration from other devices like Auto, Wear, etc... we need *MediaSessionService*
  *
  * For this demo, only the picture in picture button can enable picture in picture.
  * But feel free to call [startPictureInPicture] whenever you decide, for example, when [onUserLeaveHint]
  */
-class SimplePlayerActivity : ComponentActivity(), ServiceConnection {
+class SimplePlayerActivity : ComponentActivity() {
 
     private val playerViewModel by viewModels<SimplePlayerViewModel>()
     private val layoutStyle by lazy { intent.getIntExtra(ARG_LAYOUT, LAYOUT_PLAYLIST) }
@@ -79,8 +74,6 @@ class SimplePlayerActivity : ComponentActivity(), ServiceConnection {
             }
         }
 
-        // Bind PlaybackService to allow background playback and MediaNotification.
-        bindPlaybackService()
         setContent {
             PillarboxTheme {
                 Scaffold(containerColor = Color.Black) { innerPadding ->
@@ -116,15 +109,6 @@ class SimplePlayerActivity : ComponentActivity(), ServiceConnection {
         readIntent(intent)
     }
 
-    override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
-        val binder = service as PlaybackService.ServiceBinder
-        binder.setPlayer(playerViewModel.player)
-    }
-
-    override fun onServiceDisconnected(name: ComponentName?) {
-        // Nothing
-    }
-
     private fun startPictureInPicture() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val params = PictureInPictureParams.Builder()
@@ -169,22 +153,12 @@ class SimplePlayerActivity : ComponentActivity(), ServiceConnection {
 
     override fun onStart() {
         super.onStart()
-        playerViewModel.player.play()
+        playerViewModel.resumePlayback()
     }
 
     override fun onStop() {
         super.onStop()
-        playerViewModel.player.pause()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        unbindService(this)
-    }
-
-    private fun bindPlaybackService() {
-        val intent = Intent(this, DemoPlaybackService::class.java)
-        bindService(intent, this, BIND_AUTO_CREATE)
+        playerViewModel.stopPlayback()
     }
 
     companion object {

pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/player/SimplePlayerActivity.kt

@@ -5,35 +5,53 @@
 package ch.srgssr.pillarbox.demo.ui.player
 
 import android.app.Application
+import android.app.PendingIntent
+import android.content.Intent
 import android.util.Log
 import android.util.Rational
 import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.application
 import androidx.media3.common.C
 import androidx.media3.common.MediaMetadata
 import androidx.media3.common.PlaybackException
 import androidx.media3.common.PlaybackParameters
 import androidx.media3.common.Player
 import androidx.media3.common.Timeline
 import androidx.media3.common.VideoSize
+import androidx.media3.common.util.NotificationUtil
+import androidx.media3.session.R
+import androidx.media3.ui.PlayerNotificationManager
 import ch.srgssr.pillarbox.demo.shared.data.DemoItem
 import ch.srgssr.pillarbox.demo.shared.di.PlayerModule
 import ch.srgssr.pillarbox.player.PillarboxPlayer
 import ch.srgssr.pillarbox.player.asset.timeRange.Chapter
 import ch.srgssr.pillarbox.player.asset.timeRange.Credit
 import ch.srgssr.pillarbox.player.extension.setHandleAudioFocus
 import ch.srgssr.pillarbox.player.extension.toRational
+import ch.srgssr.pillarbox.player.notification.PillarboxMediaDescriptionAdapter
+import ch.srgssr.pillarbox.player.session.PillarboxMediaSession
+import ch.srgssr.pillarbox.player.utils.PendingIntentUtils
 import ch.srgssr.pillarbox.player.utils.StringUtil
 import kotlinx.coroutines.flow.MutableStateFlow
 
+private const val NotificationId = 2025
+
 /**
- * Simple player view model than handle a PillarboxPlayer [player]
+ * Simple player view model that handles a PillarboxPlayer [player].
+ * Playback notification is displayed when the player is in the foreground.
+ * When the Activity goes to the background, the playback is stopped and the notification removed.
  */
 class SimplePlayerViewModel(application: Application) : AndroidViewModel(application), PillarboxPlayer.Listener {
     /**
      * Player as PillarboxPlayer
      */
     val player = PlayerModule.provideDefaultPlayer(application)
 
+    private val mediaSession = PillarboxMediaSession.Builder(application, player)
+        .setSessionActivity(pendingIntent())
+        .build()
+    private val notificationManager: PlayerNotificationManager
+
     /**
      * Picture in picture enabled
      */
@@ -45,6 +63,12 @@ class SimplePlayerViewModel(application: Application) : AndroidViewModel(applica
     var pictureInPictureRatio = MutableStateFlow(Rational(1, 1))
 
     init {
+        notificationManager = PlayerNotificationManager.Builder(application, NotificationId, "Pillarbox now playing")
+            .setChannelImportance(NotificationUtil.IMPORTANCE_LOW)
+            .setChannelNameResourceId(R.string.default_notification_channel_name)
+            .setMediaDescriptionAdapter(PillarboxMediaDescriptionAdapter(context = application, pendingIntent = pendingIntent()))
+            .build()
+        notificationManager.setUseChronometer(false)
         player.addListener(this)
         /*
          * Seems to have no effect if not use with a foreground service to handle background playback.
@@ -62,6 +86,32 @@ class SimplePlayerViewModel(application: Application) : AndroidViewModel(applica
          * Playback will resume depending on the "importance" of the interruption (call, playback)
          */
         player.setHandleAudioFocus(true)
+        notificationManager.setMediaSessionToken(mediaSession.token)
+    }
+
+    /**
+     * Resume playback.
+     */
+    fun resumePlayback() {
+        displayNotification()
+        player.prepare()
+        player.play()
+    }
+
+    /**
+     * Stop playback.
+     */
+    fun stopPlayback() {
+        player.stop()
+        hideNotification()
+    }
+
+    private fun displayNotification() {
+        notificationManager.setPlayer(player)
+    }
+
+    private fun hideNotification() {
+        notificationManager.setPlayer(null)
     }
 
     /**
@@ -79,6 +129,8 @@ class SimplePlayerViewModel(application: Application) : AndroidViewModel(applica
     override fun onCleared() {
         super.onCleared()
         Log.d(TAG, "onCleared => releasing the player")
+        notificationManager.setPlayer(null)
+        mediaSession.release()
         player.release()
         player.removeListener(this)
     }
@@ -143,6 +195,17 @@ class SimplePlayerViewModel(application: Application) : AndroidViewModel(applica
         Log.i(TAG, "onCreditChanged $credit")
     }
 
+    private fun pendingIntent(): PendingIntent {
+        val intent = Intent(application, SimplePlayerActivity::class.java)
+        val flags = PendingIntentUtils.appendImmutableFlagIfNeeded(PendingIntent.FLAG_UPDATE_CURRENT)
+        return PendingIntent.getActivity(
+            application,
+            0,
+            intent,
+            flags
+        )
+    }
+
     private companion object {
         private const val TAG = "PillarboxDemo"
     }