commit b0b1143f76139a087542c3391e47b829d3149c61
author Jayant Chowdhary <jchowdhary@google.com> Fri Aug 13 17:23:50 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 13 17:23:50 2021 +0000
tree b26d0bf3de789b2e5387fc848b5eedb60a882e8c
parent 1cc934d85d2c29a06bda32e3e85431274de23a8e
parent 508132d5829268f32c337f58386519de662f2bc6

Merge "camera2: Document minimum pixel array size restriction for ultra high resolution sensors." into sc-dev am: 508132d582

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/15507096

Change-Id: I2a560e19b3c08d5d127504cc90ef92a97444b868

camera/ndk/include/camera/NdkCameraMetadataTags.h

diff --git a/camera/ndk/include/camera/NdkCameraMetadataTags.h b/camera/ndk/include/camera/NdkCameraMetadataTags.h
index 52cd4b4..86781e5 100644
--- a/camera/ndk/include/camera/NdkCameraMetadataTags.h
+++ b/camera/ndk/include/camera/NdkCameraMetadataTags.h
@@ -9005,7 +9005,12 @@
      * <code>android.scaler.streamConfigurationMap</code> describes the streams supported in 'default'
      * mode.
      * The stream configurations supported in 'max resolution' mode are described by
-     * <code>android.scaler.streamConfigurationMapMaximumResolution</code>.</p>
+     * <code>android.scaler.streamConfigurationMapMaximumResolution</code>.
+     * The maximum resolution mode pixel array size of a camera device
+     * (<code>ACAMERA_SENSOR_INFO_PIXEL_ARRAY_SIZE</code>) with this capability,
+     * will be at least 24 megapixels.</p>
+     *
+     * @see ACAMERA_SENSOR_INFO_PIXEL_ARRAY_SIZE
      */
     ACAMERA_REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR
                                                                       = 16,