Skip to content

Commit 9c9167e

Browse files
author
Chien-Yu Chen
committed
Camera2: Update FAST mode for EE and NR
FAST for EE/NR modes may be the same as OFF for devices whose EE/NR will slow down the capture rate. Bug: 22486061 Change-Id: I162dc27a6ba6838fbbc1077dd346f4ff9bbacc43
1 parent 0f69b46 commit 9c9167e

3 files changed

Lines changed: 19 additions & 13 deletions

File tree

core/java/android/hardware/camera2/CameraMetadata.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1994,8 +1994,9 @@ private static <TKey> boolean shouldKeyBeAdded(TKey key, Field field, int[] filt
19941994
public static final int EDGE_MODE_OFF = 0;
19951995

19961996
/**
1997-
* <p>Apply edge enhancement at a quality level that does not slow down frame rate relative to sensor
1998-
* output</p>
1997+
* <p>Apply edge enhancement at a quality level that does not slow down frame rate
1998+
* relative to sensor output. It may be the same as OFF if edge enhancement will
1999+
* slow down frame rate relative to sensor.</p>
19992000
* @see CaptureRequest#EDGE_MODE
20002001
*/
20012002
public static final int EDGE_MODE_FAST = 1;
@@ -2117,7 +2118,8 @@ private static <TKey> boolean shouldKeyBeAdded(TKey key, Field field, int[] filt
21172118

21182119
/**
21192120
* <p>Noise reduction is applied without reducing frame rate relative to sensor
2120-
* output.</p>
2121+
* output. It may be the same as OFF if noise reduction will reduce frame rate
2122+
* relative to sensor.</p>
21212123
* @see CaptureRequest#NOISE_REDUCTION_MODE
21222124
*/
21232125
public static final int NOISE_REDUCTION_MODE_FAST = 1;

core/java/android/hardware/camera2/CaptureRequest.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,8 +1584,9 @@ public boolean isEmpty() {
15841584
* will be applied. HIGH_QUALITY mode indicates that the
15851585
* camera device will use the highest-quality enhancement algorithms,
15861586
* even if it slows down capture rate. FAST means the camera device will
1587-
* not slow down capture rate when applying edge enhancement. Every output stream will
1588-
* have a similar amount of enhancement applied.</p>
1587+
* not slow down capture rate when applying edge enhancement. FAST may be the same as OFF if
1588+
* edge enhancement will slow down capture rate. Every output stream will have a similar
1589+
* amount of enhancement applied.</p>
15891590
* <p>ZERO_SHUTTER_LAG is meant to be used by applications that maintain a continuous circular
15901591
* buffer of high-resolution images during preview and reprocess image(s) from that buffer
15911592
* into a final capture when triggered by the user. In this mode, the camera device applies
@@ -1594,7 +1595,7 @@ public boolean isEmpty() {
15941595
* since those will be reprocessed later if necessary.</p>
15951596
* <p>For YUV_REPROCESSING, these FAST/HIGH_QUALITY modes both mean that the camera
15961597
* device will apply FAST/HIGH_QUALITY YUV-domain edge enhancement, respectively.
1597-
* The camera device may adjust its internal noise reduction parameters for best
1598+
* The camera device may adjust its internal edge enhancement parameters for best
15981599
* image quality based on the {@link CaptureRequest#REPROCESS_EFFECTIVE_EXPOSURE_FACTOR android.reprocess.effectiveExposureFactor}, if it is set.</p>
15991600
* <p><b>Possible values:</b>
16001601
* <ul>
@@ -2003,8 +2004,9 @@ public boolean isEmpty() {
20032004
* will be applied. HIGH_QUALITY mode indicates that the camera device
20042005
* will use the highest-quality noise filtering algorithms,
20052006
* even if it slows down capture rate. FAST means the camera device will not
2006-
* slow down capture rate when applying noise filtering. Every output stream will
2007-
* have a similar amount of enhancement applied.</p>
2007+
* slow down capture rate when applying noise filtering. FAST may be the same as MINIMAL if
2008+
* MINIMAL is listed, or the same as OFF if any noise filtering will slow down capture rate.
2009+
* Every output stream will have a similar amount of enhancement applied.</p>
20082010
* <p>ZERO_SHUTTER_LAG is meant to be used by applications that maintain a continuous circular
20092011
* buffer of high-resolution images during preview and reprocess image(s) from that buffer
20102012
* into a final capture when triggered by the user. In this mode, the camera device applies

core/java/android/hardware/camera2/CaptureResult.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2095,8 +2095,9 @@ public int getSequenceId() {
20952095
* will be applied. HIGH_QUALITY mode indicates that the
20962096
* camera device will use the highest-quality enhancement algorithms,
20972097
* even if it slows down capture rate. FAST means the camera device will
2098-
* not slow down capture rate when applying edge enhancement. Every output stream will
2099-
* have a similar amount of enhancement applied.</p>
2098+
* not slow down capture rate when applying edge enhancement. FAST may be the same as OFF if
2099+
* edge enhancement will slow down capture rate. Every output stream will have a similar
2100+
* amount of enhancement applied.</p>
21002101
* <p>ZERO_SHUTTER_LAG is meant to be used by applications that maintain a continuous circular
21012102
* buffer of high-resolution images during preview and reprocess image(s) from that buffer
21022103
* into a final capture when triggered by the user. In this mode, the camera device applies
@@ -2105,7 +2106,7 @@ public int getSequenceId() {
21052106
* since those will be reprocessed later if necessary.</p>
21062107
* <p>For YUV_REPROCESSING, these FAST/HIGH_QUALITY modes both mean that the camera
21072108
* device will apply FAST/HIGH_QUALITY YUV-domain edge enhancement, respectively.
2108-
* The camera device may adjust its internal noise reduction parameters for best
2109+
* The camera device may adjust its internal edge enhancement parameters for best
21092110
* image quality based on the {@link CaptureRequest#REPROCESS_EFFECTIVE_EXPOSURE_FACTOR android.reprocess.effectiveExposureFactor}, if it is set.</p>
21102111
* <p><b>Possible values:</b>
21112112
* <ul>
@@ -2786,8 +2787,9 @@ public int getSequenceId() {
27862787
* will be applied. HIGH_QUALITY mode indicates that the camera device
27872788
* will use the highest-quality noise filtering algorithms,
27882789
* even if it slows down capture rate. FAST means the camera device will not
2789-
* slow down capture rate when applying noise filtering. Every output stream will
2790-
* have a similar amount of enhancement applied.</p>
2790+
* slow down capture rate when applying noise filtering. FAST may be the same as MINIMAL if
2791+
* MINIMAL is listed, or the same as OFF if any noise filtering will slow down capture rate.
2792+
* Every output stream will have a similar amount of enhancement applied.</p>
27912793
* <p>ZERO_SHUTTER_LAG is meant to be used by applications that maintain a continuous circular
27922794
* buffer of high-resolution images during preview and reprocess image(s) from that buffer
27932795
* into a final capture when triggered by the user. In this mode, the camera device applies

0 commit comments

Comments
 (0)