diff options
| author | Ankit Goyal <layog@google.com> | 2023-03-14 11:42:13 -0700 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-14 21:47:52 +0000 |
| commit | 51112a34d21e8fe65cf48e979591b4446dceb10c (patch) | |
| tree | 1e99bad13296dd99915274252d44431209dc3ee2 | |
| parent | 611baaca06e266cd8f01589da41af7f1a4d5af18 (diff) | |
gralloc4: Map camera write YUV420_888 to NV21
Fix: 272679097
Bug: 272748251
Test: Chat app image capture
Test: Image capture in user profile
Test: Faceauth
Test: Normal camera usage
Change-Id: I684721db56290f6df546625c056d347c3369f207
(cherry picked from commit on googleplex-android-review.googlesource.com host: cfd1f8d71058b85da3bf3f83249d6dda8a6d5917)
Merged-In: I684721db56290f6df546625c056d347c3369f207
| -rw-r--r-- | gralloc4/src/core/mali_gralloc_formats.cpp | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/gralloc4/src/core/mali_gralloc_formats.cpp b/gralloc4/src/core/mali_gralloc_formats.cpp index dcc527a..402d138 100644 --- a/gralloc4/src/core/mali_gralloc_formats.cpp +++ b/gralloc4/src/core/mali_gralloc_formats.cpp @@ -1430,25 +1430,20 @@ uint32_t get_base_format(const uint64_t req_format, { base_format = HAL_PIXEL_FORMAT_EXYNOS_YCbCr_420_SPN; } - else if ((usage & GRALLOC_USAGE_HW_TEXTURE) && (usage & GRALLOC_USAGE_HW_CAMERA_WRITE)) + else if (usage & GRALLOC_USAGE_HW_CAMERA_WRITE) { - // Camera flexible YUV format output maps to NV21. - base_format = HAL_PIXEL_FORMAT_YCrCb_420_SP; - } - else if (usage & (GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_TEXTURE)) - { - base_format = HAL_PIXEL_FORMAT_EXYNOS_YCbCr_420_SPN; - } - else if ((usage & GRALLOC_USAGE_HW_CAMERA_WRITE) && - (usage & GRALLOC_USAGE_HW_CAMERA_READ) && - (usage & GRALLOC_USAGE_PROTECTED)) - { - // Faceauth requires NV21 format + // Catchall for camera write. DO NOT CHANGE WITHOUT TESTING THESE SCENARIOS: + // 1. Camera capture and initial photo processing + // 2. Other major camera operations - video recording, portrait etc + // 3. Faceauth + // 4. Multi-profile user photo add + // 5. Capture and resize - use chat app to capture a photo + // Re-run these steps with GPU composition: + // adb shell service call SurfaceFlinger 1008 i32 1 base_format = HAL_PIXEL_FORMAT_YCrCb_420_SP; } else { - // Flexible framework-accessible YUV format; base_format = HAL_PIXEL_FORMAT_EXYNOS_YCbCr_420_SPN; } } |