commit 10077182d926bca7c9bab61f8779a00dcc4416e1
author Eino-Ville Talvala <etalvala@google.com> Fri Jun 26 19:53:24 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 26 19:53:26 2015 +0000
tree 17a7051691e4ce461aab3d915d5526884460b2ee
parent 192f620abb673cbc1bf6098d96eae744befe8e60
parent 8565feaf65f323cdd6882c345e663002a47b86b3

Merge "Camera2: Add clarification about simultaneous trigger use" into mnc-dev

camera/docs/docs.html

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index b796683..e10c036 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -5133,7 +5133,7 @@
           </tr>
           <tr class="entry_cont">
             <td class="entry_details" colspan="5">
-              <p>When CONSTRAINED_<wbr/>HIGH_<wbr/>SPEED_<wbr/>VIDEO is supported in android.<wbr/>control.<wbr/>available<wbr/>Capabilities,<wbr/>
+              <p>When CONSTRAINED_<wbr/>HIGH_<wbr/>SPEED_<wbr/>VIDEO is supported in <a href="#static_android.request.availableCapabilities">android.<wbr/>request.<wbr/>available<wbr/>Capabilities</a>,<wbr/>
 this metadata will list the supported high speed video size,<wbr/> fps range and max batch size
 configurations.<wbr/> All the sizes listed in this configuration will be a subset of the sizes
 reported by <a href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap.html#getOutputSizes">StreamConfigurationMap#getOutputSizes</a>
@@ -18420,6 +18420,9 @@
               <p>This array contains <code>(xmin,<wbr/> ymin,<wbr/> width,<wbr/> height)</code>.<wbr/> The <code>(xmin,<wbr/> ymin)</code> must be
 &gt;= <code>(0,<wbr/>0)</code>.<wbr/>
 The <code>(width,<wbr/> height)</code> must be &lt;= <code><a href="#static_android.sensor.info.pixelArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>pixel<wbr/>Array<wbr/>Size</a></code>.<wbr/></p>
+<p>If omitted by the HAL implementation,<wbr/> the camera framework will assume that this is
+the same as the post-correction active array region given in
+<a href="#static_android.sensor.info.activeArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>active<wbr/>Array<wbr/>Size</a>.<wbr/></p>
             </td>
           </tr>
 

camera/docs/metadata_properties.xml

diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index 17fbd2e..c29424b 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -2579,7 +2579,7 @@
           For each configuration, the fps_max >= 120fps.
           </range>
           <details>
-          When CONSTRAINED_HIGH_SPEED_VIDEO is supported in android.control.availableCapabilities,
+          When CONSTRAINED_HIGH_SPEED_VIDEO is supported in android.request.availableCapabilities,
           this metadata will list the supported high speed video size, fps range and max batch size
           configurations. All the sizes listed in this configuration will be a subset of the sizes
           reported by {@link android.hardware.camera2.params.StreamConfigurationMap#getOutputSizes}
@@ -5907,6 +5907,10 @@
             This array contains `(xmin, ymin, width, height)`. The `(xmin, ymin)` must be
             &amp;gt;= `(0,0)`.
             The `(width, height)` must be &amp;lt;= `android.sensor.info.pixelArraySize`.
+
+            If omitted by the HAL implementation, the camera framework will assume that this is
+            the same as the post-correction active array region given in
+            android.sensor.info.activeArraySize.
             </hal_details>
             <tag id="RAW" />
           </entry>