[dependabot]: Bump exoplayer_version from 1.4.1 to 1.5.1 in /packages/video_player/video_player_android/android

packages/video_player/video_player_android/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.8.8
+
+* * Updates Media3-ExoPlayer to 1.5.1.
+
 ## 2.8.7
 
 * Adds note about known issue regarding platform views to the README.

packages/video_player/video_player_android/android/build.gradle

@@ -40,7 +40,7 @@ android {
     }
 
     dependencies {
-        def exoplayer_version = "1.4.1"
+        def exoplayer_version = "1.5.1"
         implementation "androidx.media3:media3-exoplayer:${exoplayer_version}"
         implementation "androidx.media3:media3-exoplayer-hls:${exoplayer_version}"
         implementation "androidx.media3:media3-exoplayer-dash:${exoplayer_version}"

packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/texture/TextureExoPlayerEventListener.java

@@ -4,7 +4,6 @@
 
 package io.flutter.plugins.videoplayer.texture;
 
-import android.os.Build;
 import androidx.annotation.NonNull;
 import androidx.annotation.OptIn;
 import androidx.media3.common.Format;
@@ -32,20 +31,7 @@ protected void sendInitialized() {
     int width = videoSize.width;
     int height = videoSize.height;
     if (width != 0 && height != 0) {
-      if (Build.VERSION.SDK_INT <= 21) {
-        // On API 21 and below, Exoplayer may not internally handle rotation correction
-        // and reports it through VideoSize.unappliedRotationDegrees. We may apply it to
-        // fix the case of upside-down playback.
-        try {
-          RotationDegrees unappliedRotation =
-              RotationDegrees.fromDegrees(videoSize.unappliedRotationDegrees);
-          rotationCorrection = getRotationCorrectionFromUnappliedRotation(unappliedRotation);
-        } catch (IllegalArgumentException e) {
-          // Unapplied rotation other than 0, 90, 180, 270 reported by VideoSize. Because this is
-          // unexpected, we apply no rotation correction.
-          rotationCorrection = RotationDegrees.ROTATE_0;
-        }
-      } else if (surfaceProducerHandlesCropAndRotation) {
+      if (surfaceProducerHandlesCropAndRotation) {
         // When the SurfaceTexture backend for Impeller is used, the preview should already
         // be correctly rotated.
         rotationCorrection = RotationDegrees.ROTATE_0;

packages/video_player/video_player_android/android/src/test/java/io/flutter/plugins/videoplayer/TextureExoPlayerEventListenerTest.java

@@ -35,26 +35,13 @@ public class TextureExoPlayerEventListenerTest {
 
   @Rule public MockitoRule initRule = MockitoJUnit.rule();
 
-  @Test
-  @Config(maxSdk = 21)
-  public void onPlaybackStateChangedReadySendInitialized_belowAndroid21() {
-    TextureExoPlayerEventListener eventListener =
-        new TextureExoPlayerEventListener(mockExoPlayer, mockCallbacks, true);
-    VideoSize size = new VideoSize(800, 400, 0, 0);
-    when(mockExoPlayer.getVideoSize()).thenReturn(size);
-    when(mockExoPlayer.getDuration()).thenReturn(10L);
-
-    eventListener.onPlaybackStateChanged(Player.STATE_READY);
-    verify(mockCallbacks).onInitialized(800, 400, 10L, 0);
-  }
-
   @Test
   @Config(minSdk = 22)
   public void
       onPlaybackStateChangedReadySendInitialized_whenSurfaceProducerHandlesCropAndRotation() {
     TextureExoPlayerEventListener eventListener =
         new TextureExoPlayerEventListener(mockExoPlayer, mockCallbacks, true);
-    VideoSize size = new VideoSize(800, 400, 0, 0);
+    VideoSize size = new VideoSize(800, 400, 0);
     when(mockExoPlayer.getVideoSize()).thenReturn(size);
     when(mockExoPlayer.getDuration()).thenReturn(10L);
 
@@ -68,7 +55,7 @@ public void onPlaybackStateChangedReadySendInitialized_belowAndroid21() {
       onPlaybackStateChangedReadySendInitializedWithRotationCorrectionAndWidthAndHeightSwap_whenSurfaceProducerDoesNotHandleCropAndRotation() {
     TextureExoPlayerEventListener eventListener =
         new TextureExoPlayerEventListener(mockExoPlayer, mockCallbacks, false);
-    VideoSize size = new VideoSize(800, 400, 0, 0);
+    VideoSize size = new VideoSize(800, 400, 0);
     int rotationCorrection = 90;
     Format videoFormat = new Format.Builder().setRotationDegrees(rotationCorrection).build();
 
@@ -80,27 +67,13 @@ public void onPlaybackStateChangedReadySendInitialized_belowAndroid21() {
     verify(mockCallbacks).onInitialized(800, 400, 10L, rotationCorrection);
   }
 
-  @Test
-  @Config(maxSdk = 21)
-  public void
-      onPlaybackStateChangedReadyInPortraitMode90DegreesSwapWidthAndHeight_belowAndroid21() {
-    TextureExoPlayerEventListener eventListener =
-        new TextureExoPlayerEventListener(mockExoPlayer, mockCallbacks, true);
-    VideoSize size = new VideoSize(800, 400, 90, 0);
-    when(mockExoPlayer.getVideoSize()).thenReturn(size);
-    when(mockExoPlayer.getDuration()).thenReturn(10L);
-
-    eventListener.onPlaybackStateChanged(Player.STATE_READY);
-    verify(mockCallbacks).onInitialized(800, 400, 10L, 0);
-  }
-
   @Test
   @Config(minSdk = 22)
   public void
       onPlaybackStateChangedReadyInPortraitMode90DegreesDoesNotSwapWidthAndHeight_whenSurfaceProducerHandlesCropAndRotation() {
     TextureExoPlayerEventListener eventListener =
         new TextureExoPlayerEventListener(mockExoPlayer, mockCallbacks, true);
-    VideoSize size = new VideoSize(800, 400, 90, 0);
+    VideoSize size = new VideoSize(800, 400, 0);
 
     when(mockExoPlayer.getVideoSize()).thenReturn(size);
     when(mockExoPlayer.getDuration()).thenReturn(10L);
@@ -115,7 +88,7 @@ public void onPlaybackStateChangedReadySendInitialized_belowAndroid21() {
       onPlaybackStateChangedReadyInPortraitMode90DegreesSwapWidthAndHeight_whenSurfaceProducerDoesNotHandleCropAndRotation() {
     TextureExoPlayerEventListener eventListener =
         new TextureExoPlayerEventListener(mockExoPlayer, mockCallbacks, false);
-    VideoSize size = new VideoSize(800, 400, 0, 0);
+    VideoSize size = new VideoSize(800, 400, 0);
     int rotationCorrection = 90;
     Format videoFormat = new Format.Builder().setRotationDegrees(rotationCorrection).build();
 
@@ -127,27 +100,13 @@ public void onPlaybackStateChangedReadySendInitialized_belowAndroid21() {
     verify(mockCallbacks).onInitialized(800, 400, 10L, 90);
   }
 
-  @Test
-  @Config(maxSdk = 21)
-  public void
-      onPlaybackStateChangedReadyInPortraitMode270DegreesSwapWidthAndHeight_belowAndroid21() {
-    TextureExoPlayerEventListener eventListener =
-        new TextureExoPlayerEventListener(mockExoPlayer, mockCallbacks, true);
-    VideoSize size = new VideoSize(800, 400, 270, 0);
-    when(mockExoPlayer.getVideoSize()).thenReturn(size);
-    when(mockExoPlayer.getDuration()).thenReturn(10L);
-
-    eventListener.onPlaybackStateChanged(Player.STATE_READY);
-    verify(mockCallbacks).onInitialized(800, 400, 10L, 0);
-  }
-
   @Test
   @Config(minSdk = 22)
   public void
       onPlaybackStateChangedReadyInPortraitMode270DegreesDoesNotSwapWidthAndHeight_whenSurfaceProducerHandlesCropAndRotation() {
     TextureExoPlayerEventListener eventListener =
         new TextureExoPlayerEventListener(mockExoPlayer, mockCallbacks, true);
-    VideoSize size = new VideoSize(800, 400, 270, 0);
+    VideoSize size = new VideoSize(800, 400, 0);
     when(mockExoPlayer.getVideoSize()).thenReturn(size);
     when(mockExoPlayer.getDuration()).thenReturn(10L);
 
@@ -161,7 +120,7 @@ public void onPlaybackStateChangedReadySendInitialized_belowAndroid21() {
       onPlaybackStateChangedReadyInPortraitMode270DegreesDoesNotSwapWidthAndHeight_whenSurfaceProducerDoesNotHandleCropAndRotation() {
     TextureExoPlayerEventListener eventListener =
         new TextureExoPlayerEventListener(mockExoPlayer, mockCallbacks, false);
-    VideoSize size = new VideoSize(800, 400, 0, 0);
+    VideoSize size = new VideoSize(800, 400, 0);
     int rotationCorrection = 270;
     Format videoFormat = new Format.Builder().setRotationDegrees(rotationCorrection).build();
 
@@ -172,17 +131,4 @@ public void onPlaybackStateChangedReadySendInitialized_belowAndroid21() {
     eventListener.onPlaybackStateChanged(Player.STATE_READY);
     verify(mockCallbacks).onInitialized(800, 400, 10L, 270);
   }
-
-  @Test
-  @Config(maxSdk = 21)
-  public void onPlaybackStateChangedReadyFlipped180DegreesInformEventHandler_belowAndroid21() {
-    TextureExoPlayerEventListener eventListener =
-        new TextureExoPlayerEventListener(mockExoPlayer, mockCallbacks, true);
-    VideoSize size = new VideoSize(800, 400, 180, 0);
-    when(mockExoPlayer.getVideoSize()).thenReturn(size);
-    when(mockExoPlayer.getDuration()).thenReturn(10L);
-
-    eventListener.onPlaybackStateChanged(Player.STATE_READY);
-    verify(mockCallbacks).onInitialized(800, 400, 10L, 180);
-  }
 }

packages/video_player/video_player_android/pubspec.yaml

@@ -2,7 +2,7 @@ name: video_player_android
 description: Android implementation of the video_player plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/video_player/video_player_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22
-version: 2.8.7
+version: 2.8.8
 
 environment:
   sdk: ^3.7.0