Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Account for current open image in FlutterImageView #21191

Merged
merged 2 commits into from
Sep 15, 2020
Merged

Account for current open image in FlutterImageView #21191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75af58f
Account for current open image in FlutterImageView
Sep 15, 2020
c072210
Add @SuppressLint
Sep 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion shell/platform/android/io/flutter/embedding/android/FlutterImageView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,11 @@ public boolean acquireLatestImage() {
// While the engine will also stop producing frames, there is a race condition.
//
// To avoid exceptions, check if a new image can be acquired.
if (imageQueue.size() < imageReader.getMaxImages()) {
int imageOpenedCount = imageQueue.size();
if (currentImage != null) {
imageOpenedCount++;
}
if (imageOpenedCount < imageReader.getMaxImages()) {
final Image image = imageReader.acquireLatestImage();
if (image != null) {
imageQueue.add(image);
Expand Down
32 changes: 26 additions & 6 deletions shell/platform/android/test/io/flutter/embedding/android/FlutterViewTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,11 +590,13 @@ public void flutterImageView_acquireLatestImageReturnsFalse() {
}

@Test
@SuppressLint("WrongCall") /*View#onDraw*/
public void flutterImageView_acquiresMaxImagesAtMost() {
final ImageReader mockReader = mock(ImageReader.class);
when(mockReader.getMaxImages()).thenReturn(2);
when(mockReader.getMaxImages()).thenReturn(3);

final Image mockImage = mock(Image.class);
when(mockImage.getPlanes()).thenReturn(new Plane[0]);
when(mockReader.acquireLatestImage()).thenReturn(mockImage);

final FlutterImageView imageView =
Expand All @@ -606,13 +608,31 @@ public void flutterImageView_acquiresMaxImagesAtMost() {

final FlutterJNI jni = mock(FlutterJNI.class);
imageView.attachToRenderer(new FlutterRenderer(jni));

doNothing().when(imageView).invalidate();
assertTrue(imageView.acquireLatestImage());
assertTrue(imageView.acquireLatestImage());
assertTrue(imageView.acquireLatestImage());

verify(mockReader, times(2)).acquireLatestImage();
assertTrue(imageView.acquireLatestImage()); // 1 image
assertTrue(imageView.acquireLatestImage()); // 2 images
assertTrue(imageView.acquireLatestImage()); // 3 images
assertTrue(imageView.acquireLatestImage()); // 3 images
verify(mockReader, times(3)).acquireLatestImage();

imageView.onDraw(mock(Canvas.class)); // 3 images
assertTrue(imageView.acquireLatestImage()); // 3 images
verify(mockReader, times(3)).acquireLatestImage();

imageView.onDraw(mock(Canvas.class)); // 2 images
assertTrue(imageView.acquireLatestImage()); // 3 images
verify(mockReader, times(4)).acquireLatestImage();

imageView.onDraw(mock(Canvas.class)); // 2 images
imageView.onDraw(mock(Canvas.class)); // 1 image
imageView.onDraw(mock(Canvas.class)); // 1 image

assertTrue(imageView.acquireLatestImage()); // 2 images
assertTrue(imageView.acquireLatestImage()); // 3 images
assertTrue(imageView.acquireLatestImage()); // 3 images
assertTrue(imageView.acquireLatestImage()); // 3 images
verify(mockReader, times(6)).acquireLatestImage();
}

@Test
Expand Down