diff options
| author | Chien-Yu Chen <cychen@google.com> | 2015-06-26 22:09:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-26 22:09:37 +0000 |
| commit | f09fd213c37f8eef0e6355fee593562474554e68 (patch) | |
| tree | 6efe6820f369530f718c1bf70ce153ac80da3af4 /core/java/android/hardware | |
| parent | 58a152e359c346aba31d887730c84010f132a6ce (diff) | |
| parent | 161a76cae423dfa3f11571e07054ce2312c9ee54 (diff) | |
| download | frameworks_base-f09fd213c37f8eef0e6355fee593562474554e68.zip frameworks_base-f09fd213c37f8eef0e6355fee593562474554e68.tar.gz frameworks_base-f09fd213c37f8eef0e6355fee593562474554e68.tar.bz2 | |
Merge "Camera2: Remove references to sync.frameNumber" into mnc-dev
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraCharacteristics.java | 28 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CameraMetadata.java | 2 |
2 files changed, 3 insertions, 27 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index a88b71c..c47498d 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -2738,35 +2738,13 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri /** * <p>The maximum number of frames that can occur after a request * (different than the previous) has been submitted, and before the - * result's state becomes synchronized (by setting - * android.sync.frameNumber to a non-negative value).</p> + * result's state becomes synchronized.</p> * <p>This defines the maximum distance (in number of metadata results), - * between android.sync.frameNumber and the equivalent - * frame number for that result.</p> + * between the frame number of the request that has new controls to apply + * and the frame number of the result that has all the controls applied.</p> * <p>In other words this acts as an upper boundary for how many frames * must occur before the camera device knows for a fact that the new * submitted camera settings have been applied in outgoing frames.</p> - * <p>For example if the distance was 2,</p> - * <pre><code>initial request = X (repeating) - * request1 = X - * request2 = Y - * request3 = Y - * request4 = Y - * - * where requestN has frameNumber N, and the first of the repeating - * initial request's has frameNumber F (and F < 1). - * - * initial result = X' + { android.sync.frameNumber == F } - * result1 = X' + { android.sync.frameNumber == F } - * result2 = X' + { android.sync.frameNumber == CONVERGING } - * result3 = X' + { android.sync.frameNumber == CONVERGING } - * result4 = X' + { android.sync.frameNumber == 2 } - * - * where resultN has frameNumber N. - * </code></pre> - * <p>Since <code>result4</code> has a <code>frameNumber == 4</code> and - * <code>android.sync.frameNumber == 2</code>, the distance is clearly - * <code>4 - 2 = 2</code>.</p> * <p><b>Units</b>: Frame counts</p> * <p><b>Possible values:</b> * <ul> diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index 5a80585..e8dbc5b 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -955,8 +955,6 @@ public abstract class CameraMetadata<TKey> { /** * <p>Every frame has the requests immediately applied.</p> - * <p>Furthermore for all results, - * <code>android.sync.frameNumber == {@link android.hardware.camera2.CaptureResult#getFrameNumber }</code></p> * <p>Changing controls over multiple requests one after another will * produce results that have those controls applied atomically * each frame.</p> |