diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2015-06-24 18:47:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-24 18:47:09 +0000 |
| commit | 192f620abb673cbc1bf6098d96eae744befe8e60 (patch) | |
| tree | 4b30f61c80558130de0e86f7d9d72380f25cf4fd /camera | |
| parent | 5787d987c9681e676b2ac5062504bcf52d81cc6c (diff) | |
| parent | fe83c8199874811ce6d535938d00fa7c66b2283c (diff) | |
| download | android_system_media-192f620abb673cbc1bf6098d96eae744befe8e60.tar.gz android_system_media-192f620abb673cbc1bf6098d96eae744befe8e60.tar.bz2 android_system_media-192f620abb673cbc1bf6098d96eae744befe8e60.zip | |
Merge "Update HAL notes for pre-correction array dimens." into mnc-dev
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/docs/docs.html | 3 | ||||
| -rw-r--r-- | camera/docs/metadata_properties.xml | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/camera/docs/docs.html b/camera/docs/docs.html index 6357e72e..256d207b 100644 --- a/camera/docs/docs.html +++ b/camera/docs/docs.html @@ -18342,6 +18342,9 @@ full array may include black calibration pixels or other inactive regions.<wbr/> <p>This array contains <code>(xmin,<wbr/> ymin,<wbr/> width,<wbr/> height)</code>.<wbr/> The <code>(xmin,<wbr/> ymin)</code> must be >= <code>(0,<wbr/>0)</code>.<wbr/> The <code>(width,<wbr/> height)</code> must be <= <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> diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml index 0a1ce67b..fe058dae 100644 --- a/camera/docs/metadata_properties.xml +++ b/camera/docs/metadata_properties.xml @@ -5875,6 +5875,10 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata This array contains `(xmin, ymin, width, height)`. The `(xmin, ymin)` must be &gt;= `(0,0)`. The `(width, height)` must be &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> |