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

am 98977fa0: am aa9a27bb: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev

Browse Source 
* commit '98977fa042deb2109d7869f6217447d0c4387e08':
  Camera2: Update FAST mode for EE and NR
This commit is contained in:
Chien-Yu Chen
2015-07-17 17:20:09 +00:00
committed by Android Git Automerger
parent 5e20e0c902 98977fa042
commit fe13f57f95
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/hardware/camera2/CameraMetadata.java
View File

@@ -1994,8 +1994,9 @@ public abstract class CameraMetadata<TKey> {
public static final int EDGE_MODE_OFF = 0; public static final int EDGE_MODE_OFF = 0;
/** /**
* <p>Apply edge enhancement at a quality level that does not slow down frame rate relative to sensor * <p>Apply edge enhancement at a quality level that does not slow down frame rate
* output</p> * relative to sensor output. It may be the same as OFF if edge enhancement will
* slow down frame rate relative to sensor.</p>
* @see CaptureRequest#EDGE_MODE * @see CaptureRequest#EDGE_MODE
*/ */
public static final int EDGE_MODE_FAST = 1; public static final int EDGE_MODE_FAST = 1;
@@ -2117,7 +2118,8 @@ public abstract class CameraMetadata<TKey> {
/** /**
* <p>Noise reduction is applied without reducing frame rate relative to sensor * <p>Noise reduction is applied without reducing frame rate relative to sensor
* output.</p> * output. It may be the same as OFF if noise reduction will reduce frame rate
* relative to sensor.</p>
* @see CaptureRequest#NOISE_REDUCTION_MODE * @see CaptureRequest#NOISE_REDUCTION_MODE
*/ */
public static final int NOISE_REDUCTION_MODE_FAST = 1; public static final int NOISE_REDUCTION_MODE_FAST = 1;

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

@@ -1584,8 +1584,9 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
* will be applied. HIGH_QUALITY mode indicates that the * will be applied. HIGH_QUALITY mode indicates that the
* camera device will use the highest-quality enhancement algorithms, * camera device will use the highest-quality enhancement algorithms,
* even if it slows down capture rate. FAST means the camera device will * even if it slows down capture rate. FAST means the camera device will
* not slow down capture rate when applying edge enhancement. Every output stream will * not slow down capture rate when applying edge enhancement. FAST may be the same as OFF if
* have a similar amount of enhancement applied.</p> * edge enhancement will slow down capture rate. Every output stream will have a similar
* amount of enhancement applied.</p>
* <p>ZERO_SHUTTER_LAG is meant to be used by applications that maintain a continuous circular * <p>ZERO_SHUTTER_LAG is meant to be used by applications that maintain a continuous circular
* buffer of high-resolution images during preview and reprocess image(s) from that buffer * buffer of high-resolution images during preview and reprocess image(s) from that buffer
* into a final capture when triggered by the user. In this mode, the camera device applies * into a final capture when triggered by the user. In this mode, the camera device applies
@@ -1594,7 +1595,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
* since those will be reprocessed later if necessary.</p> * since those will be reprocessed later if necessary.</p>
* <p>For YUV_REPROCESSING, these FAST/HIGH_QUALITY modes both mean that the camera * <p>For YUV_REPROCESSING, these FAST/HIGH_QUALITY modes both mean that the camera
* device will apply FAST/HIGH_QUALITY YUV-domain edge enhancement, respectively. * device will apply FAST/HIGH_QUALITY YUV-domain edge enhancement, respectively.
* The camera device may adjust its internal noise reduction parameters for best * The camera device may adjust its internal edge enhancement parameters for best
* image quality based on the {@link CaptureRequest#REPROCESS_EFFECTIVE_EXPOSURE_FACTOR android.reprocess.effectiveExposureFactor}, if it is set.</p> * image quality based on the {@link CaptureRequest#REPROCESS_EFFECTIVE_EXPOSURE_FACTOR android.reprocess.effectiveExposureFactor}, if it is set.</p>
* <p><b>Possible values:</b> * <p><b>Possible values:</b>
* <ul> * <ul>
@@ -2003,8 +2004,9 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
* will be applied. HIGH_QUALITY mode indicates that the camera device * will be applied. HIGH_QUALITY mode indicates that the camera device
* will use the highest-quality noise filtering algorithms, * will use the highest-quality noise filtering algorithms,
* even if it slows down capture rate. FAST means the camera device will not * even if it slows down capture rate. FAST means the camera device will not
* slow down capture rate when applying noise filtering. Every output stream will * slow down capture rate when applying noise filtering. FAST may be the same as MINIMAL if
* have a similar amount of enhancement applied.</p> * MINIMAL is listed, or the same as OFF if any noise filtering will slow down capture rate.
* Every output stream will have a similar amount of enhancement applied.</p>
* <p>ZERO_SHUTTER_LAG is meant to be used by applications that maintain a continuous circular * <p>ZERO_SHUTTER_LAG is meant to be used by applications that maintain a continuous circular
* buffer of high-resolution images during preview and reprocess image(s) from that buffer * buffer of high-resolution images during preview and reprocess image(s) from that buffer
* into a final capture when triggered by the user. In this mode, the camera device applies * into a final capture when triggered by the user. In this mode, the camera device applies

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

@@ -2095,8 +2095,9 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
* will be applied. HIGH_QUALITY mode indicates that the * will be applied. HIGH_QUALITY mode indicates that the
* camera device will use the highest-quality enhancement algorithms, * camera device will use the highest-quality enhancement algorithms,
* even if it slows down capture rate. FAST means the camera device will * even if it slows down capture rate. FAST means the camera device will
* not slow down capture rate when applying edge enhancement. Every output stream will * not slow down capture rate when applying edge enhancement. FAST may be the same as OFF if
* have a similar amount of enhancement applied.</p> * edge enhancement will slow down capture rate. Every output stream will have a similar
* amount of enhancement applied.</p>
* <p>ZERO_SHUTTER_LAG is meant to be used by applications that maintain a continuous circular * <p>ZERO_SHUTTER_LAG is meant to be used by applications that maintain a continuous circular
* buffer of high-resolution images during preview and reprocess image(s) from that buffer * buffer of high-resolution images during preview and reprocess image(s) from that buffer
* into a final capture when triggered by the user. In this mode, the camera device applies * into a final capture when triggered by the user. In this mode, the camera device applies
@@ -2105,7 +2106,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
* since those will be reprocessed later if necessary.</p> * since those will be reprocessed later if necessary.</p>
* <p>For YUV_REPROCESSING, these FAST/HIGH_QUALITY modes both mean that the camera * <p>For YUV_REPROCESSING, these FAST/HIGH_QUALITY modes both mean that the camera
* device will apply FAST/HIGH_QUALITY YUV-domain edge enhancement, respectively. * device will apply FAST/HIGH_QUALITY YUV-domain edge enhancement, respectively.
* The camera device may adjust its internal noise reduction parameters for best * The camera device may adjust its internal edge enhancement parameters for best
* image quality based on the {@link CaptureRequest#REPROCESS_EFFECTIVE_EXPOSURE_FACTOR android.reprocess.effectiveExposureFactor}, if it is set.</p> * image quality based on the {@link CaptureRequest#REPROCESS_EFFECTIVE_EXPOSURE_FACTOR android.reprocess.effectiveExposureFactor}, if it is set.</p>
* <p><b>Possible values:</b> * <p><b>Possible values:</b>
* <ul> * <ul>
@@ -2786,8 +2787,9 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
* will be applied. HIGH_QUALITY mode indicates that the camera device * will be applied. HIGH_QUALITY mode indicates that the camera device
* will use the highest-quality noise filtering algorithms, * will use the highest-quality noise filtering algorithms,
* even if it slows down capture rate. FAST means the camera device will not * even if it slows down capture rate. FAST means the camera device will not
* slow down capture rate when applying noise filtering. Every output stream will * slow down capture rate when applying noise filtering. FAST may be the same as MINIMAL if
* have a similar amount of enhancement applied.</p> * MINIMAL is listed, or the same as OFF if any noise filtering will slow down capture rate.
* Every output stream will have a similar amount of enhancement applied.</p>
* <p>ZERO_SHUTTER_LAG is meant to be used by applications that maintain a continuous circular * <p>ZERO_SHUTTER_LAG is meant to be used by applications that maintain a continuous circular
* buffer of high-resolution images during preview and reprocess image(s) from that buffer * buffer of high-resolution images during preview and reprocess image(s) from that buffer
* into a final capture when triggered by the user. In this mode, the camera device applies * into a final capture when triggered by the user. In this mode, the camera device applies