Skip to content

[camera_android_camerax] Force new Surface for each SurfaceRequest #9360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft

[camera_android_camerax] Force new Surface for each SurfaceRequest #9360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
47cee97
logging for debugging
camsim99 May 29, 2025
c73110f
debugging logging pt 2
camsim99 May 29, 2025
44aa92a
Merge remote-tracking branch 'upstream/main' into abandon_2
camsim99 Jun 2, 2025
8d5223d
remove logs and add comment
camsim99 Jun 2, 2025
0b4dfa0
update wip
camsim99 Jun 16, 2025
f8cb294
update pr based on engine changes + add tests
camsim99 Jun 20, 2025
684eae4
Merge remote-tracking branch 'upstream/main' into abandon_2
camsim99 Jun 20, 2025
7918cbc
bump version
camsim99 Jun 20, 2025
4ddb4a8
Merge branch 'main' into abandon_2
camsim99 Jun 23, 2025
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
5 changes: 5 additions & 0 deletions packages/camera/camera_android_camerax/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.6.19

* Ensures a new surface is provided every timethat one is requested to render the camera preview into
to fix pausing and resuming the preview.

## 0.6.18+3

* Fixes incorrect camera preview mirroring for front cameras of devices using the Impeller backend.
Expand Down
2 changes: 1 addition & 1 deletion ...era_android_camerax/android/src/main/java/io/flutter/plugins/camerax/PreviewProxyApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public void onSurfaceCleanup() {
// Provide surface.
surfaceProducer.setSize(
request.getResolution().getWidth(), request.getResolution().getHeight());
Surface flutterSurface = surfaceProducer.getSurface();
Surface flutterSurface = surfaceProducer.getForcedNewSurface();
request.provideSurface(
flutterSurface,
Executors.newSingleThreadExecutor(),
Expand Down
4 changes: 2 additions & 2 deletions .../camera_android_camerax/android/src/test/java/io/flutter/plugins/camerax/PreviewTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ TextureRegistry getTextureRegistry() {
ArgumentCaptor.forClass(TextureRegistry.SurfaceProducer.Callback.class);

when(mockSurfaceRequest.getResolution()).thenReturn(new Size(5, 6));
when(mockSurfaceProducer.getSurface()).thenReturn(mock(Surface.class));
when(mockSurfaceProducer.getForcedNewSurface()).thenReturn(mock(Surface.class));

final Preview.SurfaceProvider previewSurfaceProvider =
api.createSurfaceProvider(mockSurfaceProducer, mockSystemServicesManager);
Expand Down Expand Up @@ -155,7 +155,7 @@ TextureRegistry getTextureRegistry() {

when(mockSurfaceRequest.getResolution())
.thenReturn(new Size(resolutionWidth, resolutionHeight));
when(mockSurfaceProducer.getSurface()).thenReturn(mockSurface);
when(mockSurfaceProducer.getForcedNewSurface()).thenReturn(mockSurface);

final ArgumentCaptor<Surface> surfaceCaptor = ArgumentCaptor.forClass(Surface.class);
final ArgumentCaptor<Consumer<SurfaceRequest.Result>> consumerCaptor =
Expand Down
2 changes: 1 addition & 1 deletion packages/camera/camera_android_camerax/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: camera_android_camerax
description: Android implementation of the camera plugin using the CameraX library.
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android_camerax
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
version: 0.6.18+3
version: 0.6.19

environment:
sdk: ^3.7.0
Expand Down