diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-08-14 12:07:01 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-08-14 12:07:01 +0000 |
commit | 66f9682e7c53600f9caa777e1d8df739d7380d45 (patch) | |
tree | bfdb3eda18852edc23cc5036e191c5f11331ff55 | |
parent | adc5bc44ee7c6398ced3fb9dd0d3635c922e9a36 (diff) | |
parent | 77a627e6708544ad4dbd657e815a69eaf99e7841 (diff) | |
download | media-android12-mainline-media-swcodec-release.tar.gz |
Snap for 7642912 from 77a627e6708544ad4dbd657e815a69eaf99e7841 to mainline-media-swcodec-releaseandroid-mainline-12.0.0_r91android-mainline-12.0.0_r75android-mainline-12.0.0_r47android-mainline-12.0.0_r30android-mainline-12.0.0_r13android-mainline-12.0.0_r120android-mainline-12.0.0_r105android12-mainline-media-swcodec-release
Change-Id: I52245b29ac4ee3def80987d4ce454fd3d3892845
-rw-r--r-- | camera/docs/docs.html | 5 | ||||
-rw-r--r-- | camera/docs/metadata_definitions.xml | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/camera/docs/docs.html b/camera/docs/docs.html index 78a89a9e..fa707ed4 100644 --- a/camera/docs/docs.html +++ b/camera/docs/docs.html @@ -19043,7 +19043,10 @@ by binning pixels in 'default' mode and not binning them in 'max resolution' mod <code><a href="#static_android.scaler.streamConfigurationMap">android.<wbr/>scaler.<wbr/>stream<wbr/>Configuration<wbr/>Map</a></code> describes the streams supported in 'default' mode.<wbr/> The stream configurations supported in 'max resolution' mode are described by -<code><a href="#static_android.scaler.streamConfigurationMapMaximumResolution">android.<wbr/>scaler.<wbr/>stream<wbr/>Configuration<wbr/>Map<wbr/>Maximum<wbr/>Resolution</a></code>.<wbr/></p></span> +<code><a href="#static_android.scaler.streamConfigurationMapMaximumResolution">android.<wbr/>scaler.<wbr/>stream<wbr/>Configuration<wbr/>Map<wbr/>Maximum<wbr/>Resolution</a></code>.<wbr/> +The maximum resolution mode pixel array size of a camera device +(<code><a href="#static_android.sensor.info.pixelArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>pixel<wbr/>Array<wbr/>Size</a></code>) with this capability,<wbr/> +will be at least 24 megapixels.<wbr/></p></span> </li> <li> <span class="entry_type_enum_name">REMOSAIC_REPROCESSING (v3.6)</span> diff --git a/camera/docs/metadata_definitions.xml b/camera/docs/metadata_definitions.xml index 86de1985..c23bd46b 100644 --- a/camera/docs/metadata_definitions.xml +++ b/camera/docs/metadata_definitions.xml @@ -6118,6 +6118,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata mode. The stream configurations supported in 'max resolution' mode are described by `android.scaler.streamConfigurationMapMaximumResolution`. + The maximum resolution mode pixel array size of a camera device + (`android.sensor.info.pixelArraySize`) with this capability, + will be at least 24 megapixels. </notes> </value> <value optional="true" visibility="java_public" hal_version="3.6">REMOSAIC_REPROCESSING |