diff options
| -rw-r--r-- | camera/docs/docs.html | 14 | ||||
| -rw-r--r-- | camera/docs/metadata_definitions.xml | 9 |
2 files changed, 18 insertions, 5 deletions
diff --git a/camera/docs/docs.html b/camera/docs/docs.html index 64b533a..a454738 100644 --- a/camera/docs/docs.html +++ b/camera/docs/docs.html @@ -4917,7 +4917,10 @@ region of (500,<wbr/> 375,<wbr/> 1000,<wbr/> 750) for zoomRatio of 1.<wbr/>0.<wb explicitly set <a href="#controls_android.control.zoomRatio">android.<wbr/>control.<wbr/>zoom<wbr/>Ratio</a>,<wbr/> its value defaults to 1.<wbr/>0.<wbr/></p> <p>One limitation of controlling zoom using zoomRatio is that the <a href="#controls_android.scaler.cropRegion">android.<wbr/>scaler.<wbr/>crop<wbr/>Region</a> must only be used for letterboxing or pillarboxing of the sensor active array,<wbr/> and no -FREEFORM cropping can be used with <a href="#controls_android.control.zoomRatio">android.<wbr/>control.<wbr/>zoom<wbr/>Ratio</a> other than 1.<wbr/>0.<wbr/></p> +FREEFORM cropping can be used with <a href="#controls_android.control.zoomRatio">android.<wbr/>control.<wbr/>zoom<wbr/>Ratio</a> other than 1.<wbr/>0.<wbr/> If +<a href="#controls_android.control.zoomRatio">android.<wbr/>control.<wbr/>zoom<wbr/>Ratio</a> is not 1.<wbr/>0,<wbr/> and <a href="#controls_android.scaler.cropRegion">android.<wbr/>scaler.<wbr/>crop<wbr/>Region</a> is set to be +windowboxing,<wbr/> the camera framework will override the <a href="#controls_android.scaler.cropRegion">android.<wbr/>scaler.<wbr/>crop<wbr/>Region</a> to be +the active array.<wbr/></p> </td> </tr> @@ -10551,7 +10554,10 @@ region of (500,<wbr/> 375,<wbr/> 1000,<wbr/> 750) for zoomRatio of 1.<wbr/>0.<wb explicitly set <a href="#controls_android.control.zoomRatio">android.<wbr/>control.<wbr/>zoom<wbr/>Ratio</a>,<wbr/> its value defaults to 1.<wbr/>0.<wbr/></p> <p>One limitation of controlling zoom using zoomRatio is that the <a href="#controls_android.scaler.cropRegion">android.<wbr/>scaler.<wbr/>crop<wbr/>Region</a> must only be used for letterboxing or pillarboxing of the sensor active array,<wbr/> and no -FREEFORM cropping can be used with <a href="#controls_android.control.zoomRatio">android.<wbr/>control.<wbr/>zoom<wbr/>Ratio</a> other than 1.<wbr/>0.<wbr/></p> +FREEFORM cropping can be used with <a href="#controls_android.control.zoomRatio">android.<wbr/>control.<wbr/>zoom<wbr/>Ratio</a> other than 1.<wbr/>0.<wbr/> If +<a href="#controls_android.control.zoomRatio">android.<wbr/>control.<wbr/>zoom<wbr/>Ratio</a> is not 1.<wbr/>0,<wbr/> and <a href="#controls_android.scaler.cropRegion">android.<wbr/>scaler.<wbr/>crop<wbr/>Region</a> is set to be +windowboxing,<wbr/> the camera framework will override the <a href="#controls_android.scaler.cropRegion">android.<wbr/>scaler.<wbr/>crop<wbr/>Region</a> to be +the active array.<wbr/></p> </td> </tr> @@ -21405,7 +21411,9 @@ windowboxing.<wbr/></li> </ol> </li> <li>Setting <a href="#controls_android.control.zoomRatio">android.<wbr/>control.<wbr/>zoom<wbr/>Ratio</a> to values different than 1.<wbr/>0 and -<a href="#controls_android.scaler.cropRegion">android.<wbr/>scaler.<wbr/>crop<wbr/>Region</a> to be windowboxing at the same time is undefined behavior.<wbr/></li> +<a href="#controls_android.scaler.cropRegion">android.<wbr/>scaler.<wbr/>crop<wbr/>Region</a> to be windowboxing at the same time are not supported.<wbr/> In this +case,<wbr/> the camera framework will override the <a href="#controls_android.scaler.cropRegion">android.<wbr/>scaler.<wbr/>crop<wbr/>Region</a> to be the active +array.<wbr/></li> </ul> <p>LEGACY capability devices will only support CENTER_<wbr/>ONLY cropping.<wbr/></p> </td> diff --git a/camera/docs/metadata_definitions.xml b/camera/docs/metadata_definitions.xml index 965bc75..e226193 100644 --- a/camera/docs/metadata_definitions.xml +++ b/camera/docs/metadata_definitions.xml @@ -3321,7 +3321,10 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata One limitation of controlling zoom using zoomRatio is that the android.scaler.cropRegion must only be used for letterboxing or pillarboxing of the sensor active array, and no - FREEFORM cropping can be used with android.control.zoomRatio other than 1.0. + FREEFORM cropping can be used with android.control.zoomRatio other than 1.0. If + android.control.zoomRatio is not 1.0, and android.scaler.cropRegion is set to be + windowboxing, the camera framework will override the android.scaler.cropRegion to be + the active array. </details> <hal_details> For all capture request templates, this field must be set to 1.0 in order to have @@ -7201,7 +7204,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata the field of view vertically (letterboxing) or horizontally (pillarboxing), but not windowboxing. * Setting android.control.zoomRatio to values different than 1.0 and - android.scaler.cropRegion to be windowboxing at the same time is undefined behavior. + android.scaler.cropRegion to be windowboxing at the same time are not supported. In this + case, the camera framework will override the android.scaler.cropRegion to be the active + array. LEGACY capability devices will only support CENTER_ONLY cropping. </details> |