Merge branch 'main' into main

Author: CaoGiaHieu-dev

.ci/flutter_master.version

@@ -1 +1 @@
-adffe244f3f112e35736d08d85ab4cdbe8e13aa4
+70cdc0c933d6b84817d216891953b6eb56e22007

.ci/flutter_stable.version

@@ -1 +1 @@
-fcf2c11572af6f390246c056bc905eca609533a0
+d7b523b356d15fb81e7d340bbe52b47f93937323

.gemini/config.yaml

@@ -0,0 +1,16 @@
+# Minimize verbosity.
+have_fun: false
+code_review:
+  # For now, use the default of MEDIUM for testing. Based on desired verbosity,
+  # we can change this to LOW or HIGH in the future.
+  comment_severity_threshold: MEDIUM
+  pull_request_opened:
+    # Explicitly set help to false in case the default changes in the future, as
+    # having a help message on every PR would be spammy.
+    help: false
+    # These tend to be verbose, and since we expect PR authors to clearly
+    # describe their PRs this would be at best duplicative.
+    summary: false
+ignore_patterns:
+  - .ci/flutter_master.version
+  - .ci/flutter_stable.version

.gemini/styleguide.md

@@ -0,0 +1,23 @@
+# Flutter Packages Style Guide
+
+## Introduction
+
+This style guide outlines the coding conventions for contributions to the
+flutter/packages repository.
+
+## Style Guides
+
+Code should follow the relevant style guides, and use the correct
+auto-formatter, for each language, as described in
+[the repository contributing guide's Style section](https://github.com/flutter/packages/blob/main/CONTRIBUTING.md#style).
+
+## Best Practices
+
+- Code should follow the guidance and principles described in
+  [the flutter/packages contribution guide](https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md).
+- Code should be tested. Changes to plugin packages, which include code written
+  in C, C++, Java, Kotlin, Objective-C, or Swift, should have appropriate tests
+  as described in [the plugin test guidance](https://github.com/flutter/flutter/blob/master/docs/ecosystem/testing/Plugin-Tests.md).
+- PR descriptions should include the Pre-Review Checklist from
+  [the PR template](https://github.com/flutter/packages/blob/main/.github/PULL_REQUEST_TEMPLATE.md),
+  with all of the steps completed.

.github/PULL_REQUEST_TEMPLATE.md

@@ -18,6 +18,8 @@
 
 If you need help, consider asking for advice on the #hackers-new channel on [Discord].
 
+**Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.
+
 [^1]: Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling.
 
 <!-- Links -->

README.md

@@ -29,7 +29,6 @@ pushd packages/rfw
 
 # Update the subpackages so that the analysis doesn't get confused.
 pushd example/remote; flutter packages get; popd
-pushd example/wasm; flutter packages get; popd
 pushd test_coverage; dart pub get; popd
 
 flutter analyze --no-fatal-infos

customer_testing.sh

@@ -1,3 +1,7 @@
+## 0.10.10+4
+
+* Fix flutter#166533 - prevent startImageStream OOM error when main thread paused.
+
 ## 0.10.10+3
 
 * Waits for the creation of the capture session when initializing the camera to avoid thread race conditions.

packages/camera/camera_android/CHANGELOG.md

@@ -9,11 +9,14 @@
 import android.media.ImageReader;
 import android.os.Handler;
 import android.os.Looper;
+import android.util.Log;
 import android.view.Surface;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import io.flutter.plugin.common.EventChannel;
 import io.flutter.plugins.camera.types.CameraCaptureProperties;
+import java.lang.ref.WeakReference;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -22,6 +25,7 @@
 
 // Wraps an ImageReader to allow for testing of the image handler.
 public class ImageStreamReader {
+  private static final String TAG = "ImageStreamReader";
 
   /**
    * The image format we are going to send back to dart. Usually it's the same as streamImageFormat
@@ -33,6 +37,16 @@ public class ImageStreamReader {
   private final ImageReader imageReader;
   private final ImageStreamReaderUtils imageStreamReaderUtils;
 
+  @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+  @Nullable
+  public Handler handler;
+
+  /**
+   * This hard reference is required so frames don't get randomly dropped before reaching the main
+   * looper.
+   */
+  private Map<String, Object> latestImageBufferHardReference = null;
+
   /**
    * Creates a new instance of the {@link ImageStreamReader}.
    *
@@ -95,40 +109,69 @@ public void onImageAvailable(
       @NonNull Image image,
       @NonNull CameraCaptureProperties captureProps,
       @NonNull EventChannel.EventSink imageStreamSink) {
-    try {
-      Map<String, Object> imageBuffer = new HashMap<>();
+    Map<String, Object> imageBuffer = new HashMap<>();
 
+    imageBuffer.put("width", image.getWidth());
+    imageBuffer.put("height", image.getHeight());
+    try {
       // Get plane data ready
       if (dartImageFormat == ImageFormat.NV21) {
         imageBuffer.put("planes", parsePlanesForNv21(image));
       } else {
         imageBuffer.put("planes", parsePlanesForYuvOrJpeg(image));
       }
-
-      imageBuffer.put("width", image.getWidth());
-      imageBuffer.put("height", image.getHeight());
-      imageBuffer.put("format", dartImageFormat);
-      imageBuffer.put("lensAperture", captureProps.getLastLensAperture());
-      imageBuffer.put("sensorExposureTime", captureProps.getLastSensorExposureTime());
-      Integer sensorSensitivity = captureProps.getLastSensorSensitivity();
-      imageBuffer.put(
-          "sensorSensitivity", sensorSensitivity == null ? null : (double) sensorSensitivity);
-
-      final Handler handler = new Handler(Looper.getMainLooper());
-      handler.post(() -> imageStreamSink.success(imageBuffer));
-      image.close();
-
     } catch (IllegalStateException e) {
-      // Handle "buffer is inaccessible" errors that can happen on some devices from ImageStreamReaderUtils.yuv420ThreePlanesToNV21()
-      final Handler handler = new Handler(Looper.getMainLooper());
+      // Handle "buffer is inaccessible" errors that can happen on some devices from
+      // ImageStreamReaderUtils.yuv420ThreePlanesToNV21()
+      final Handler handler =
+          this.handler != null ? this.handler : new Handler(Looper.getMainLooper());
       handler.post(
           () ->
               imageStreamSink.error(
                   "IllegalStateException",
                   "Caught IllegalStateException: " + e.getMessage(),
                   null));
+    } finally {
       image.close();
     }
+
+    imageBuffer.put("format", dartImageFormat);
+    imageBuffer.put("lensAperture", captureProps.getLastLensAperture());
+    imageBuffer.put("sensorExposureTime", captureProps.getLastSensorExposureTime());
+    Integer sensorSensitivity = captureProps.getLastSensorSensitivity();
+    imageBuffer.put(
+        "sensorSensitivity", sensorSensitivity == null ? null : (double) sensorSensitivity);
+
+    final Handler handler =
+        this.handler != null ? this.handler : new Handler(Looper.getMainLooper());
+
+    // Keep a hard reference to the latest frame, so it isn't dropped before it reaches the main
+    // looper
+    latestImageBufferHardReference = imageBuffer;
+
+    boolean postResult =
+        handler.post(
+            new Runnable() {
+              @VisibleForTesting public WeakReference<Map<String, Object>> weakImageBuffer;
+
+              public Runnable withImageBuffer(Map<String, Object> imageBuffer) {
+                weakImageBuffer = new WeakReference<>(imageBuffer);
+                return this;
+              }
+
+              @Override
+              public void run() {
+                final Map<String, Object> imageBuffer = weakImageBuffer.get();
+                if (imageBuffer == null) {
+                  // The memory was freed by the runtime, most likely due to a memory build-up
+                  // while the main thread was lagging. Frames are silently dropped in this
+                  // case.
+                  Log.d(TAG, "Image buffer was dropped by garbage collector.");
+                  return;
+                }
+                imageStreamSink.success(imageBuffer);
+              }
+            }.withImageBuffer(imageBuffer));
   }
 
   /**

packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/media/ImageStreamReader.java

@@ -9,15 +9,22 @@
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.graphics.ImageFormat;
 import android.media.Image;
 import android.media.ImageReader;
+import android.os.Handler;
 import io.flutter.plugin.common.EventChannel;
 import io.flutter.plugins.camera.types.CameraCaptureProperties;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Field;
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -61,48 +68,18 @@ public void onImageAvailable_parsesPlanesForNv21() {
     when(mockImageStreamReaderUtils.yuv420ThreePlanesToNV21(any(), anyInt(), anyInt()))
         .thenReturn(mockBytes);
 
-    // The image format as streamed from the camera
-    int imageFormat = ImageFormat.YUV_420_888;
-
-    // Mock YUV image
-    Image mockImage = mock(Image.class);
-    when(mockImage.getWidth()).thenReturn(1280);
-    when(mockImage.getHeight()).thenReturn(720);
-    when(mockImage.getFormat()).thenReturn(imageFormat);
-
-    // Mock planes. YUV images have 3 planes (Y, U, V).
-    Image.Plane planeY = mock(Image.Plane.class);
-    Image.Plane planeU = mock(Image.Plane.class);
-    Image.Plane planeV = mock(Image.Plane.class);
-
-    // Y plane is width*height
-    // Row stride is generally == width but when there is padding it will
-    // be larger. The numbers in this example are from a Vivo V2135 on 'high'
-    // setting (1280x720).
-    when(planeY.getBuffer()).thenReturn(ByteBuffer.allocate(1105664));
-    when(planeY.getRowStride()).thenReturn(1536);
-    when(planeY.getPixelStride()).thenReturn(1);
-
-    // U and V planes are always the same sizes/values.
-    // https://developer.android.com/reference/android/graphics/ImageFormat#YUV_420_888
-    when(planeU.getBuffer()).thenReturn(ByteBuffer.allocate(552703));
-    when(planeV.getBuffer()).thenReturn(ByteBuffer.allocate(552703));
-    when(planeU.getRowStride()).thenReturn(1536);
-    when(planeV.getRowStride()).thenReturn(1536);
-    when(planeU.getPixelStride()).thenReturn(2);
-    when(planeV.getPixelStride()).thenReturn(2);
-
-    // Add planes to image
-    Image.Plane[] planes = {planeY, planeU, planeV};
-    when(mockImage.getPlanes()).thenReturn(planes);
+    // Note: the code for getImage() was previously inlined, with uSize set to one less than
+    // getImage() calculates (see function implementation)
+    Image mockImage = ImageStreamReaderTestUtils.getImage(1280, 720, 256, ImageFormat.YUV_420_888);
 
     CameraCaptureProperties mockCaptureProps = mock(CameraCaptureProperties.class);
     EventChannel.EventSink mockEventSink = mock(EventChannel.EventSink.class);
     imageStreamReader.onImageAvailable(mockImage, mockCaptureProps, mockEventSink);
 
     // Make sure we processed the frame with parsePlanesForNv21
     verify(mockImageStreamReaderUtils)
-        .yuv420ThreePlanesToNV21(planes, mockImage.getWidth(), mockImage.getHeight());
+        .yuv420ThreePlanesToNV21(
+            mockImage.getPlanes(), mockImage.getWidth(), mockImage.getHeight());
   }
 
   /** If we are requesting YUV420, then we should send the 3-plane image as it is. */
@@ -120,40 +97,9 @@ public void onImageAvailable_parsesPlanesForYuv420() {
     when(mockImageStreamReaderUtils.yuv420ThreePlanesToNV21(any(), anyInt(), anyInt()))
         .thenReturn(mockBytes);
 
-    // The image format as streamed from the camera
-    int imageFormat = ImageFormat.YUV_420_888;
-
-    // Mock YUV image
-    Image mockImage = mock(Image.class);
-    when(mockImage.getWidth()).thenReturn(1280);
-    when(mockImage.getHeight()).thenReturn(720);
-    when(mockImage.getFormat()).thenReturn(imageFormat);
-
-    // Mock planes. YUV images have 3 planes (Y, U, V).
-    Image.Plane planeY = mock(Image.Plane.class);
-    Image.Plane planeU = mock(Image.Plane.class);
-    Image.Plane planeV = mock(Image.Plane.class);
-
-    // Y plane is width*height
-    // Row stride is generally == width but when there is padding it will
-    // be larger. The numbers in this example are from a Vivo V2135 on 'high'
-    // setting (1280x720).
-    when(planeY.getBuffer()).thenReturn(ByteBuffer.allocate(1105664));
-    when(planeY.getRowStride()).thenReturn(1536);
-    when(planeY.getPixelStride()).thenReturn(1);
-
-    // U and V planes are always the same sizes/values.
-    // https://developer.android.com/reference/android/graphics/ImageFormat#YUV_420_888
-    when(planeU.getBuffer()).thenReturn(ByteBuffer.allocate(552703));
-    when(planeV.getBuffer()).thenReturn(ByteBuffer.allocate(552703));
-    when(planeU.getRowStride()).thenReturn(1536);
-    when(planeV.getRowStride()).thenReturn(1536);
-    when(planeU.getPixelStride()).thenReturn(2);
-    when(planeV.getPixelStride()).thenReturn(2);
-
-    // Add planes to image
-    Image.Plane[] planes = {planeY, planeU, planeV};
-    when(mockImage.getPlanes()).thenReturn(planes);
+    // Note: the code for getImage() was previously inlined, with uSize set to one less than
+    // getImage() calculates (see function implementation)
+    Image mockImage = ImageStreamReaderTestUtils.getImage(1280, 720, 256, ImageFormat.YUV_420_888);
 
     CameraCaptureProperties mockCaptureProps = mock(CameraCaptureProperties.class);
     EventChannel.EventSink mockEventSink = mock(EventChannel.EventSink.class);
@@ -162,4 +108,72 @@ public void onImageAvailable_parsesPlanesForYuv420() {
     // Make sure we processed the frame with parsePlanesForYuvOrJpeg
     verify(mockImageStreamReaderUtils, never()).yuv420ThreePlanesToNV21(any(), anyInt(), anyInt());
   }
+
+  @Test
+  public void onImageAvailable_dropFramesWhenHandlerHalted() {
+    int dartImageFormat = ImageFormat.YUV_420_888;
+
+    ImageReader mockImageReader = mock(ImageReader.class);
+    ImageStreamReaderUtils mockImageStreamReaderUtils = mock(ImageStreamReaderUtils.class);
+    ImageStreamReader imageStreamReader =
+        new ImageStreamReader(mockImageReader, dartImageFormat, mockImageStreamReaderUtils);
+
+    for (boolean invalidateWeakReference : new boolean[] {true, false}) {
+      final List<Runnable> runnables = new ArrayList<Runnable>();
+
+      Handler mockHandler = mock(Handler.class);
+      imageStreamReader.handler = mockHandler;
+
+      // initially, handler will simulate a hanging main looper, that only queues inputs
+      when(mockHandler.post(any(Runnable.class)))
+          .thenAnswer(
+              inputs -> {
+                Runnable r = inputs.getArgument(0, Runnable.class);
+                runnables.add(r);
+                return true;
+              });
+
+      CameraCaptureProperties mockCaptureProps = mock(CameraCaptureProperties.class);
+      EventChannel.EventSink mockEventSink = mock(EventChannel.EventSink.class);
+
+      Image mockImage =
+          ImageStreamReaderTestUtils.getImage(1280, 720, 256, ImageFormat.YUV_420_888);
+      imageStreamReader.onImageAvailable(mockImage, mockCaptureProps, mockEventSink);
+
+      // make sure the image was closed, even when skipping frames
+      verify(mockImage, times(1)).close();
+
+      // check that we collected all runnables in this method
+      assertEquals(runnables.size(), 1);
+
+      // verify post() was not called more times than it should have
+      verify(mockHandler, times(1)).post(any(Runnable.class));
+
+      // make sure callback was not yet invoked
+      verify(mockEventSink, never()).success(any(Map.class));
+
+      // simulate frame processing
+      for (Runnable r : runnables) {
+        if (invalidateWeakReference) {
+          // Replace the captured WeakReference with one pointing to null.
+          Field[] fields = r.getClass().getDeclaredFields();
+          for (Field field : fields) {
+            if (field.getType().equals(WeakReference.class)) {
+              // Remove the `final` modifier
+              try {
+                field.set(r, new WeakReference<Map<String, Object>>(null));
+              } catch (IllegalAccessException e) {
+                throw new RuntimeException("Failed to inject null WeakReference", e);
+              }
+            }
+          }
+        }
+
+        r.run();
+      }
+
+      // make sure all callbacks were invoked so far
+      verify(mockEventSink, invalidateWeakReference ? never() : times(1)).success(any(Map.class));
+    }
+  }
 }