Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Camera: Hook up zoom ratio in legacy camera2 shim" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-16 06:00:14 +00:00
committed by Android (Google) Code Review
parent 2a58cd105d f807a41008
commit 27e6f4ebf7
5 changed files with 126 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/hardware/camera2/legacy/LegacyFaceDetectMapper.java
View File

@@ -233,8 +233,10 @@ public class LegacyFaceDetectMapper {
Camera.Parameters params = legacyRequest.parameters;
Rect activeArray = characteristics.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE);
ZoomData zoomData = ParameterUtils.convertScalerCropRegion(activeArray,
request.get(CaptureRequest.SCALER_CROP_REGION), previewSize, params);
ZoomData zoomData = ParameterUtils.convertToLegacyZoom(activeArray,
request.get(CaptureRequest.SCALER_CROP_REGION),
request.get(CaptureRequest.CONTROL_ZOOM_RATIO),
previewSize, params);
List<Face> convertedFaces = new ArrayList<>();
if (faces != null) {

12
core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
View File

@@ -771,6 +771,7 @@ public class LegacyMetadataMapper {
CameraCharacteristics.CONTROL_AWB_AVAILABLE_MODES ,
CameraCharacteristics.CONTROL_AWB_LOCK_AVAILABLE ,
CameraCharacteristics.CONTROL_MAX_REGIONS ,
CameraCharacteristics.CONTROL_ZOOM_RATIO_RANGE ,
CameraCharacteristics.FLASH_INFO_AVAILABLE ,
CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL ,
CameraCharacteristics.JPEG_AVAILABLE_THUMBNAIL_SIZES ,
@@ -828,6 +829,7 @@ public class LegacyMetadataMapper {
CaptureRequest.CONTROL_MODE,
CaptureRequest.CONTROL_SCENE_MODE,
CaptureRequest.CONTROL_VIDEO_STABILIZATION_MODE,
CaptureRequest.CONTROL_ZOOM_RATIO,
CaptureRequest.FLASH_MODE,
CaptureRequest.JPEG_GPS_COORDINATES,
CaptureRequest.JPEG_GPS_PROCESSING_METHOD,
@@ -872,6 +874,7 @@ public class LegacyMetadataMapper {
CaptureResult.CONTROL_AWB_MODE ,
CaptureResult.CONTROL_AWB_LOCK ,
CaptureResult.CONTROL_MODE ,
CaptureResult.CONTROL_ZOOM_RATIO ,
CaptureResult.FLASH_MODE ,
CaptureResult.JPEG_GPS_COORDINATES ,
CaptureResult.JPEG_GPS_PROCESSING_METHOD ,
@@ -934,6 +937,12 @@ public class LegacyMetadataMapper {
}
private static void mapScaler(CameraMetadataNative m, Parameters p) {
/*
* control.zoomRatioRange
*/
Range<Float> zoomRatioRange = new Range<Float>(1.0f, ParameterUtils.getMaxZoomRatio(p));
m.set(CONTROL_ZOOM_RATIO_RANGE, zoomRatioRange);
/*
* scaler.availableMaxDigitalZoom
*/
@@ -1383,6 +1392,9 @@ public class LegacyMetadataMapper {
// control.sceneMode -- DISABLED is always available
m.set(CaptureRequest.CONTROL_SCENE_MODE, CONTROL_SCENE_MODE_DISABLED);
// control.zoomRatio -- 1.0
m.set(CaptureRequest.CONTROL_ZOOM_RATIO, 1.0f);
/*
* statistics.*
*/

3
core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java
View File

@@ -68,8 +68,9 @@ public class LegacyRequestMapper {
*/
ParameterUtils.ZoomData zoomData;
{
zoomData = ParameterUtils.convertScalerCropRegion(activeArray,
zoomData = ParameterUtils.convertToLegacyZoom(activeArray,
request.get(SCALER_CROP_REGION),
request.get(CONTROL_ZOOM_RATIO),
previewSize,
params);

13
core/java/android/hardware/camera2/legacy/LegacyResultMapper.java
View File

@@ -118,8 +118,10 @@ public class LegacyResultMapper {
Rect activeArraySize = characteristics.get(
CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE);
ZoomData zoomData = ParameterUtils.convertScalerCropRegion(activeArraySize,
request.get(CaptureRequest.SCALER_CROP_REGION), previewSize, params);
ZoomData zoomData = ParameterUtils.convertToLegacyZoom(activeArraySize,
request.get(CaptureRequest.SCALER_CROP_REGION),
request.get(CaptureRequest.CONTROL_ZOOM_RATIO),
previewSize, params);
/*
* colorCorrection
@@ -516,5 +518,12 @@ public class LegacyResultMapper {
{
m.set(SCALER_CROP_REGION, zoomData.reportedCrop);
}
/*
* control.zoomRatio
*/
{
m.set(CONTROL_ZOOM_RATIO, zoomData.reportedZoomRatio);
}
}
}

101
core/java/android/hardware/camera2/legacy/ParameterUtils.java
View File

@@ -73,11 +73,15 @@ public class ParameterUtils {
public final Rect previewCrop;
/** Reported crop-region given the zoom index, coordinates relative to active-array */
public final Rect reportedCrop;
/** Reported zoom ratio given the zoom index */
public final float reportedZoomRatio;
public ZoomData(int zoomIndex, Rect previewCrop, Rect reportedCrop) {
public ZoomData(int zoomIndex, Rect previewCrop, Rect reportedCrop,
float reportedZoomRatio) {
this.zoomIndex = zoomIndex;
this.previewCrop = previewCrop;
this.reportedCrop = reportedCrop;
this.reportedZoomRatio = reportedZoomRatio;
}
}
@@ -371,7 +375,8 @@ public class ParameterUtils {
* @throws NullPointerException if any of the args were {@code null}
*/
public static int getClosestAvailableZoomCrop(
Camera.Parameters params, Rect activeArray, Size streamSize, Rect cropRegion,
Camera.Parameters params, Rect activeArray,
Size streamSize, Rect cropRegion,
/*out*/
Rect reportedCropRegion,
Rect previewCropRegion) {
@@ -732,6 +737,92 @@ public class ParameterUtils {
return new SizeF(zoomRatioWidth, zoomRatioHeight);
}
/**
* Convert the user-specified crop region/zoom into zoom data; which can be used
* to set the parameters to a specific zoom index, or to report back to the user what
* the actual zoom was, or for other calculations requiring the current preview crop region.
*
* <p>None of the parameters are mutated.<p>
*
* @param activeArraySize active array size of the sensor (e.g. max jpeg size)
* @param cropRegion the user-specified crop region
* @param zoomRatio the user-specified zoom ratio
* @param previewSize the current preview size (in pixels)
* @param params the current camera parameters (not mutated)
*
* @return the zoom index, and the effective/reported crop regions (relative to active array)
*/
public static ZoomData convertToLegacyZoom(Rect activeArraySize, Rect
cropRegion, Float zoomRatio, Size previewSize, Camera.Parameters params) {
final float FLOAT_EQUAL_THRESHOLD = 0.0001f;
if (zoomRatio != null &&
Math.abs(1.0f - zoomRatio) > FLOAT_EQUAL_THRESHOLD) {
// User uses CONTROL_ZOOM_RATIO to control zoom
return convertZoomRatio(activeArraySize, zoomRatio, previewSize, params);
}
return convertScalerCropRegion(activeArraySize, cropRegion, previewSize, params);
}
/**
* Convert the user-specified zoom ratio into zoom data; which can be used
* to set the parameters to a specific zoom index, or to report back to the user what the
* actual zoom was, or for other calculations requiring the current preview crop region.
*
* <p>None of the parameters are mutated.</p>
*
* @param activeArraySize active array size of the sensor (e.g. max jpeg size)
* @param zoomRatio the current zoom ratio
* @param previewSize the current preview size (in pixels)
* @param params the current camera parameters (not mutated)
*
* @return the zoom index, and the effective/reported crop regions (relative to active array)
*/
public static ZoomData convertZoomRatio(Rect activeArraySize, float zoomRatio,
Size previewSize, Camera.Parameters params) {
if (DEBUG) {
Log.v(TAG, "convertZoomRatio - user zoom ratio was " + zoomRatio);
}
List<Rect> availableReportedCropRegions =
getAvailableZoomCropRectangles(params, activeArraySize);
List<Rect> availablePreviewCropRegions =
getAvailablePreviewZoomCropRectangles(params, activeArraySize, previewSize);
if (availableReportedCropRegions.size() != availablePreviewCropRegions.size()) {
throw new AssertionError("available reported/preview crop region size mismatch");
}
// Find the best matched legacy zoom ratio for the requested camera2 zoom ratio.
int bestZoomIndex = 0;
Rect reportedCropRegion = new Rect(availableReportedCropRegions.get(0));
Rect previewCropRegion = new Rect(availablePreviewCropRegions.get(0));
float reportedZoomRatio = 1.0f;
if (params.isZoomSupported()) {
List<Integer> zoomRatios = params.getZoomRatios();
for (int i = 1; i < zoomRatios.size(); i++) {
if (zoomRatio * ZOOM_RATIO_MULTIPLIER >= zoomRatios.get(i)) {
bestZoomIndex = i;
reportedCropRegion = availableReportedCropRegions.get(i);
previewCropRegion = availablePreviewCropRegions.get(i);
reportedZoomRatio = zoomRatios.get(i);
} else {
break;
}
}
}
if (DEBUG) {
Log.v(TAG, "convertZoomRatio - zoom calculated to: " +
"zoomIndex = " + bestZoomIndex +
", reported crop region = " + reportedCropRegion +
", preview crop region = " + previewCropRegion +
", reported zoom ratio = " + reportedZoomRatio);
}
return new ZoomData(bestZoomIndex, reportedCropRegion,
previewCropRegion, reportedZoomRatio);
}
/**
* Convert the user-specified crop region into zoom data; which can be used
* to set the parameters to a specific zoom index, or to report back to the user what the
@@ -767,15 +858,17 @@ public class ParameterUtils {
final int zoomIdx = ParameterUtils.getClosestAvailableZoomCrop(params, activeArraySizeOnly,
previewSize, userCropRegion,
/*out*/reportedCropRegion, /*out*/previewCropRegion);
final float reportedZoomRatio = 1.0f;
if (DEBUG) {
Log.v(TAG, "convertScalerCropRegion - zoom calculated to: " +
"zoomIndex = " + zoomIdx +
", reported crop region = " + reportedCropRegion +
", preview crop region = " + previewCropRegion);
", preview crop region = " + previewCropRegion +
", reported zoom ratio = " + reportedZoomRatio);
}
return new ZoomData(zoomIdx, previewCropRegion, reportedCropRegion);
return new ZoomData(zoomIdx, previewCropRegion, reportedCropRegion, reportedZoomRatio);
}
/**