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

Merge "Camera2: Update tonemap curve definitions." into klp-dev

Browse Source
This commit is contained in:
Zhijun He
2013-08-21 18:44:06 +00:00
committed by Android (Google) Code Review
parent ba75bbe3ce 3ffd70554f
commit e8aae8a122
3 changed files with 56 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/hardware/camera2/CameraProperties.java
View File

@@ -384,8 +384,8 @@ public final class CameraProperties extends CameraMetadata {
* Needed for FOV calculation for old API * Needed for FOV calculation for old API
* </p> * </p>
*/ */
public static final Key<android.hardware.camera2.Size> SENSOR_INFO_PHYSICAL_SIZE = public static final Key<float[]> SENSOR_INFO_PHYSICAL_SIZE =
new Key<android.hardware.camera2.Size>("android.sensor.info.physicalSize", android.hardware.camera2.Size.class); new Key<float[]>("android.sensor.info.physicalSize", float[].class);
/** /**
* <p> * <p>

34
core/java/android/hardware/camera2/CaptureRequest.java
View File

@@ -855,18 +855,30 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable {
* Table mapping blue input values to output * Table mapping blue input values to output
* values * values
* </p> * </p>
* <p>
* Tonemapping / contrast / gamma curve for the blue
* channel, to use when android.tonemap.mode is CONTRAST_CURVE.
* </p><p>
* See android.tonemap.curveRed for more details.
* </p>
*/ */
public static final Key<Float> TONEMAP_CURVE_BLUE = public static final Key<float[]> TONEMAP_CURVE_BLUE =
new Key<Float>("android.tonemap.curveBlue", float.class); new Key<float[]>("android.tonemap.curveBlue", float[].class);
/** /**
* <p> * <p>
* Table mapping green input values to output * Table mapping green input values to output
* values * values
* </p> * </p>
* <p>
* Tonemapping / contrast / gamma curve for the green
* channel, to use when android.tonemap.mode is CONTRAST_CURVE.
* </p><p>
* See android.tonemap.curveRed for more details.
* </p>
*/ */
public static final Key<Float> TONEMAP_CURVE_GREEN = public static final Key<float[]> TONEMAP_CURVE_GREEN =
new Key<Float>("android.tonemap.curveGreen", float.class); new Key<float[]>("android.tonemap.curveGreen", float[].class);
/** /**
* <p> * <p>
@@ -874,9 +886,17 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable {
* values * values
* </p> * </p>
* <p> * <p>
* .The input range must be monotonically increasing * Tonemapping / contrast / gamma curve for the red
* with N, and values between entries should be linearly * channel, to use when android.tonemap.mode is CONTRAST_CURVE.
* interpolated. For example, if the array is: [0.0, 0.0, * </p><p>
* Since the input and output ranges may vary depending on
* the camera pipeline, the input and output pixel values
* are represented by normalized floating-point values
* between 0 and 1, with 0 == black and 1 == white.
* </p><p>
* The curve should be linearly interpolated between the
* defined points. The points will be listed in increasing
* order of P_IN. For example, if the array is: [0.0, 0.0,
* 0.3, 0.5, 1.0, 1.0], then the input->output mapping * 0.3, 0.5, 1.0, 1.0], then the input->output mapping
* for a few sample points would be: 0 -> 0, 0.15 -> * for a few sample points would be: 0 -> 0, 0.15 ->
* 0.25, 0.3 -> 0.5, 0.5 -> 0.64 * 0.25, 0.3 -> 0.5, 0.5 -> 0.64

34
core/java/android/hardware/camera2/CaptureResult.java
View File

@@ -877,18 +877,30 @@ public final class CaptureResult extends CameraMetadata {
* Table mapping blue input values to output * Table mapping blue input values to output
* values * values
* </p> * </p>
* <p>
* Tonemapping / contrast / gamma curve for the blue
* channel, to use when android.tonemap.mode is CONTRAST_CURVE.
* </p><p>
* See android.tonemap.curveRed for more details.
* </p>
*/ */
public static final Key<Float> TONEMAP_CURVE_BLUE = public static final Key<float[]> TONEMAP_CURVE_BLUE =
new Key<Float>("android.tonemap.curveBlue", float.class); new Key<float[]>("android.tonemap.curveBlue", float[].class);
/** /**
* <p> * <p>
* Table mapping green input values to output * Table mapping green input values to output
* values * values
* </p> * </p>
* <p>
* Tonemapping / contrast / gamma curve for the green
* channel, to use when android.tonemap.mode is CONTRAST_CURVE.
* </p><p>
* See android.tonemap.curveRed for more details.
* </p>
*/ */
public static final Key<Float> TONEMAP_CURVE_GREEN = public static final Key<float[]> TONEMAP_CURVE_GREEN =
new Key<Float>("android.tonemap.curveGreen", float.class); new Key<float[]>("android.tonemap.curveGreen", float[].class);
/** /**
* <p> * <p>
@@ -896,9 +908,17 @@ public final class CaptureResult extends CameraMetadata {
* values * values
* </p> * </p>
* <p> * <p>
* .The input range must be monotonically increasing * Tonemapping / contrast / gamma curve for the red
* with N, and values between entries should be linearly * channel, to use when android.tonemap.mode is CONTRAST_CURVE.
* interpolated. For example, if the array is: [0.0, 0.0, * </p><p>
* Since the input and output ranges may vary depending on
* the camera pipeline, the input and output pixel values
* are represented by normalized floating-point values
* between 0 and 1, with 0 == black and 1 == white.
* </p><p>
* The curve should be linearly interpolated between the
* defined points. The points will be listed in increasing
* order of P_IN. For example, if the array is: [0.0, 0.0,
* 0.3, 0.5, 1.0, 1.0], then the input->output mapping * 0.3, 0.5, 1.0, 1.0], then the input->output mapping
* for a few sample points would be: 0 -> 0, 0.15 -> * for a few sample points would be: 0 -> 0, 0.15 ->
* 0.25, 0.3 -> 0.5, 0.5 -> 0.64 * 0.25, 0.3 -> 0.5, 0.5 -> 0.64