feat(player): migrate ExoPlayer to media3

apivideo · Aug 11, 2023 · f4c206b · f4c206b
1 parent 9a2e8cc
commit f4c206b
Show file tree

Hide file tree

Showing 12 changed files with 153 additions and 82 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,6 +3,8 @@ buildscript {
     ext {
         kotlinVersion = '1.8.0'
         dokkaVersion = '1.8.20'
+        exoPlayerVersion = '1.1.0'
+        analyticsVersion = '1.4.0'
     }
 
     dependencies {
@@ -15,6 +17,6 @@ plugins {
     id 'org.jetbrains.kotlin.android' version "$kotlinVersion" apply false
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
diff --git a/player/build.gradle b/player/build.gradle
@@ -64,10 +64,11 @@ dependencies {
 
     implementation 'androidx.core:core-ktx:1.10.1'
     api 'com.android.volley:volley:1.2.1'
-    implementation 'com.google.android.exoplayer:exoplayer:2.19.0'
-    implementation 'com.google.android.exoplayer:exoplayer-hls:2.19.0'
-    implementation 'video.api:android-player-analytics:1.3.1'
-    implementation 'video.api:android-player-analytics-exoplayer:1.3.1'
+    implementation "video.api:android-player-analytics-exoplayer:${analyticsVersion}"
+    implementation "androidx.media3:media3-ui:${exoPlayerVersion}"
+    implementation "androidx.media3:media3-exoplayer:${exoPlayerVersion}"
+    implementation "androidx.media3:media3-exoplayer-hls:${exoPlayerVersion}"
+    implementation "androidx.media:media:1.6.0"
 
     testImplementation 'org.robolectric:robolectric:4.8.1'
     testImplementation 'org.robolectric:shadows-httpclient:4.5.1'

diff --git a/player/src/main/java/video/api/player/ApiVideoPlayerController.kt b/player/src/main/java/video/api/player/ApiVideoPlayerController.kt
@@ -7,14 +7,24 @@ import android.util.Log
 import android.util.Size
 import android.view.Surface
 import android.view.SurfaceView
-import com.google.android.exoplayer2.*
-import com.google.android.exoplayer2.Player.*
-import com.google.android.exoplayer2.analytics.AnalyticsListener
-import com.google.android.exoplayer2.analytics.AnalyticsListener.EventTime
-import com.google.android.exoplayer2.source.LoadEventInfo
-import com.google.android.exoplayer2.source.MediaLoadData
-import com.google.android.exoplayer2.ui.StyledPlayerView
-import com.google.android.exoplayer2.video.VideoSize
+import androidx.annotation.OptIn
+import androidx.media3.common.C
+import androidx.media3.common.MediaItem
+import androidx.media3.common.PlaybackException
+import androidx.media3.common.Player
+import androidx.media3.common.Player.DISCONTINUITY_REASON_SEEK
+import androidx.media3.common.Player.REPEAT_MODE_ALL
+import androidx.media3.common.Player.REPEAT_MODE_OFF
+import androidx.media3.common.Player.STATE_ENDED
+import androidx.media3.common.Player.STATE_READY
+import androidx.media3.common.Player.TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED
+import androidx.media3.common.VideoSize
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.exoplayer.analytics.AnalyticsListener
+import androidx.media3.exoplayer.source.LoadEventInfo
+import androidx.media3.exoplayer.source.MediaLoadData
+import androidx.media3.ui.PlayerView
 import video.api.analytics.exoplayer.ApiVideoAnalyticsListener
 import video.api.player.extensions.currentVideoOptions
 import video.api.player.extensions.setMediaSource
@@ -31,7 +41,7 @@ import java.io.IOException
  *
  * @param context the application context
  * @param initialVideoOptions initial video options
- * @param listener a [Player.Listener] to listen to player events
+ * @param listener a [ApiVideoPlayerController.Listener] to listen to player events
  * @param looper the looper where call to the player are executed. By default, it is the current looper or the main looper.
  */
 class ApiVideoPlayerController
@@ -46,8 +56,8 @@ internal constructor(
     /**
      * @param context the application context
      * @param initialVideoOptions initial video options
-     * @param listener the [Player.Listener] to listen to player events
-     * @param playerView the [IExoPlayerBasedPlayerView] interface for ExoPlayer [StyledPlayerView] based player view
+     * @param listener the [ApiVideoPlayerController.Listener] to listen to player events
+     * @param playerView the [IExoPlayerBasedPlayerView] interface for ExoPlayer [PlayerView] based player view
      * @param looper the looper where call to the player are executed. By default, it is the current looper or the main looper.
      */
     constructor(
@@ -65,7 +75,7 @@ internal constructor(
         initialVideoOptions,
         initialAutoplay,
         listener,
-        playerView.styledPlayerView,
+        playerView.playerView,
         looper,
         notificationController
     ) {
@@ -75,7 +85,7 @@ internal constructor(
     /**
      * @param context the application context
      * @param initialVideoOptions initial video options
-     * @param listener the [Player.Listener] to listen to player events
+     * @param listener the [ApiVideoPlayerController.Listener] to listen to player events
      * @param playerView the [ISurfaceViewBasedPlayerView] interface for [SurfaceView] based player view
      * @param looper the looper where call to the player are executed. By default, it is the current looper or the main looper.
      */
@@ -104,16 +114,16 @@ internal constructor(
     /**
      * @param context the application context
      * @param initialVideoOptions initial video options
-     * @param listener the [Player.Listener] to listen to player events
-     * @param styledPlayerView the [StyledPlayerView] to use to display the player
+     * @param listener the [ApiVideoPlayerController.Listener] to listen to player events
+     * @param playerView the [PlayerView] to use to display the player
      * @param looper the looper where call to the player are executed. By default, it is the current looper or the main looper.
      */
     constructor(
         context: Context,
         initialVideoOptions: VideoOptions? = null,
         initialAutoplay: Boolean = false,
         listener: Listener? = null,
-        styledPlayerView: StyledPlayerView,
+        playerView: PlayerView,
         looper: Looper = Looper.myLooper() ?: Looper.getMainLooper(),
         notificationController: ApiVideoPlayerNotificationController? = ApiVideoPlayerNotificationController(
             context
@@ -126,13 +136,13 @@ internal constructor(
         looper,
         notificationController
     ) {
-        styledPlayerView.player = exoplayer
+        playerView.player = exoplayer
     }
 
     /**
      * @param context the application context
      * @param initialVideoOptions initial video options
-     * @param listener the [Player.Listener] to listen to player events
+     * @param listener the [ApiVideoPlayerController.Listener] to listen to player events
      * @param surfaceView the [SurfaceView] to use to display the video
      * @param looper the looper where call to the player are executed. By default, it is the current looper or the main looper.
      */
@@ -160,7 +170,7 @@ internal constructor(
     /**
      * @param context the application context
      * @param initialVideoOptions initial video options
-     * @param listener the [Player.Listener] to listen to player events
+     * @param listener the [ApiVideoPlayerController.Listener] to listen to player events
      * @param surface the [Surface] to use to display the video
      * @param looper the looper where call to the player are executed. By default, it is the current looper or the main looper.
      */
@@ -212,12 +222,17 @@ internal constructor(
         }
 
     private val exoplayerListener: AnalyticsListener = object : AnalyticsListener {
-        override fun onPlayerError(eventTime: EventTime, error: PlaybackException) {
+        @OptIn(UnstableApi::class)
+        override fun onPlayerError(
+            eventTime: AnalyticsListener.EventTime,
+            error: PlaybackException
+        ) {
             listeners.forEach { listener -> listener.onError(error) }
         }
 
+        @OptIn(UnstableApi::class)
         override fun onMediaItemTransition(
-            eventTime: EventTime,
+            eventTime: AnalyticsListener.EventTime,
             mediaItem: MediaItem?,
             reason: Int
         ) {
@@ -231,15 +246,17 @@ internal constructor(
             }
         }
 
-        override fun onTimelineChanged(eventTime: EventTime, reason: Int) {
+        @OptIn(UnstableApi::class)
+        override fun onTimelineChanged(eventTime: AnalyticsListener.EventTime, reason: Int) {
             if (reason == TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED) {
                 firstPlay = true
                 isReady = false
             }
         }
 
+        @OptIn(UnstableApi::class)
         override fun onLoadError(
-            eventTime: EventTime,
+            eventTime: AnalyticsListener.EventTime,
             loadEventInfo: LoadEventInfo,
             mediaLoadData: MediaLoadData,
             error: IOException,
@@ -255,7 +272,11 @@ internal constructor(
             } ?: listeners.forEach { listener -> listener.onError(error) }
         }
 
-        override fun onIsPlayingChanged(eventTime: EventTime, isPlaying: Boolean) {
+        @OptIn(UnstableApi::class)
+        override fun onIsPlayingChanged(
+            eventTime: AnalyticsListener.EventTime,
+            isPlaying: Boolean
+        ) {
             if (isPlaying) {
                 if (firstPlay) {
                     firstPlay = false
@@ -269,7 +290,8 @@ internal constructor(
             }
         }
 
-        override fun onPlaybackStateChanged(eventTime: EventTime, state: Int) {
+        @OptIn(UnstableApi::class)
+        override fun onPlaybackStateChanged(eventTime: AnalyticsListener.EventTime, state: Int) {
             if (state == STATE_READY) {
                 if (!isReady) {
                     isReady = true
@@ -280,18 +302,23 @@ internal constructor(
             }
         }
 
+        @OptIn(UnstableApi::class)
         override fun onPositionDiscontinuity(
-            eventTime: EventTime,
-            oldPosition: PositionInfo,
-            newPosition: PositionInfo,
+            eventTime: AnalyticsListener.EventTime,
+            oldPosition: Player.PositionInfo,
+            newPosition: Player.PositionInfo,
             reason: Int
         ) {
             if (reason == DISCONTINUITY_REASON_SEEK) {
                 listeners.forEach { listener -> listener.onSeek() }
             }
         }
 
-        override fun onVideoSizeChanged(eventTime: EventTime, videoSize: VideoSize) {
+        @OptIn(UnstableApi::class)
+        override fun onVideoSizeChanged(
+            eventTime: AnalyticsListener.EventTime,
+            videoSize: VideoSize
+        ) {
             listeners.forEach { listener ->
                 listener.onVideoSizeChanged(
                     Size(
@@ -303,6 +330,7 @@ internal constructor(
         }
     }
 
+    @OptIn(UnstableApi::class)
     private val exoplayer =
         ExoPlayer.Builder(context).setLooper(looper).build().apply {
             addAnalyticsListener(exoplayerListener)
@@ -399,6 +427,7 @@ internal constructor(
      * @return the video size
      */
     val videoSize: Size?
+        @OptIn(UnstableApi::class)
         get() = exoplayer.videoFormat?.let { Size(it.width, it.height) }
 
     /**
@@ -442,7 +471,7 @@ internal constructor(
                 exoplayer.repeatMode = REPEAT_MODE_OFF
             }
         }
-    
+
     var playbackSpeed: Float
         /**
          * Get the playback speed

diff --git a/player/src/main/java/video/api/player/ApiVideoPlayerNotificationController.kt b/player/src/main/java/video/api/player/ApiVideoPlayerNotificationController.kt
@@ -4,10 +4,12 @@ import android.content.Context
 import android.support.v4.media.session.MediaSessionCompat
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
+import androidx.annotation.OptIn
 import androidx.annotation.StringRes
 import androidx.core.app.NotificationCompat
-import com.google.android.exoplayer2.ExoPlayer
-import com.google.android.exoplayer2.ui.PlayerNotificationManager
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.ui.PlayerNotificationManager
 import video.api.player.models.ApiVideoMediaDescriptionAdapter
 
 
@@ -17,11 +19,13 @@ import video.api.player.models.ApiVideoMediaDescriptionAdapter
  * @param context the application context
  */
 class ApiVideoPlayerNotificationController
+@OptIn(UnstableApi::class)
 constructor(
     private val context: Context,
     private val playerNotificationManager: PlayerNotificationManager,
     private val mediaSession: MediaSessionCompat = MediaSessionCompat(context, TAG),
 ) {
+    @OptIn(UnstableApi::class)
     constructor(
         context: Context,
         mediaSession: MediaSessionCompat = MediaSessionCompat(context, TAG),
@@ -57,10 +61,12 @@ constructor(
             mediaSession.isActive = value
         }
 
+    @OptIn(UnstableApi::class)
     fun hideNotification() {
         playerNotificationManager.setPlayer(null)
     }
 
+    @OptIn(UnstableApi::class)
     fun showNotification(player: ExoPlayer) {
         playerNotificationManager.setPlayer(player)
     }

diff --git a/player/src/main/java/video/api/player/extensions/ExoPlayerExtensions.kt b/player/src/main/java/video/api/player/extensions/ExoPlayerExtensions.kt
@@ -1,11 +1,13 @@
 package video.api.player.extensions
 
 import android.util.Log
-import com.google.android.exoplayer2.C
-import com.google.android.exoplayer2.ExoPlayer
-import com.google.android.exoplayer2.MediaItem
-import com.google.android.exoplayer2.source.MediaSource
-import com.google.android.exoplayer2.Player
+import androidx.annotation.OptIn
+import androidx.media3.common.C
+import androidx.media3.common.MediaItem
+import androidx.media3.common.Player
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.exoplayer.source.MediaSource
 import video.api.player.models.ApiVideoExoPlayerMediaFactory
 import video.api.player.models.VideoOptions
 
@@ -34,6 +36,7 @@ fun ExoPlayer.setMediaSource(
  *
  * @param mediaSourceFactory The [ApiVideoExoPlayerMediaFactory] to play
  */
+@OptIn(UnstableApi::class)
 fun ExoPlayer.setMediaSource(
     mediaSourceFactory: ApiVideoExoPlayerMediaFactory,
 ) {
@@ -65,6 +68,7 @@ fun ExoPlayer.setMp4MediaSource(
  *
  * @param mediaSourceFactory The [ApiVideoExoPlayerMediaFactory] to play
  */
+@OptIn(UnstableApi::class)
 fun ExoPlayer.setMp4MediaSource(
     mediaSourceFactory: ApiVideoExoPlayerMediaFactory,
 ) {
@@ -96,6 +100,7 @@ fun ExoPlayer.addMediaSource(
  *
  * @param mediaSourceFactory The [ApiVideoExoPlayerMediaFactory] to play
  */
+@OptIn(UnstableApi::class)
 fun ExoPlayer.addMediaSource(
     mediaSourceFactory: ApiVideoExoPlayerMediaFactory,
 ) {
@@ -127,6 +132,7 @@ fun ExoPlayer.addMp4MediaSource(
  *
  * @param mediaSourceFactory The [ApiVideoExoPlayerMediaFactory] to play
  */
+@OptIn(UnstableApi::class)
 fun ExoPlayer.addMp4MediaSource(
     mediaSourceFactory: ApiVideoExoPlayerMediaFactory,
 ) {

diff --git a/player/src/main/java/video/api/player/interfaces/IExoPlayerBasedPlayerView.kt b/player/src/main/java/video/api/player/interfaces/IExoPlayerBasedPlayerView.kt
@@ -1,8 +1,8 @@
 package video.api.player.interfaces
 
-import com.google.android.exoplayer2.ui.StyledPlayerView
+import androidx.media3.ui.PlayerView
 import video.api.player.ApiVideoPlayerController
 
 interface IExoPlayerBasedPlayerView : ApiVideoPlayerController.Listener {
-    val styledPlayerView: StyledPlayerView
+    val playerView: PlayerView
 }
diff --git a/player/src/main/java/video/api/player/interfaces/ISurfaceViewBasedPlayerView.kt b/player/src/main/java/video/api/player/interfaces/ISurfaceViewBasedPlayerView.kt
@@ -1,7 +1,6 @@
 package video.api.player.interfaces
 
 import android.view.SurfaceView
-import com.google.android.exoplayer2.ui.StyledPlayerView
 import video.api.player.ApiVideoPlayerController
 
 interface ISurfaceViewBasedPlayerView : ApiVideoPlayerController.Listener {