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

feat: Add high resolution support for camera picture taking #354

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Add high resolution support for camera picture taking #354

Show file tree
Hide file tree
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
113 changes: 76 additions & 37 deletions android/src/main/java/com/ahm/capacitor/camera/preview/CameraActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ private enum RecordingState {
public boolean tapToFocus;
public boolean disableExifHeaderStripping;
public boolean storeToFile;
public boolean enableHighResolution;
public boolean toBack;
public boolean enableOpacity = false;
public boolean enableZoom = false;
Expand Down Expand Up @@ -590,13 +591,6 @@ private Camera.Size getOptimalPictureSize(
final Camera.Size previewSize,
final List<Camera.Size> supportedSizes
) {
/*
get the supportedPictureSize that:
- matches exactly width and height
- has the closest aspect ratio to the preview aspect ratio
- has picture.width and picture.height closest to width and height
- has the highest supported picture width and height up to 2 Megapixel if width == 0 || height == 0
*/
Camera.Size size = mCamera.new Size(width, height);

// convert to landscape if necessary
Expand All @@ -607,7 +601,6 @@ private Camera.Size getOptimalPictureSize(
}

Camera.Size requestedSize = mCamera.new Size(size.width, size.height);

double previewAspectRatio = (double) previewSize.width / (double) previewSize.height;

if (previewAspectRatio < 1.0) {
Expand All @@ -619,47 +612,52 @@ private Camera.Size getOptimalPictureSize(

double aspectTolerance = 0.1;
double bestDifference = Double.MAX_VALUE;
Camera.Size bestSize = null;
int maxArea = 0;

for (int i = 0; i < supportedSizes.size(); i++) {
Camera.Size supportedSize = supportedSizes.get(i);

for (Camera.Size supportedSize : supportedSizes) {
// Perfect match
if (supportedSize.equals(requestedSize)) {
Log.d(TAG, "CameraPreview optimalPictureSize " + supportedSize.width + 'x' + supportedSize.height);
return supportedSize;
}

double difference = Math.abs(previewAspectRatio - ((double) supportedSize.width / (double) supportedSize.height));
int area = supportedSize.width * supportedSize.height;

if (difference < bestDifference - aspectTolerance) {
// better aspectRatio found
if ((width != 0 && height != 0) || (supportedSize.width * supportedSize.height < 2048 * 1024)) {
size.width = supportedSize.width;
size.height = supportedSize.height;
bestDifference = difference;
if (width == 0 || height == 0) {
// If no specific size requested and high resolution is enabled, find the highest resolution with matching aspect ratio
if (difference < aspectTolerance && area > maxArea) {
bestSize = supportedSize;
maxArea = area;
}
} else if (difference < bestDifference + aspectTolerance) {
// same aspectRatio found (within tolerance)
if (width == 0 || height == 0) {
// set highest supported resolution below 2 Megapixel
if ((size.width < supportedSize.width) && (supportedSize.width * supportedSize.height < 2048 * 1024)) {
size.width = supportedSize.width;
size.height = supportedSize.height;
}
} else {
} else {
// If specific size requested, find the closest match
if (difference < bestDifference - aspectTolerance) {
bestSize = supportedSize;
bestDifference = difference;
} else if (difference < bestDifference + aspectTolerance) {
// same aspectRatio found (within tolerance)
// check if this pictureSize closer to requested width and height
if (
Math.abs(width * height - supportedSize.width * supportedSize.height) <
Math.abs(width * height - size.width * size.height)
Math.abs(width * height - bestSize.width * bestSize.height)
) {
size.width = supportedSize.width;
size.height = supportedSize.height;
bestSize = supportedSize;
}
}
}
}
Log.d(TAG, "CameraPreview optimalPictureSize " + size.width + 'x' + size.height);
return size;

if (bestSize != null) {
Log.d(TAG, "CameraPreview optimalPictureSize " + bestSize.width + 'x' + bestSize.height);
return bestSize;
}

// If no good match found, return the first supported size
Camera.Size defaultSize = supportedSizes.get(0);
Log.d(TAG, "CameraPreview defaultPictureSize " + defaultSize.width + 'x' + defaultSize.height);
return defaultSize;
}

static byte[] rotateNV21(final byte[] yuv, final int width, final int height, final int rotation) {
Expand Down Expand Up @@ -741,7 +739,7 @@ public void onPreviewFrame(byte[] bytes, Camera camera) {
}

public void takePicture(final int width, final int height, final int quality) {
Log.d(TAG, "CameraPreview takePicture width: " + width + ", height: " + height + ", quality: " + quality);
Log.d(TAG, "CameraPreview takePicture width: " + width + ", height: " + height + ", quality: " + quality + ", enableHighResolution: " + enableHighResolution);

if (mPreview != null) {
if (!canTakePicture) {
Expand All @@ -754,7 +752,43 @@ public void takePicture(final int width, final int height, final int quality) {
public void run() {
Camera.Parameters params = mCamera.getParameters();

Camera.Size size = getOptimalPictureSize(width, height, params.getPreviewSize(), params.getSupportedPictureSizes());
Camera.Size size;
if (enableHighResolution && width == 0 && height == 0) {
// When high resolution is enabled and no specific size is requested,
// use the highest resolution available
List<Camera.Size> sizes = params.getSupportedPictureSizes();
size = sizes.get(0);
for (Camera.Size supportedSize : sizes) {
if (supportedSize.width * supportedSize.height > size.width * size.height) {
size = supportedSize;
}
}
Log.d(TAG, "Using highest resolution: " + size.width + "x" + size.height);
} else if (width != 0 && height != 0) {
// When specific dimensions are requested, find the closest match
List<Camera.Size> sizes = params.getSupportedPictureSizes();
size = sizes.get(0);
long requestedPixels = width * height;
long closestDiff = Math.abs(requestedPixels - (size.width * size.height));

for (Camera.Size supportedSize : sizes) {
long diff = Math.abs(requestedPixels - (supportedSize.width * supportedSize.height));
if (diff < closestDiff) {
size = supportedSize;
closestDiff = diff;
}
}
Log.d(TAG, "All supported picture sizes:");
for (Camera.Size supportedSize : sizes) {
Log.d(TAG, supportedSize.width + "x" + supportedSize.height);
}
Log.d(TAG, "Using closest match to requested resolution: " + size.width + "x" + size.height);
} else {
// Default behavior - use optimal size based on preview
size = getOptimalPictureSize(width, height, params.getPreviewSize(), params.getSupportedPictureSizes());
Log.d(TAG, "Using optimal preview-based resolution: " + size.width + "x" + size.height);
}

params.setPictureSize(size.width, size.height);
currentQuality = quality;

Expand Down Expand Up @@ -798,11 +832,16 @@ public void run() {
params.setRotation(mPreview.getDisplayOrientation());
}

mCamera.setParameters(params);
mCamera.takePicture(shutterCallback, null, jpegPictureCallback);
try {
mCamera.setParameters(params);
mCamera.takePicture(shutterCallback, null, jpegPictureCallback);
} catch (RuntimeException e) {
Log.e(TAG, "Camera error while setting parameters: " + e.getMessage());
canTakePicture = true;
eventListener.onPictureTakenError("Failed to take picture: " + e.getMessage());
}
}
}
.start();
}.start();
} else {
canTakePicture = true;
}
Expand Down
2 changes: 2 additions & 0 deletions android/src/main/java/com/ahm/capacitor/camera/preview/CameraPreview.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ private void startCamera(final PluginCall call) {
final Boolean enableZoom = call.getBoolean("enableZoom", false);
final Boolean disableExifHeaderStripping = call.getBoolean("disableExifHeaderStripping", true);
final Boolean lockOrientation = call.getBoolean("lockAndroidOrientation", false);
final Boolean enableHighResolution = call.getBoolean("enableHighResolution", false);
previousOrientationRequest = getBridge().getActivity().getRequestedOrientation();

fragment = new CameraActivity();
Expand All @@ -292,6 +293,7 @@ private void startCamera(final PluginCall call) {
fragment.toBack = toBack;
fragment.enableOpacity = enableOpacity;
fragment.enableZoom = enableZoom;
fragment.enableHighResolution = enableHighResolution;

bridge
.getActivity()
Expand Down