Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
6125eca
Recreating image capture impl from flutter/plugins
camsim99 Feb 23, 2023
5be1371
Merge remote-tracking branch 'upstream/main' into camx_imgcap
camsim99 Feb 23, 2023
b2fce3d
Fix integration tesT
camsim99 Feb 23, 2023
ed62a9a
Merge branch 'main' into camx_imgcap
camsim99 Feb 23, 2023
2e3027b
Analyzer pt 2
camsim99 Feb 23, 2023
fbd3fe5
Merge branch 'camx_imgcap' of github.com:camsim99/packages into camx_…
camsim99 Feb 23, 2023
dfa477e
Personal cleanup
camsim99 Feb 23, 2023
a651b92
Add initialization of controller
camsim99 Feb 24, 2023
884fd6c
Merge remote-tracking branch 'upstream/main' into camx_imgcap
camsim99 Feb 24, 2023
d5f8b91
Modify some docs
camsim99 Feb 24, 2023
060b7e5
Address review
camsim99 Mar 2, 2023
ff50c70
Merge remote-tracking branch 'upstream/main' into camx_imgcap
camsim99 Mar 2, 2023
fe6f1fc
Fix analyze
camsim99 Mar 2, 2023
e2643ae
Update packages/camera/camera_android_camerax/android/src/main/java/i…
camsim99 Mar 3, 2023
b7194f7
Update packages/camera/camera_android_camerax/lib/src/image_capture.dart
camsim99 Mar 3, 2023
dadc230
Start addressing review
camsim99 Mar 6, 2023
d15e1d4
Finish addressing review
camsim99 Mar 7, 2023
6dc2b77
Fix analyze
camsim99 Mar 7, 2023
f826b62
Generate mocks on stable
camsim99 Mar 7, 2023
0f7f29a
Fix/add tests
camsim99 Mar 7, 2023
1e9739b
Add isBound dart test
camsim99 Mar 7, 2023
83d6969
Start impl
camsim99 Mar 13, 2023
0f387e2
Add image analysis files
camsim99 Mar 13, 2023
0bf4f9a
Start filling in image streaming info
camsim99 Mar 13, 2023
97912fc
More dev
camsim99 Mar 15, 2023
b889e98
Dev
camsim99 Mar 16, 2023
e96c2ec
Fix flutter api
camsim99 Mar 20, 2023
cc2fcbe
Binding refactor
camsim99 Mar 22, 2023
00c51b1
Merge remote-tracking branch 'upstream/main' into camx_imgstr
camsim99 Mar 24, 2023
1e13e53
Undo format changes and change to example
camsim99 Mar 24, 2023
c37db5c
Start fixing ci errors
camsim99 Mar 24, 2023
80753a9
Fix fl analyze
camsim99 Mar 24, 2023
9edf9ac
Merge remote-tracking branch 'upstream/main' into camx_imgstr
camsim99 Mar 27, 2023
7ce175e
Finish implementation
camsim99 Mar 27, 2023
cb62063
Generate mocks
camsim99 Mar 27, 2023
8ccc7ed
Start adding tests
camsim99 Mar 28, 2023
2220bda
Merge remote-tracking branch 'upstream/main' into camx_imgstr
camsim99 Mar 28, 2023
a27cd4c
Start adding tests
camsim99 Mar 28, 2023
9d74956
Add file
camsim99 Mar 28, 2023
64b190e
Add java test
camsim99 Mar 28, 2023
fea7e98
Add tests
camsim99 Mar 28, 2023
22f271b
self review
camsim99 Mar 28, 2023
3867ce0
Fix analyzer and formatting
camsim99 Mar 29, 2023
03a2f6d
Merge remote-tracking branch 'upstream/main' into camx_imgstr
camsim99 Mar 29, 2023
8d08cff
Wrapping with generator
camsim99 Apr 11, 2023
c7c2e2f
Add more implementation
camsim99 Apr 14, 2023
f478e31
Correct autogenerator on dart classes
camsim99 Apr 18, 2023
9877601
Correct generator on java files
camsim99 Apr 18, 2023
f334259
Fix plugin code minus todos
camsim99 Apr 19, 2023
752c8ba
Make fixes required to build apk
camsim99 Apr 19, 2023
3dbd87d
Merge remote-tracking branch 'upstream/main' into camx_imgstr
camsim99 Apr 19, 2023
62b1925
Fix java tests
camsim99 Apr 19, 2023
14cc602
Fix java test names
camsim99 Apr 19, 2023
1f420da
Get feature working
camsim99 Apr 19, 2023
c550fc0
Fix plugin test
camsim99 Apr 21, 2023
e3fa142
Fix analyzer test
camsim99 Apr 21, 2023
8dc333c
Fix plane proxy test
camsim99 Apr 21, 2023
d5bfdac
Fix image proxy test
camsim99 Apr 21, 2023
6034265
Fix image analysis test
camsim99 Apr 21, 2023
a719034
Fix analyze
camsim99 Apr 22, 2023
193ce9c
Format
camsim99 Apr 22, 2023
914e244
Change getters to params, fix java tests
camsim99 Apr 26, 2023
b704ff5
Fix analyze, dart tests
camsim99 Apr 26, 2023
6bae352
Add nonnull annotation for lint
camsim99 Apr 26, 2023
e4f522e
Bump test rerun
camsim99 Apr 26, 2023
9d70b2e
Merge remote-tracking branch 'upstream/main' into camx_imgstr
camsim99 Apr 26, 2023
f2a6167
Add annotations, try fix for test
camsim99 Apr 27, 2023
c42f7a1
Formatting
camsim99 Apr 27, 2023
402af7b
Add annotation
camsim99 Apr 27, 2023
c711743
Revert instance manager integration test changes
camsim99 Apr 27, 2023
5091aa3
Address review, mock test instance manager host api for failing test
camsim99 Apr 27, 2023
c6c5753
Remove asserts in plugin code
camsim99 Apr 27, 2023
619a165
Fix comment
camsim99 Apr 28, 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
Prev Previous commit
Next Next commit
Fix flutter api
  • Loading branch information
camsim99 committed Mar 20, 2023
commit e96c2ecae4f56b9c20203a2e7fdb682d5a1de021
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ public ImageAnalysisFlutterApiImpl(@NonNull BinaryMessenger binaryMessenger) {
}

public void sendOnImageAnalyzedEvent(@NonNull ImageInformation imageInformation, Reply<Void> callback) {
Log.v("FLUTTER", "sendOnImageAnalyzedEvent");
onImageAnalyzed(imageInformation, callback);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ private ImageAnalysis.Analyzer createImageAnalysisAnalyzer() {
return new ImageAnalysis.Analyzer() {
@Override
public void analyze(@NonNull ImageProxy image) {
Log.v("FLUTTER", "Analyzing images!!!!!");
ImageProxy.PlaneProxy[] planes = image.getPlanes();

List<GeneratedCameraXLibrary.ImagePlaneInformation> imagePlanesInformation = new ArrayList<GeneratedCameraXLibrary.ImagePlaneInformation>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import 'camera.dart';
import 'camera_info.dart';
import 'camera_selector.dart';
import 'camerax_library.g.dart';
import 'image_analysis.dart';
import 'java_object.dart';
import 'process_camera_provider.dart';
import 'system_services.dart';
Expand All @@ -20,6 +21,7 @@ class AndroidCameraXCameraFlutterApis {
CameraSelectorFlutterApiImpl? cameraSelectorFlutterApi,
ProcessCameraProviderFlutterApiImpl? processCameraProviderFlutterApi,
SystemServicesFlutterApiImpl? systemServicesFlutterApi,
ImageAnalysisFlutterApiImpl? imageAnalysisFlutterApiImpl,
}) {
this.javaObjectFlutterApi =
javaObjectFlutterApi ?? JavaObjectFlutterApiImpl();
Expand All @@ -32,6 +34,8 @@ class AndroidCameraXCameraFlutterApis {
this.cameraFlutterApi = cameraFlutterApi ?? CameraFlutterApiImpl();
this.systemServicesFlutterApi =
systemServicesFlutterApi ?? SystemServicesFlutterApiImpl();
this.imageAnalysisFlutterApiImpl =
imageAnalysisFlutterApiImpl ?? ImageAnalysisFlutterApiImpl();
}

static bool _haveBeenSetUp = false;
Expand Down Expand Up @@ -61,6 +65,9 @@ class AndroidCameraXCameraFlutterApis {
/// Flutter Api for [SystemServices].
late final SystemServicesFlutterApiImpl systemServicesFlutterApi;

/// Flutter Api for [ImageAnalysis].
late final ImageAnalysisFlutterApiImpl imageAnalysisFlutterApiImpl;

/// Ensures all the Flutter APIs have been setup to receive calls from native code.
void ensureSetUp() {
if (!_haveBeenSetUp) {
Expand All @@ -70,6 +77,7 @@ class AndroidCameraXCameraFlutterApis {
ProcessCameraProviderFlutterApi.setup(processCameraProviderFlutterApi);
CameraFlutterApi.setup(cameraFlutterApi);
SystemServicesFlutterApi.setup(systemServicesFlutterApi);
ImageAnalysisFlutterApi.setup(imageAnalysisFlutterApiImpl);
_haveBeenSetUp = true;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import 'package:camera_platform_interface/camera_platform_interface.dart'
show CameraImageData, CameraImageFormat, CameraImagePlane, ImageFormatGroup;
import 'package:flutter/services.dart' show BinaryMessenger;

import 'android_camera_camerax_flutter_api_impls.dart';
import 'camerax_library.g.dart';
import 'instance_manager.dart';
import 'java_object.dart';
Expand All @@ -25,14 +26,9 @@ class ImageAnalysis extends UseCase {
_api = ImageAnalysisHostApiImpl(
binaryMessenger: binaryMessenger, instanceManager: instanceManager);
_api.createFromInstance(this, targetResolution);
AndroidCameraXCameraFlutterApis.instance.ensureSetUp();
}

/// Stream that emits an event whenever a frame is received for image streaming.
static final StreamController<CameraImageData> onStreamedFrameAvailableStreamController =
StreamController<CameraImageData>.broadcast();

late final ImageAnalysisHostApiImpl _api;

/// Constructs a [ImageAnalysis] that is not automatically attached to a native object.
ImageAnalysis.detached(
{BinaryMessenger? binaryMessenger,
Expand All @@ -43,8 +39,15 @@ class ImageAnalysis extends UseCase {
instanceManager: instanceManager) {
_api = ImageAnalysisHostApiImpl(
binaryMessenger: binaryMessenger, instanceManager: instanceManager);
AndroidCameraXCameraFlutterApis.instance.ensureSetUp();
}

/// Stream that emits an event whenever a frame is received for image streaming.
static final StreamController<CameraImageData> onStreamedFrameAvailableStreamController =
StreamController<CameraImageData>.broadcast();

late final ImageAnalysisHostApiImpl _api;

/// Target resolution of the camera preview stream.
final ResolutionInfo? targetResolution;

Expand Down Expand Up @@ -109,7 +112,6 @@ class ImageAnalysisFlutterApiImpl implements ImageAnalysisFlutterApi {

@override
void onImageAnalyzed(ImageInformation imageInformation) {
print('HELLO?!?!?!?!?');
List<CameraImagePlane> imagePlanes =
imageInformation.imagePlanesInformation!
.map((ImagePlaneInformation? imagePlaneInformation) {
Expand All @@ -127,8 +129,6 @@ class ImageAnalysisFlutterApiImpl implements ImageAnalysisFlutterApi {
width: imageInformation.width,
);

print('CAMILLE');

ImageAnalysis.onStreamedFrameAvailableStreamController.add(data);
}

Expand Down