diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-11 22:09:31 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-11 22:09:31 +0000 |
commit | 612d1707ddd53b341512a8de9b3255c314e7c0b2 (patch) | |
tree | 8d072cc52a43dde9f2bf1c85a934c8b5733e2723 | |
parent | b6e1a6948875018c00a70aeed672ff6553bb7d3a (diff) | |
parent | ba40f06ea96bdc75e75c0d7e96dc826312601e3d (diff) | |
download | media-612d1707ddd53b341512a8de9b3255c314e7c0b2.tar.gz |
Snap for 7992035 from ba40f06ea96bdc75e75c0d7e96dc826312601e3d to sc-v2-releaseandroid-vts-12.1_r9android-vts-12.1_r8android-vts-12.1_r7android-vts-12.1_r6android-vts-12.1_r5android-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.1_r10android-vts-12.1_r1android-platform-12.1.0_r9android-platform-12.1.0_r8android-platform-12.1.0_r7android-platform-12.1.0_r6android-platform-12.1.0_r5android-platform-12.1.0_r4android-platform-12.1.0_r3android-platform-12.1.0_r28android-platform-12.1.0_r27android-platform-12.1.0_r26android-platform-12.1.0_r25android-platform-12.1.0_r24android-platform-12.1.0_r23android-platform-12.1.0_r22android-platform-12.1.0_r21android-platform-12.1.0_r20android-platform-12.1.0_r2android-platform-12.1.0_r19android-platform-12.1.0_r18android-platform-12.1.0_r17android-platform-12.1.0_r16android-platform-12.1.0_r15android-platform-12.1.0_r14android-platform-12.1.0_r13android-platform-12.1.0_r12android-platform-12.1.0_r11android-platform-12.1.0_r10android-platform-12.1.0_r1android-cts-12.1_r9android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r6android-cts-12.1_r5android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.1_r10android-cts-12.1_r1android-12.1.0_r6android-12.1.0_r5android-12.1.0_r4android-12.1.0_r3android-12.1.0_r27android-12.1.0_r2android-12.1.0_r1android12L-tests-releaseandroid12L-s1-releaseandroid12L-releaseandroid12L-platform-release
Change-Id: I79516f50946aa1633147103ac749a0c00f7df2a4
-rw-r--r-- | camera/docs/docs.html | 18 | ||||
-rw-r--r-- | camera/docs/metadata_definitions.xml | 18 |
2 files changed, 22 insertions, 14 deletions
diff --git a/camera/docs/docs.html b/camera/docs/docs.html index 64b2c812..dbeca538 100644 --- a/camera/docs/docs.html +++ b/camera/docs/docs.html @@ -21506,7 +21506,8 @@ describes the minimum required output stream configurations based on the hardwar </tbody> </table> <p>For applications targeting SDK version 31 or newer,<wbr/> if the mobile device declares to be -<a href="https://developer.android.com/reference/android/os/Build/VERSION_CDOES/MEDIA_PERFORMANCE_CLASS.html">media performance class</a> S,<wbr/> +media performance class 12 or higher by setting +<a href="https://developer.android.com/reference/android/os/Build/VERSION_CDOES/MEDIA_PERFORMANCE_CLASS.html">MEDIA_<wbr/>PERFORMANCE_<wbr/>CLASS</a> to be 31 or larger,<wbr/> the primary camera devices (first rear/<wbr/>front camera in the camera ID list) will not support JPEG sizes smaller than 1080p.<wbr/> If the application configures a JPEG stream smaller than 1080p,<wbr/> the camera device will round up the JPEG image size to at least @@ -21579,9 +21580,11 @@ This new minimum required output stream configurations are illustrated by the ta </tbody> </table> <p>For applications targeting SDK version 31 or newer,<wbr/> if the mobile device doesn't declare -to be media performance class S,<wbr/> or if the camera device isn't a primary rear/<wbr/>front -camera,<wbr/> the minimum required output stream configurations are the same as for applications -targeting SDK version older than 31.<wbr/></p> +to be media performance class 12 or better by setting +<a href="https://developer.android.com/reference/android/os/Build/VERSION_CDOES/MEDIA_PERFORMANCE_CLASS.html">MEDIA_<wbr/>PERFORMANCE_<wbr/>CLASS</a> to be 31 or larger,<wbr/> +or if the camera device isn't a primary rear/<wbr/>front camera,<wbr/> the minimum required output +stream configurations are the same as for applications targeting SDK version older than +31.<wbr/></p> <p>Refer to <a href="#static_android.request.availableCapabilities">android.<wbr/>request.<wbr/>available<wbr/>Capabilities</a> for additional mandatory stream configurations on a per-capability basis.<wbr/></p> <p>Exception on 176x144 (QCIF) resolution: camera devices usually have a fixed capability for @@ -21630,10 +21633,11 @@ formats),<wbr/> as output streams:</p> <li>720p (1280 x 720)</li> <li>1080p (1920 x 1080)</li> </ul> -<p>Note that for Performance Class 12 primary cameras (first rear/<wbr/>front facing camera in the -camera ID list),<wbr/> camera framework filters out JPEG sizes smaller than 1080p depending on +<p>Note that for primary cameras (first rear/<wbr/>front facing camera in the camera ID list) +on a device with <a href="https://developer.android.com/reference/android/os/Build/VERSION_CDOES/MEDIA_PERFORMANCE_CLASS.html">MEDIA_<wbr/>PERFORMANCE_<wbr/>CLASS</a> set to +31 or larger,<wbr/> camera framework filters out JPEG sizes smaller than 1080p depending on applications' targetSdkLevel.<wbr/> The camera HAL must still support the smaller JPEG sizes -to maintain backward comopatibility.<wbr/></p> +to maintain backward compatibility.<wbr/></p> <p>For LIMITED capability devices (<code><a href="#static_android.info.supportedHardwareLevel">android.<wbr/>info.<wbr/>supported<wbr/>Hardware<wbr/>Level</a> == LIMITED</code>),<wbr/> the HAL only has to list up to the maximum video size diff --git a/camera/docs/metadata_definitions.xml b/camera/docs/metadata_definitions.xml index 04596301..af1eab8a 100644 --- a/camera/docs/metadata_definitions.xml +++ b/camera/docs/metadata_definitions.xml @@ -7114,7 +7114,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata IMPLEMENTATION_DEFINED | same as YUV_420_888 | Any | For applications targeting SDK version 31 or newer, if the mobile device declares to be - {@link android.os.Build.VERSION_CDOES.MEDIA_PERFORMANCE_CLASS media performance class} S, + media performance class 12 or higher by setting + {@link android.os.Build.VERSION_CDOES.MEDIA_PERFORMANCE_CLASS} to be 31 or larger, the primary camera devices (first rear/front camera in the camera ID list) will not support JPEG sizes smaller than 1080p. If the application configures a JPEG stream smaller than 1080p, the camera device will round up the JPEG image size to at least @@ -7134,9 +7135,11 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata IMPLEMENTATION_DEFINED | same as YUV_420_888 | Any | For applications targeting SDK version 31 or newer, if the mobile device doesn't declare - to be media performance class S, or if the camera device isn't a primary rear/front - camera, the minimum required output stream configurations are the same as for applications - targeting SDK version older than 31. + to be media performance class 12 or better by setting + {@link android.os.Build.VERSION_CDOES.MEDIA_PERFORMANCE_CLASS} to be 31 or larger, + or if the camera device isn't a primary rear/front camera, the minimum required output + stream configurations are the same as for applications targeting SDK version older than + 31. Refer to android.request.availableCapabilities for additional mandatory stream configurations on a per-capability basis. @@ -7186,10 +7189,11 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata * 720p (1280 x 720) * 1080p (1920 x 1080) - Note that for Performance Class 12 primary cameras (first rear/front facing camera in the - camera ID list), camera framework filters out JPEG sizes smaller than 1080p depending on + Note that for primary cameras (first rear/front facing camera in the camera ID list) + on a device with {@link android.os.Build.VERSION_CDOES.MEDIA_PERFORMANCE_CLASS} set to + 31 or larger, camera framework filters out JPEG sizes smaller than 1080p depending on applications' targetSdkLevel. The camera HAL must still support the smaller JPEG sizes - to maintain backward comopatibility. + to maintain backward compatibility. For LIMITED capability devices (`android.info.supportedHardwareLevel == LIMITED`), |