Skip to content

[camera] Dispose resources correctly on setDescription #4003

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

Merged
auto-submit merged 13 commits into from
Sep 29, 2023
Merged

[camera] Dispose resources correctly on setDescription #4003

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5874083
correctly disposes previous cameraId from device when switching betwe…
BradenBagby May 15, 2023
adbb45c
version and changelog
BradenBagby May 15, 2023
c9237cb
Merge branch 'main' into camera-set-description-resources
BradenBagby May 15, 2023
85de90b
fixes
BradenBagby May 16, 2023
51986e0
moved to setDescription
BradenBagby Jun 13, 2023
5c2a72a
awaits dispose
BradenBagby Jun 27, 2023
f85fcaf
fixes readme
BradenBagby Jun 27, 2023
4b926ef
Merge branch 'main' into camera-set-description-resources
BradenBagby Jun 27, 2023
f2487fb
Update packages/camera/camera/CHANGELOG.md
BradenBagby Jul 10, 2023
f17e964
Merge branch 'main' of github.com:flutter/packages into camera-set-de…
bparrishMines Sep 21, 2023
873e3bf
add a test
bparrishMines Sep 22, 2023
7bc4bd8
Merge branch 'main' of github.com:flutter/packages into camera-set-de…
bparrishMines Sep 22, 2023
ec396fa
Merge branch 'main' of github.com:flutter/packages into camera-set-de…
bparrishMines Sep 29, 2023
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
4 changes: 4 additions & 0 deletions packages/camera/camera/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.10.6

* Fixes camera resource handling

## 0.10.5

* Adds NV21 as an image streaming option for Android.
Expand Down
9 changes: 8 additions & 1 deletion packages/camera/camera/lib/src/camera_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,11 +294,12 @@ class CameraController extends ValueNotifier<CameraValue> {
'initialize was called on a disposed CameraController',
);
}

try {
final Completer<CameraInitializedEvent> initializeCompleter =
Completer<CameraInitializedEvent>();

_deviceOrientationSubscription = CameraPlatform.instance
_deviceOrientationSubscription ??= CameraPlatform.instance
.onDeviceOrientationChanged()
.listen((DeviceOrientationChangedEvent event) {
value = value.copyWith(
Expand Down Expand Up @@ -402,6 +403,12 @@ class CameraController extends ValueNotifier<CameraValue> {
await CameraPlatform.instance.setDescriptionWhileRecording(description);
value = value.copyWith(description: description);
} else {
// dispose resources from previous camera description
if (_initCalled != null) {
await _initCalled;
_unawaited(CameraPlatform.instance.dispose(_cameraId));
}

await _initializeWithDescription(description);
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/camera/camera/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: A Flutter plugin for controlling the camera. Supports previewing
Dart.
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
version: 0.10.5
version: 0.10.6

environment:
sdk: ">=2.18.0 <4.0.0"
Expand Down