Merge branch 'main' into fix-issue-79772

Author: biagiopietro

packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.7.1
+
+* Undeprecates `BitmapDescriptor.fromAssetImage`.
+* Undeprecates `BitmapDescriptor.fromBytes`.
+* Fixes issues with deprecation in version 2.7.0.
+
 ## 2.7.0
 
 * Adds better support for marker size and scaling behaviour with `AssetMapBitmap` and `BytesMapBitmap`.

packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/bitmap.dart

@@ -179,8 +179,6 @@ class BitmapDescriptor {
   /// and scales the images to the right resolution depending on the dpi.
   /// Set `mipmaps` to false to load the exact dpi version of the image,
   /// `mipmap` is true by default.
-  @Deprecated(
-      'Switch to using `asset` method, AssetMapBitmap or AssetMapBitmap.create instead')
   static Future<BitmapDescriptor> fromAssetImage(
     ImageConfiguration configuration,
     String assetName, {
@@ -219,7 +217,6 @@ class BitmapDescriptor {
   /// bitmap, regardless of the actual resolution of the encoded PNG.
   /// This helps the browser to render High-DPI images at the correct size.
   /// `size` is not required (and ignored, if passed) in other platforms.
-  @Deprecated('Switch to using `bytes` method or BytesMapBitmap instead')
   static BitmapDescriptor fromBytes(Uint8List byteData, {Size? size}) {
     assert(byteData.isNotEmpty,
         'Cannot create BitmapDescriptor with empty byteData');

packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml

@@ -4,7 +4,7 @@ repository: https://github.com/flutter/packages/tree/main/packages/google_maps_f
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
 # NOTE: We strongly prefer non-breaking changes, even at the expense of a
 # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
-version: 2.7.0
+version: 2.7.1
 
 environment:
   sdk: ^3.2.0

packages/video_player/video_player_android/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.4.16
+
+* [Supports Impeller](https://docs.flutter.dev/release/breaking-changes/android-surface-plugins).
+
 ## 2.4.15
 
 * Updates minimum supported SDK version to Flutter 3.22/Dart 3.4.

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

@@ -9,7 +9,6 @@
 
 import android.content.Context;
 import android.net.Uri;
-import android.view.Surface;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.C;
@@ -48,32 +47,37 @@ final class VideoPlayer {
 
   private ExoPlayer exoPlayer;
 
-  private Surface surface;
-
-  private final TextureRegistry.SurfaceTextureEntry textureEntry;
+  private TextureRegistry.SurfaceProducer surfaceProducer;
 
   private QueuingEventSink eventSink;
 
   private final EventChannel eventChannel;
 
   private static final String USER_AGENT = "User-Agent";
 
+  private MediaSource mediaSource;
+
   @VisibleForTesting boolean isInitialized = false;
 
+  // State that must be reset when the surface is re-created.
   private final VideoPlayerOptions options;
+  private long restoreVideoLocation = 0;
+  private int restoreRepeatMode = 0;
+  private float restoreVolume = 0;
+  private PlaybackParameters restorePlaybackParameters;
 
   private DefaultHttpDataSource.Factory httpDataSourceFactory = new DefaultHttpDataSource.Factory();
 
   VideoPlayer(
       Context context,
       EventChannel eventChannel,
-      TextureRegistry.SurfaceTextureEntry textureEntry,
+      TextureRegistry.SurfaceProducer surfaceProducer,
       String dataSource,
       String formatHint,
       @NonNull Map<String, String> httpHeaders,
       VideoPlayerOptions options) {
     this.eventChannel = eventChannel;
-    this.textureEntry = textureEntry;
+    this.surfaceProducer = surfaceProducer;
     this.options = options;
 
     ExoPlayer exoPlayer = new ExoPlayer.Builder(context).build();
@@ -83,7 +87,7 @@ final class VideoPlayer {
     DataSource.Factory dataSourceFactory =
         new DefaultDataSource.Factory(context, httpDataSourceFactory);
 
-    MediaSource mediaSource = buildMediaSource(uri, dataSourceFactory, formatHint);
+    mediaSource = buildMediaSource(uri, dataSourceFactory, formatHint);
 
     exoPlayer.setMediaSource(mediaSource);
     exoPlayer.prepare();
@@ -96,12 +100,12 @@ final class VideoPlayer {
   VideoPlayer(
       ExoPlayer exoPlayer,
       EventChannel eventChannel,
-      TextureRegistry.SurfaceTextureEntry textureEntry,
+      TextureRegistry.SurfaceProducer surfaceProducer,
       VideoPlayerOptions options,
       QueuingEventSink eventSink,
       DefaultHttpDataSource.Factory httpDataSourceFactory) {
     this.eventChannel = eventChannel;
-    this.textureEntry = textureEntry;
+    this.surfaceProducer = surfaceProducer;
     this.options = options;
     this.httpDataSourceFactory = httpDataSourceFactory;
 
@@ -169,6 +173,40 @@ private MediaSource buildMediaSource(
     }
   }
 
+  public void recreateSurface(Context context) {
+    ExoPlayer exoPlayer = new ExoPlayer.Builder(context).build();
+
+    exoPlayer.setMediaSource(mediaSource);
+    exoPlayer.prepare();
+
+    setUpVideoPlayer(exoPlayer, new QueuingEventSink());
+    exoPlayer.setVideoSurface(surfaceProducer.getSurface());
+    exoPlayer.seekTo(restoreVideoLocation);
+    exoPlayer.setRepeatMode(restoreRepeatMode);
+    exoPlayer.setVolume(restoreVolume);
+    if (restorePlaybackParameters != null) {
+      exoPlayer.setPlaybackParameters(restorePlaybackParameters);
+    }
+  }
+
+  public void pauseSurface() {
+    if (!isInitialized) {
+      return;
+    }
+    restoreVideoLocation = exoPlayer.getCurrentPosition();
+    restoreRepeatMode = exoPlayer.getRepeatMode();
+    restoreVolume = exoPlayer.getVolume();
+    restorePlaybackParameters = exoPlayer.getPlaybackParameters();
+    eventChannel.setStreamHandler(null);
+    if (isInitialized) {
+      exoPlayer.stop();
+    }
+    if (exoPlayer != null) {
+      exoPlayer.release();
+    }
+    isInitialized = false;
+  }
+
   private void setUpVideoPlayer(ExoPlayer exoPlayer, QueuingEventSink eventSink) {
     this.exoPlayer = exoPlayer;
     this.eventSink = eventSink;
@@ -186,8 +224,7 @@ public void onCancel(Object o) {
           }
         });
 
-    surface = new Surface(textureEntry.surfaceTexture());
-    exoPlayer.setVideoSurface(surface);
+    exoPlayer.setVideoSurface(surfaceProducer.getSurface());
     setAudioAttributes(exoPlayer, options.mixWithOthers);
 
     exoPlayer.addListener(
@@ -334,11 +371,8 @@ void dispose() {
     if (isInitialized) {
       exoPlayer.stop();
     }
-    textureEntry.release();
+    surfaceProducer.release();
     eventChannel.setStreamHandler(null);
-    if (surface != null) {
-      surface.release();
-    }
     if (exoPlayer != null) {
       exoPlayer.release();
     }

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

@@ -8,9 +8,16 @@
 import android.os.Build;
 import android.util.LongSparseArray;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
 import io.flutter.FlutterInjector;
 import io.flutter.Log;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
+import io.flutter.embedding.engine.plugins.activity.ActivityAware;
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
+import io.flutter.embedding.engine.plugins.lifecycle.FlutterLifecycleAdapter;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.EventChannel;
 import io.flutter.plugins.videoplayer.Messages.AndroidVideoPlayerApi;
@@ -29,11 +36,13 @@
 import javax.net.ssl.HttpsURLConnection;
 
 /** Android platform implementation of the VideoPlayerPlugin. */
-public class VideoPlayerPlugin implements FlutterPlugin, AndroidVideoPlayerApi {
+public class VideoPlayerPlugin
+    implements FlutterPlugin, AndroidVideoPlayerApi, DefaultLifecycleObserver, ActivityAware {
   private static final String TAG = "VideoPlayerPlugin";
   private final LongSparseArray<VideoPlayer> videoPlayers = new LongSparseArray<>();
   private FlutterState flutterState;
   private final VideoPlayerOptions options = new VideoPlayerOptions();
+  @Nullable Lifecycle lifecycle;
 
   /** Register this with the v2 embedding for the plugin to respond to lifecycle callbacks. */
   public VideoPlayerPlugin() {}
@@ -83,7 +92,7 @@ public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
     }
     flutterState.stopListening(binding.getBinaryMessenger());
     flutterState = null;
-    onDestroy();
+    performDestroy();
   }
 
   private void disposeAllPlayers() {
@@ -93,7 +102,7 @@ private void disposeAllPlayers() {
     videoPlayers.clear();
   }
 
-  public void onDestroy() {
+  public void performDestroy() {
     // The whole FlutterView is being destroyed. Here we release resources acquired for all
     // instances
     // of VideoPlayer. Once https://github.com/flutter/flutter/issues/19358 is resolved this may
@@ -107,8 +116,7 @@ public void initialize() {
   }
 
   public @NonNull TextureMessage create(@NonNull CreateMessage arg) {
-    TextureRegistry.SurfaceTextureEntry handle =
-        flutterState.textureRegistry.createSurfaceTexture();
+    TextureRegistry.SurfaceProducer handle = flutterState.textureRegistry.createSurfaceProducer();
     EventChannel eventChannel =
         new EventChannel(
             flutterState.binaryMessenger, "flutter.io/videoPlayer/videoEvents" + handle.id());
@@ -144,7 +152,6 @@ public void initialize() {
               options);
     }
     videoPlayers.put(handle.id(), player);
-
     return new TextureMessage.Builder().setTextureId(handle.id()).build();
   }
 
@@ -200,6 +207,62 @@ public void setMixWithOthers(@NonNull MixWithOthersMessage arg) {
     options.mixWithOthers = arg.getMixWithOthers();
   }
 
+  // Activity Aware
+
+  @Override
+  public void onAttachedToActivity(@NonNull ActivityPluginBinding binding) {
+    lifecycle = FlutterLifecycleAdapter.getActivityLifecycle(binding);
+    lifecycle.addObserver(this);
+  }
+
+  @Override
+  public void onDetachedFromActivity() {}
+
+  @Override
+  public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBinding binding) {
+    onAttachedToActivity(binding);
+  }
+
+  @Override
+  public void onDetachedFromActivityForConfigChanges() {
+    onDetachedFromActivity();
+  }
+
+  // DefaultLifecycleObserver
+  @Override
+  public void onResume(@NonNull LifecycleOwner owner) {
+    recreateAllSurfaces();
+  }
+
+  @Override
+  public void onPause(@NonNull LifecycleOwner owner) {
+    destroyAllSurfaces();
+  }
+
+  @Override
+  public void onStop(@NonNull LifecycleOwner owner) {
+    destroyAllSurfaces();
+  }
+
+  @Override
+  public void onDestroy(@NonNull LifecycleOwner owner) {
+    if (lifecycle != null) {
+      lifecycle.removeObserver(this);
+    }
+  }
+
+  private void destroyAllSurfaces() {
+    for (int i = 0; i < videoPlayers.size(); i++) {
+      videoPlayers.valueAt(i).pauseSurface();
+    }
+  }
+
+  private void recreateAllSurfaces() {
+    for (int i = 0; i < videoPlayers.size(); i++) {
+      videoPlayers.valueAt(i).recreateSurface(flutterState.applicationContext);
+    }
+  }
+
   private interface KeyForAssetFn {
     String get(String asset);
   }