Skip to content
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

#150 - Force reinit of camera2 view on surface change #183

Merged
merged 1 commit into from
May 15, 2024
Merged

#150 - Force reinit of camera2 view on surface change #183

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 32 additions & 1 deletion enioka_scan_camera/src/main/java/com/enioka/scanner/sdk/camera/CameraBarcodeScanViewV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ class CameraBarcodeScanViewV2 extends CameraBarcodeScanViewBase<Image> {
private String cameraId;
private CameraManager cameraManager;

private int concurrentCameraSessionInitAttempt = 0;
private CameraCaptureSession captureSession;
private CaptureRequest.Builder captureRequestBuilder;
private CaptureRequest captureRequest;
Expand Down Expand Up @@ -569,7 +570,11 @@ public void surfaceCreated(@NonNull SurfaceHolder surfaceHolder) {
@Override
public void surfaceChanged(SurfaceHolder surfaceHolder, int pixelFormat, int newWidth, int newHeight) {
Log.i(TAG, "surface changed " + this.hashCode());
camPreviewSurfaceView.post(this::startPreview);

// Force a full re-init of the view to ensure resolution is up to date.
pauseCamera();
resumeCamera();
//camPreviewSurfaceView.post(this::startPreview);
}

@Override
Expand Down Expand Up @@ -650,8 +655,25 @@ private synchronized void startPreview() {
Log.d(TAG, "Camera device not ready yet");
return;
}

// Handling of the case where resolution was changed while init was ongoing
this.concurrentCameraSessionInitAttempt++;
if (this.concurrentCameraSessionInitAttempt > 1) {
Log.i(TAG, "A camera session is already being initialized, will re-init later");
Log.d(TAG, concurrentCameraSessionInitAttempt + " concurrent attempts");
return;
}

// This block needs to be AFTER the concurrent init check, because if an init is already in
// progress, pauseCamera() will not run and imageReader will not be null, but we still want to
// queue a re-init for later.
// If this block is reached, it means there is no ongoing initialization, so if imageReader is
// not null here, it cannot be due to pauseCamera() not running, so it is safe to return without
// initializing.
// Basically: a hack to deal with race conditions.
if (this.imageReader != null) {
Log.d(TAG, "Image reader already created");
this.concurrentCameraSessionInitAttempt--;
return;
}

Expand Down Expand Up @@ -756,6 +778,15 @@ public void onConfigured(@NonNull final CameraCaptureSession cameraCaptureSessio
}

Log.i(TAG, "Camera repeating capture request was set up " + CameraBarcodeScanViewV2.this.hashCode());

// Handling of the case where resolution was changed while init was ongoing
concurrentCameraSessionInitAttempt--;
if (concurrentCameraSessionInitAttempt > 0) {
Log.i(TAG, "More recent initialization attempts were made, re-initializing capture session");
concurrentCameraSessionInitAttempt = 0;
pauseCamera();
resumeCamera();
}
}

@Override
Expand Down