diff options
| author | 2024-12-03 19:57:27 +0000 | |
|---|---|---|
| committer | 2024-12-03 19:57:27 +0000 | |
| commit | 8a19587f2832b1c852d2a8740e5a2b85a6a2fd68 (patch) | |
| tree | a4086ac054a2128b0747c6cb412a1052c5d45c13 | |
| parent | 5012097e40aafe01413a3cc5f4ac87980fe24ebd (diff) | |
| parent | 7ad5c2b40d648dc204172bcf8c1a303c9d2f6910 (diff) | |
Merge "Add HEIC_ULTRAHDR image format" into main
| -rw-r--r-- | libs/ui/PublicFormat.cpp | 7 | ||||
| -rw-r--r-- | libs/ui/include/ui/PublicFormat.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libs/ui/PublicFormat.cpp b/libs/ui/PublicFormat.cpp index c9663edd7a..dbc0884bf4 100644 --- a/libs/ui/PublicFormat.cpp +++ b/libs/ui/PublicFormat.cpp @@ -30,6 +30,7 @@ int mapPublicFormatToHalFormat(PublicFormat f) { case PublicFormat::DEPTH_POINT_CLOUD: case PublicFormat::DEPTH_JPEG: case PublicFormat::HEIC: + case PublicFormat::HEIC_ULTRAHDR: case PublicFormat::JPEG_R: return HAL_PIXEL_FORMAT_BLOB; case PublicFormat::DEPTH16: @@ -74,6 +75,9 @@ android_dataspace mapPublicFormatToHalDataspace(PublicFormat f) { case PublicFormat::HEIC: dataspace = Dataspace::HEIF; break; + case PublicFormat::HEIC_ULTRAHDR: + dataspace = Dataspace::HEIF_ULTRAHDR; + break; case PublicFormat::JPEG_R: dataspace = Dataspace::JPEG_R; break; @@ -153,6 +157,9 @@ PublicFormat mapHalFormatDataspaceToPublicFormat(int format, android_dataspace d return PublicFormat::DEPTH_JPEG; } else if (dataSpace == static_cast<android_dataspace>(Dataspace::JPEG_R)) { return PublicFormat::JPEG_R; + } else if (dataSpace == static_cast<android_dataspace>( + Dataspace::HEIF_ULTRAHDR)) { + return PublicFormat::HEIC_ULTRAHDR; }else { // Assume otherwise-marked blobs are also JPEG return PublicFormat::JPEG; diff --git a/libs/ui/include/ui/PublicFormat.h b/libs/ui/include/ui/PublicFormat.h index 2248ccab0c..e87931efed 100644 --- a/libs/ui/include/ui/PublicFormat.h +++ b/libs/ui/include/ui/PublicFormat.h @@ -59,6 +59,7 @@ enum class PublicFormat { DEPTH_JPEG = 0x69656963, JPEG_R = 0x1005, HEIC = 0x48454946, + HEIC_ULTRAHDR = 0x1006, }; /* Convert from android.graphics.ImageFormat/PixelFormat enums to graphics.h HAL |