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

Merge "Camera2: Remove references to sync.frameNumber" into mnc-dev

Browse Source
This commit is contained in:
Chien-Yu Chen
2015-06-26 22:09:28 +00:00
committed by Android (Google) Code Review
parent 58a152e359 161a76cae4
commit f09fd213c3
2 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/java/android/hardware/camera2/CameraCharacteristics.java
View File

@@ -2738,35 +2738,13 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
/** /**
* <p>The maximum number of frames that can occur after a request * <p>The maximum number of frames that can occur after a request
* (different than the previous) has been submitted, and before the * (different than the previous) has been submitted, and before the
* result's state becomes synchronized (by setting * result's state becomes synchronized.</p>
* android.sync.frameNumber to a non-negative value).</p>
* <p>This defines the maximum distance (in number of metadata results), * <p>This defines the maximum distance (in number of metadata results),
* between android.sync.frameNumber and the equivalent * between the frame number of the request that has new controls to apply
* frame number for that result.</p> * 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 * <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 * must occur before the camera device knows for a fact that the new
* submitted camera settings have been applied in outgoing frames.</p> * 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 &lt; 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>Units</b>: Frame counts</p>
* <p><b>Possible values:</b> * <p><b>Possible values:</b>
* <ul> * <ul>

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

@@ -955,8 +955,6 @@ public abstract class CameraMetadata<TKey> {
/** /**
* <p>Every frame has the requests immediately applied.</p> * <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 * <p>Changing controls over multiple requests one after another will
* produce results that have those controls applied atomically * produce results that have those controls applied atomically
* each frame.</p> * each frame.</p>