Rename TextureBased to Texture, move texture player to a separate pac…

…kage

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

@@ -15,7 +15,7 @@
  * is reclaimed. Upon <em>resume</em>, the player will need to be recreated, but start again at the
  * previous point (and settings).
  */
-final class ExoPlayerState {
+public final class ExoPlayerState {
   /**
    * Saves a representation of the current state of the player at the current point in time.
    *
@@ -24,7 +24,7 @@ final class ExoPlayerState {
    * @param exoPlayer the active player instance.
    * @return an opaque object representing the state.
    */
-  static ExoPlayerState save(ExoPlayer exoPlayer) {
+  public static ExoPlayerState save(ExoPlayer exoPlayer) {
     return new ExoPlayerState(
         /*position=*/ exoPlayer.getCurrentPosition(),
         /*repeatMode=*/ exoPlayer.getRepeatMode(),
@@ -60,7 +60,7 @@ private ExoPlayerState(
    *
    * @param exoPlayer the new player instance to reflect the state back to.
    */
-  void restore(ExoPlayer exoPlayer) {
+  public void restore(ExoPlayer exoPlayer) {
     exoPlayer.seekTo(position);
     exoPlayer.setRepeatMode(repeatMode);
     exoPlayer.setVolume(volume);

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

@@ -37,7 +37,7 @@ final class HttpVideoAsset extends VideoAsset {
 
   @NonNull
   @Override
-  MediaItem getMediaItem() {
+  public MediaItem getMediaItem() {
     MediaItem.Builder builder = new MediaItem.Builder().setUri(assetUrl);
     String mimeType = null;
     switch (streamingFormat) {
@@ -58,7 +58,7 @@ MediaItem getMediaItem() {
   }
 
   @Override
-  MediaSource.Factory getMediaSourceFactory(Context context) {
+  public MediaSource.Factory getMediaSourceFactory(Context context) {
     return getMediaSourceFactory(context, new DefaultHttpDataSource.Factory());
   }
 

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

@@ -17,12 +17,12 @@ final class LocalVideoAsset extends VideoAsset {
 
   @NonNull
   @Override
-  MediaItem getMediaItem() {
+  public MediaItem getMediaItem() {
     return new MediaItem.Builder().setUri(assetUrl).build();
   }
 
   @Override
-  MediaSource.Factory getMediaSourceFactory(Context context) {
+  public MediaSource.Factory getMediaSourceFactory(Context context) {
     return new DefaultMediaSourceFactory(context);
   }
 }

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

@@ -19,14 +19,14 @@ final class RtspVideoAsset extends VideoAsset {
 
   @NonNull
   @Override
-  MediaItem getMediaItem() {
+  public MediaItem getMediaItem() {
     return new MediaItem.Builder().setUri(assetUrl).build();
   }
 
   // TODO: Migrate to stable API, see https://github.com/flutter/flutter/issues/147039.
   @OptIn(markerClass = UnstableApi.class)
   @Override
-  MediaSource.Factory getMediaSourceFactory(Context context) {
+  public MediaSource.Factory getMediaSourceFactory(Context context) {
     return new RtspMediaSource.Factory();
   }
 }

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

@@ -13,7 +13,7 @@
 import java.util.Map;
 
 /** A video to be played by {@link VideoPlayer}. */
-abstract class VideoAsset {
+public abstract class VideoAsset {
   /**
    * Returns an asset from a local {@code asset:///} URL, i.e. an on-device asset.
    *
@@ -70,15 +70,15 @@ protected VideoAsset(@Nullable String assetUrl) {
    * @return media item.
    */
   @NonNull
-  abstract MediaItem getMediaItem();
+  public abstract MediaItem getMediaItem();
 
   /**
    * Returns the configured media source factory, if needed for this asset type.
    *
    * @param context application context.
    * @return configured factory, or {@code null} if not needed for this asset type.
    */
-  abstract MediaSource.Factory getMediaSourceFactory(Context context);
+  public abstract MediaSource.Factory getMediaSourceFactory(Context context);
 
   /** Streaming formats that can be provided to the video player as a hint. */
   enum StreamingFormat {

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

@@ -17,13 +17,14 @@
 import androidx.media3.exoplayer.ExoPlayer;
 import io.flutter.plugins.videoplayer.platformview.PlatformVideoViewFactory;
 import io.flutter.plugins.videoplayer.platformview.PlatformViewExoPlayerEventListener;
+import io.flutter.plugins.videoplayer.texture.TextureVideoPlayer;
 
 /**
  * A class responsible for managing video playback using {@link ExoPlayer}. It provides methods to
  * control playback, adjust volume, and handle seeking. This class contains all functionalities
  * needed to manage video playback in platform views and is typically used alongside {@link
  * PlatformVideoViewFactory}. If you need to display a video using a texture, use {@link
- * TextureBasedVideoPlayer} instead.
+ * TextureVideoPlayer} instead.
  */
 public class VideoPlayer {
   @NonNull private final ExoPlayerProvider exoPlayerProvider;
@@ -60,7 +61,7 @@ static VideoPlayer create(
   }
 
   /** A closure-compatible signature since {@link java.util.function.Supplier} is API level 24. */
-  interface ExoPlayerProvider {
+  public interface ExoPlayerProvider {
     /**
      * Returns a new {@link ExoPlayer}.
      *
@@ -70,7 +71,7 @@ interface ExoPlayerProvider {
   }
 
   @VisibleForTesting
-  VideoPlayer(
+  public VideoPlayer(
       @NonNull ExoPlayerProvider exoPlayerProvider,
       @NonNull VideoPlayerCallbacks events,
       @NonNull MediaItem mediaItem,
@@ -155,7 +156,7 @@ public ExoPlayer getExoPlayer() {
     return exoPlayer;
   }
 
-  void dispose() {
+  public void dispose() {
     exoPlayer.release();
   }
 }

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

@@ -4,6 +4,6 @@
 
 package io.flutter.plugins.videoplayer;
 
-class VideoPlayerOptions {
+public class VideoPlayerOptions {
   public boolean mixWithOthers;
 }

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

@@ -15,6 +15,7 @@
 import io.flutter.plugins.videoplayer.Messages.AndroidVideoPlayerApi;
 import io.flutter.plugins.videoplayer.Messages.CreateMessage;
 import io.flutter.plugins.videoplayer.platformview.PlatformVideoViewFactory;
+import io.flutter.plugins.videoplayer.texture.TextureVideoPlayer;
 import io.flutter.view.TextureRegistry;
 
 /** Android platform implementation of the VideoPlayerPlugin. */
@@ -130,7 +131,7 @@ public void initialize() {
       TextureRegistry.SurfaceProducer handle = flutterState.textureRegistry.createSurfaceProducer();
       id = handle.id();
       videoPlayer =
-          TextureBasedVideoPlayer.create(
+          TextureVideoPlayer.create(
               flutterState.applicationContext,
               VideoPlayerEventCallbacks.bindTo(createEventChannel(id)),
               handle,

packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/TextureBasedVideoPlayer.java → packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/texture/TextureVideoPlayer.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package io.flutter.plugins.videoplayer;
+package io.flutter.plugins.videoplayer.texture;
 
 import android.content.Context;
 import androidx.annotation.NonNull;
@@ -11,7 +11,13 @@
 import androidx.annotation.VisibleForTesting;
 import androidx.media3.common.MediaItem;
 import androidx.media3.exoplayer.ExoPlayer;
-import io.flutter.plugins.videoplayer.texture.TextureExoPlayerEventListener;
+import io.flutter.plugins.videoplayer.ExoPlayerEventListener;
+import io.flutter.plugins.videoplayer.ExoPlayerState;
+import io.flutter.plugins.videoplayer.Messages;
+import io.flutter.plugins.videoplayer.VideoAsset;
+import io.flutter.plugins.videoplayer.VideoPlayer;
+import io.flutter.plugins.videoplayer.VideoPlayerCallbacks;
+import io.flutter.plugins.videoplayer.VideoPlayerOptions;
 import io.flutter.view.TextureRegistry;
 
 /**
@@ -20,7 +26,7 @@
  * video is properly displayed on the texture. If you need to display a video using platform view,
  * use {@link VideoPlayer} instead.
  */
-final class TextureBasedVideoPlayer extends VideoPlayer
+public final class TextureVideoPlayer extends VideoPlayer
     implements TextureRegistry.SurfaceProducer.Callback {
   @NonNull private final TextureRegistry.SurfaceProducer surfaceProducer;
   @Nullable private ExoPlayerState savedStateDuring;
@@ -36,13 +42,13 @@ final class TextureBasedVideoPlayer extends VideoPlayer
    * @return a video player instance.
    */
   @NonNull
-  static TextureBasedVideoPlayer create(
+  public static TextureVideoPlayer create(
       @NonNull Context context,
       @NonNull VideoPlayerCallbacks events,
       @NonNull TextureRegistry.SurfaceProducer surfaceProducer,
       @NonNull VideoAsset asset,
       @NonNull VideoPlayerOptions options) {
-    return new TextureBasedVideoPlayer(
+    return new TextureVideoPlayer(
         () -> {
           ExoPlayer.Builder builder =
               new ExoPlayer.Builder(context)
@@ -56,7 +62,7 @@ static TextureBasedVideoPlayer create(
   }
 
   @VisibleForTesting
-  TextureBasedVideoPlayer(
+  public TextureVideoPlayer(
       @NonNull ExoPlayerProvider exoPlayerProvider,
       @NonNull VideoPlayerCallbacks events,
       @NonNull TextureRegistry.SurfaceProducer surfaceProducer,

packages/video_player/video_player_android/android/src/test/java/io/flutter/plugins/videoplayer/TextureBasedVideoPlayerTest.java → packages/video_player/video_player_android/android/src/test/java/io/flutter/plugins/videoplayer/TextureVideoPlayerTest.java

@@ -15,6 +15,8 @@
 import androidx.media3.common.Player;
 import androidx.media3.common.VideoSize;
 import androidx.media3.exoplayer.ExoPlayer;
+
+import io.flutter.plugins.videoplayer.texture.TextureVideoPlayer;
 import io.flutter.view.TextureRegistry;
 import org.junit.Before;
 import org.junit.Rule;
@@ -29,9 +31,9 @@
 import org.robolectric.RobolectricTestRunner;
 
 /**
- * Unit tests for {@link TextureBasedVideoPlayer}.
+ * Unit tests for {@link TextureVideoPlayer}.
  *
- * <p>This test suite <em>narrowly verifies</em> that {@link TextureBasedVideoPlayer} interfaces
+ * <p>This test suite <em>narrowly verifies</em> that {@link TextureVideoPlayer} interfaces
  * with the {@link ExoPlayer} interface <em>exactly</em> as it did when the test suite was created.
  * That is, if the behavior changes, this test will need to change. However, this suite should catch
  * bugs related to <em>"this is a safe refactor with no behavior changes"</em>.
@@ -41,7 +43,7 @@
  * in order to figure out how to set everything up so the player "works".
  */
 @RunWith(RobolectricTestRunner.class)
-public final class TextureBasedVideoPlayerTest {
+public final class TextureVideoPlayerTest {
   private static final String FAKE_ASSET_URL = "https://flutter.dev/movie.mp4";
   private FakeVideoAsset fakeVideoAsset;
 
@@ -64,8 +66,8 @@ private VideoPlayer createVideoPlayer() {
     return createVideoPlayer(new VideoPlayerOptions());
   }
 
-  private TextureBasedVideoPlayer createVideoPlayer(VideoPlayerOptions options) {
-    return new TextureBasedVideoPlayer(
+  private TextureVideoPlayer createVideoPlayer(VideoPlayerOptions options) {
+    return new TextureVideoPlayer(
         () -> mockExoPlayer, mockEvents, mockProducer, fakeVideoAsset.getMediaItem(), options);
   }
 

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

@@ -14,6 +14,7 @@
 import io.flutter.plugins.videoplayer.Messages.CreateMessage;
 import io.flutter.plugins.videoplayer.Messages.PlatformVideoViewType;
 import io.flutter.plugins.videoplayer.platformview.PlatformVideoViewFactory;
+import io.flutter.plugins.videoplayer.texture.TextureVideoPlayer;
 import io.flutter.view.TextureRegistry;
 import java.lang.reflect.Field;
 import java.util.HashMap;
@@ -62,7 +63,7 @@ public void initPluginDoesNotThrow() {
   }
 
   @Test
-  public void registersPlatformVideoViewFactory() throws Exception {
+  public void registersPlatformVideoViewFactory() {
     verify(mockPlatformViewRegistry)
         .registerViewFactory(
             eq("plugins.flutter.dev/video_player_android"), any(PlatformVideoViewFactory.class));
@@ -91,11 +92,11 @@ public void createsVideoPlayerWithPlatformViewType() throws Exception {
 
   @Test
   public void createsVideoPlayerWithTextureViewType() throws Exception {
-    try (MockedStatic<TextureBasedVideoPlayer> mockedTextureBasedVideoPlayerStatic =
-        mockStatic(TextureBasedVideoPlayer.class)) {
+    try (MockedStatic<TextureVideoPlayer> mockedTextureBasedVideoPlayerStatic =
+        mockStatic(TextureVideoPlayer.class)) {
       mockedTextureBasedVideoPlayerStatic
-          .when(() -> TextureBasedVideoPlayer.create(any(), any(), any(), any(), any()))
-          .thenReturn(mock(TextureBasedVideoPlayer.class));
+          .when(() -> TextureVideoPlayer.create(any(), any(), any(), any(), any()))
+          .thenReturn(mock(TextureVideoPlayer.class));
 
       final CreateMessage createMessage =
           new CreateMessage.Builder()
@@ -107,7 +108,7 @@ public void createsVideoPlayerWithTextureViewType() throws Exception {
       final long playerId = plugin.create(createMessage);
 
       final LongSparseArray<VideoPlayer> videoPlayers = getVideoPlayers();
-      assertTrue(videoPlayers.get(playerId) instanceof TextureBasedVideoPlayer);
+      assertTrue(videoPlayers.get(playerId) instanceof TextureVideoPlayer);
     }
   }
 }