Dichen Zhang | 85b3756 | 2022-10-11 11:08:28 -0700 | [diff] [blame] | 1 | /* |
| 2 | * Copyright 2022 The Android Open Source Project |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
| 16 | |
| 17 | #include <jpegrecoverymap/recoverymap.h> |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 18 | #include <jpegrecoverymap/jpegencoder.h> |
| 19 | #include <jpegrecoverymap/jpegdecoder.h> |
| 20 | #include <jpegrecoverymap/recoverymapmath.h> |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 21 | #include <jpegrecoverymap/recoverymaputils.h> |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 22 | |
Dichen Zhang | a876626 | 2022-11-07 23:48:24 +0000 | [diff] [blame] | 23 | #include <image_io/jpeg/jpeg_marker.h> |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 24 | #include <image_io/jpeg/jpeg_info.h> |
| 25 | #include <image_io/jpeg/jpeg_scanner.h> |
| 26 | #include <image_io/jpeg/jpeg_info_builder.h> |
| 27 | #include <image_io/base/data_segment_data_source.h> |
Dichen Zhang | 5375127 | 2023-01-17 19:09:01 -0800 | [diff] [blame] | 28 | #include <utils/Log.h> |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 29 | |
| 30 | #include <memory> |
Dichen Zhang | 72fd2b1 | 2022-11-01 06:11:50 +0000 | [diff] [blame] | 31 | #include <sstream> |
| 32 | #include <string> |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 33 | #include <cmath> |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 34 | #include <condition_variable> |
| 35 | #include <deque> |
| 36 | #include <mutex> |
| 37 | #include <thread> |
| 38 | #include <unistd.h> |
Dichen Zhang | 72fd2b1 | 2022-11-01 06:11:50 +0000 | [diff] [blame] | 39 | |
| 40 | using namespace std; |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 41 | using namespace photos_editing_formats::image_io; |
Dichen Zhang | 85b3756 | 2022-10-11 11:08:28 -0700 | [diff] [blame] | 42 | |
| 43 | namespace android::recoverymap { |
| 44 | |
Harish Mahendrakar | 555a06b | 2022-12-14 09:37:27 -0800 | [diff] [blame] | 45 | #define USE_SRGB_INVOETF_LUT 1 |
| 46 | #define USE_HLG_OETF_LUT 1 |
| 47 | #define USE_PQ_OETF_LUT 1 |
| 48 | #define USE_HLG_INVOETF_LUT 1 |
| 49 | #define USE_PQ_INVOETF_LUT 1 |
Harish Mahendrakar | f25991f | 2022-12-16 11:57:44 -0800 | [diff] [blame] | 50 | #define USE_APPLY_RECOVERY_LUT 1 |
Harish Mahendrakar | 555a06b | 2022-12-14 09:37:27 -0800 | [diff] [blame] | 51 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 52 | #define JPEGR_CHECK(x) \ |
| 53 | { \ |
| 54 | status_t status = (x); \ |
| 55 | if ((status) != NO_ERROR) { \ |
| 56 | return status; \ |
| 57 | } \ |
| 58 | } |
| 59 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 60 | // The current JPEGR version that we encode to |
| 61 | static const uint32_t kJpegrVersion = 1; |
| 62 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 63 | // Map is quarter res / sixteenth size |
| 64 | static const size_t kMapDimensionScaleFactor = 4; |
Dichen Zhang | 5375127 | 2023-01-17 19:09:01 -0800 | [diff] [blame] | 65 | // JPEG block size. |
| 66 | // JPEG encoding / decoding will require 8 x 8 DCT transform. |
| 67 | // Width must be 8 dividable, and height must be 2 dividable. |
| 68 | static const size_t kJpegBlock = 8; |
Dichen Zhang | 0b9f7de | 2022-11-18 06:52:46 +0000 | [diff] [blame] | 69 | // JPEG compress quality (0 ~ 100) for recovery map |
| 70 | static const int kMapCompressQuality = 85; |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 71 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 72 | // TODO: fill in st2086 metadata |
| 73 | static const st2086_metadata kSt2086Metadata = { |
| 74 | {0.0f, 0.0f}, |
| 75 | {0.0f, 0.0f}, |
| 76 | {0.0f, 0.0f}, |
| 77 | {0.0f, 0.0f}, |
| 78 | 0, |
| 79 | 1.0f, |
| 80 | }; |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 81 | |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 82 | #define CONFIG_MULTITHREAD 1 |
| 83 | int GetCPUCoreCount() { |
| 84 | int cpuCoreCount = 1; |
| 85 | #if CONFIG_MULTITHREAD |
| 86 | #if defined(_SC_NPROCESSORS_ONLN) |
| 87 | cpuCoreCount = sysconf(_SC_NPROCESSORS_ONLN); |
| 88 | #else |
| 89 | // _SC_NPROC_ONLN must be defined... |
| 90 | cpuCoreCount = sysconf(_SC_NPROC_ONLN); |
| 91 | #endif |
| 92 | #endif |
| 93 | return cpuCoreCount; |
| 94 | } |
| 95 | |
Dichen Zhang | 72fd2b1 | 2022-11-01 06:11:50 +0000 | [diff] [blame] | 96 | /* |
Dichen Zhang | 63d9251 | 2023-01-04 12:01:16 -0800 | [diff] [blame] | 97 | * Helper function copies the JPEG image from without EXIF. |
| 98 | * |
| 99 | * @param dest destination of the data to be written. |
| 100 | * @param source source of data being written. |
| 101 | * @param exif_pos position of the EXIF package, which is aligned with jpegdecoder.getEXIFPos(). |
| 102 | * (4 bypes offset to FF sign, the byte after FF E1 XX XX <this byte>). |
| 103 | * @param exif_size exif size without the initial 4 bytes, aligned with jpegdecoder.getEXIFSize(). |
| 104 | */ |
| 105 | void copyJpegWithoutExif(jr_compressed_ptr dest, |
| 106 | jr_compressed_ptr source, |
| 107 | size_t exif_pos, |
| 108 | size_t exif_size) { |
| 109 | memcpy(dest, source, sizeof(jpegr_compressed_struct)); |
| 110 | |
| 111 | const size_t exif_offset = 4; //exif_pos has 4 bypes offset to the FF sign |
| 112 | dest->length = source->length - exif_size - exif_offset; |
| 113 | dest->data = malloc(dest->length); |
| 114 | |
| 115 | memcpy(dest->data, source->data, exif_pos - exif_offset); |
| 116 | memcpy((uint8_t*)dest->data + exif_pos - exif_offset, |
| 117 | (uint8_t*)source->data + exif_pos + exif_size, |
| 118 | source->length - exif_pos - exif_size); |
| 119 | } |
| 120 | |
Dichen Zhang | 636f524 | 2022-12-07 20:25:44 +0000 | [diff] [blame] | 121 | /* Encode API-0 */ |
| 122 | status_t RecoveryMap::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image, |
| 123 | jpegr_transfer_function hdr_tf, |
| 124 | jr_compressed_ptr dest, |
| 125 | int quality, |
Dichen Zhang | d18bc30 | 2022-12-16 20:55:24 +0000 | [diff] [blame] | 126 | jr_exif_ptr exif) { |
Dichen Zhang | 636f524 | 2022-12-07 20:25:44 +0000 | [diff] [blame] | 127 | if (uncompressed_p010_image == nullptr || dest == nullptr) { |
| 128 | return ERROR_JPEGR_INVALID_NULL_PTR; |
| 129 | } |
| 130 | |
| 131 | if (quality < 0 || quality > 100) { |
| 132 | return ERROR_JPEGR_INVALID_INPUT_TYPE; |
| 133 | } |
| 134 | |
Dichen Zhang | 5375127 | 2023-01-17 19:09:01 -0800 | [diff] [blame] | 135 | if (uncompressed_p010_image->width % kJpegBlock != 0 |
| 136 | || uncompressed_p010_image->height % 2 != 0) { |
| 137 | ALOGE("Image size can not be handled: %dx%d", |
| 138 | uncompressed_p010_image->width, uncompressed_p010_image->height); |
| 139 | return ERROR_JPEGR_INVALID_INPUT_TYPE; |
| 140 | } |
| 141 | |
Dichen Zhang | 636f524 | 2022-12-07 20:25:44 +0000 | [diff] [blame] | 142 | jpegr_metadata metadata; |
| 143 | metadata.version = kJpegrVersion; |
| 144 | metadata.transferFunction = hdr_tf; |
| 145 | if (hdr_tf == JPEGR_TF_PQ) { |
| 146 | metadata.hdr10Metadata.st2086Metadata = kSt2086Metadata; |
| 147 | } |
| 148 | |
| 149 | jpegr_uncompressed_struct uncompressed_yuv_420_image; |
Dichen Zhang | c3437ca | 2023-01-04 14:00:08 -0800 | [diff] [blame] | 150 | unique_ptr<uint8_t[]> uncompressed_yuv_420_image_data = make_unique<uint8_t[]>( |
| 151 | uncompressed_p010_image->width * uncompressed_p010_image->height * 3 / 2); |
| 152 | uncompressed_yuv_420_image.data = uncompressed_yuv_420_image_data.get(); |
Dichen Zhang | 636f524 | 2022-12-07 20:25:44 +0000 | [diff] [blame] | 153 | JPEGR_CHECK(toneMap(uncompressed_p010_image, &uncompressed_yuv_420_image)); |
| 154 | |
| 155 | jpegr_uncompressed_struct map; |
| 156 | JPEGR_CHECK(generateRecoveryMap( |
| 157 | &uncompressed_yuv_420_image, uncompressed_p010_image, &metadata, &map)); |
| 158 | std::unique_ptr<uint8_t[]> map_data; |
| 159 | map_data.reset(reinterpret_cast<uint8_t*>(map.data)); |
| 160 | |
| 161 | jpegr_compressed_struct compressed_map; |
| 162 | compressed_map.maxLength = map.width * map.height; |
| 163 | unique_ptr<uint8_t[]> compressed_map_data = make_unique<uint8_t[]>(compressed_map.maxLength); |
| 164 | compressed_map.data = compressed_map_data.get(); |
| 165 | JPEGR_CHECK(compressRecoveryMap(&map, &compressed_map)); |
| 166 | |
| 167 | JpegEncoder jpeg_encoder; |
| 168 | // TODO: determine ICC data based on color gamut information |
| 169 | if (!jpeg_encoder.compressImage(uncompressed_yuv_420_image.data, |
| 170 | uncompressed_yuv_420_image.width, |
| 171 | uncompressed_yuv_420_image.height, quality, nullptr, 0)) { |
| 172 | return ERROR_JPEGR_ENCODE_ERROR; |
| 173 | } |
| 174 | jpegr_compressed_struct jpeg; |
| 175 | jpeg.data = jpeg_encoder.getCompressedImagePtr(); |
| 176 | jpeg.length = jpeg_encoder.getCompressedImageSize(); |
| 177 | |
Dichen Zhang | 50ff129 | 2023-01-27 18:03:43 +0000 | [diff] [blame^] | 178 | JPEGR_CHECK(appendRecoveryMap(&jpeg, &compressed_map, exif, &metadata, dest)); |
Dichen Zhang | 636f524 | 2022-12-07 20:25:44 +0000 | [diff] [blame] | 179 | |
| 180 | return NO_ERROR; |
| 181 | } |
| 182 | |
| 183 | /* Encode API-1 */ |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 184 | status_t RecoveryMap::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image, |
| 185 | jr_uncompressed_ptr uncompressed_yuv_420_image, |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 186 | jpegr_transfer_function hdr_tf, |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 187 | jr_compressed_ptr dest, |
Dichen Zhang | ffa3401 | 2022-11-03 23:21:13 +0000 | [diff] [blame] | 188 | int quality, |
Dichen Zhang | d18bc30 | 2022-12-16 20:55:24 +0000 | [diff] [blame] | 189 | jr_exif_ptr exif) { |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 190 | if (uncompressed_p010_image == nullptr |
| 191 | || uncompressed_yuv_420_image == nullptr |
| 192 | || dest == nullptr) { |
Dichen Zhang | 80b7248 | 2022-11-02 01:55:35 +0000 | [diff] [blame] | 193 | return ERROR_JPEGR_INVALID_NULL_PTR; |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 194 | } |
| 195 | |
Dichen Zhang | ffa3401 | 2022-11-03 23:21:13 +0000 | [diff] [blame] | 196 | if (quality < 0 || quality > 100) { |
| 197 | return ERROR_JPEGR_INVALID_INPUT_TYPE; |
| 198 | } |
| 199 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 200 | if (uncompressed_p010_image->width != uncompressed_yuv_420_image->width |
| 201 | || uncompressed_p010_image->height != uncompressed_yuv_420_image->height) { |
| 202 | return ERROR_JPEGR_RESOLUTION_MISMATCH; |
| 203 | } |
| 204 | |
Dichen Zhang | 5375127 | 2023-01-17 19:09:01 -0800 | [diff] [blame] | 205 | if (uncompressed_p010_image->width % kJpegBlock != 0 |
| 206 | || uncompressed_p010_image->height % 2 != 0) { |
| 207 | ALOGE("Image size can not be handled: %dx%d", |
| 208 | uncompressed_p010_image->width, uncompressed_p010_image->height); |
| 209 | return ERROR_JPEGR_INVALID_INPUT_TYPE; |
| 210 | } |
| 211 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 212 | jpegr_metadata metadata; |
| 213 | metadata.version = kJpegrVersion; |
| 214 | metadata.transferFunction = hdr_tf; |
| 215 | if (hdr_tf == JPEGR_TF_PQ) { |
| 216 | metadata.hdr10Metadata.st2086Metadata = kSt2086Metadata; |
| 217 | } |
| 218 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 219 | jpegr_uncompressed_struct map; |
Dichen Zhang | a876626 | 2022-11-07 23:48:24 +0000 | [diff] [blame] | 220 | JPEGR_CHECK(generateRecoveryMap( |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 221 | uncompressed_yuv_420_image, uncompressed_p010_image, &metadata, &map)); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 222 | std::unique_ptr<uint8_t[]> map_data; |
| 223 | map_data.reset(reinterpret_cast<uint8_t*>(map.data)); |
| 224 | |
| 225 | jpegr_compressed_struct compressed_map; |
Dichen Zhang | 0b9f7de | 2022-11-18 06:52:46 +0000 | [diff] [blame] | 226 | compressed_map.maxLength = map.width * map.height; |
| 227 | unique_ptr<uint8_t[]> compressed_map_data = make_unique<uint8_t[]>(compressed_map.maxLength); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 228 | compressed_map.data = compressed_map_data.get(); |
| 229 | JPEGR_CHECK(compressRecoveryMap(&map, &compressed_map)); |
| 230 | |
| 231 | JpegEncoder jpeg_encoder; |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 232 | // TODO: determine ICC data based on color gamut information |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 233 | if (!jpeg_encoder.compressImage(uncompressed_yuv_420_image->data, |
| 234 | uncompressed_yuv_420_image->width, |
Dichen Zhang | 95cbb9f | 2022-11-07 18:32:05 +0000 | [diff] [blame] | 235 | uncompressed_yuv_420_image->height, quality, nullptr, 0)) { |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 236 | return ERROR_JPEGR_ENCODE_ERROR; |
| 237 | } |
| 238 | jpegr_compressed_struct jpeg; |
| 239 | jpeg.data = jpeg_encoder.getCompressedImagePtr(); |
| 240 | jpeg.length = jpeg_encoder.getCompressedImageSize(); |
| 241 | |
Dichen Zhang | 50ff129 | 2023-01-27 18:03:43 +0000 | [diff] [blame^] | 242 | JPEGR_CHECK(appendRecoveryMap(&jpeg, &compressed_map, exif, &metadata, dest)); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 243 | |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 244 | return NO_ERROR; |
| 245 | } |
| 246 | |
Dichen Zhang | 636f524 | 2022-12-07 20:25:44 +0000 | [diff] [blame] | 247 | /* Encode API-2 */ |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 248 | status_t RecoveryMap::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image, |
| 249 | jr_uncompressed_ptr uncompressed_yuv_420_image, |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 250 | jr_compressed_ptr compressed_jpeg_image, |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 251 | jpegr_transfer_function hdr_tf, |
Dichen Zhang | 95cbb9f | 2022-11-07 18:32:05 +0000 | [diff] [blame] | 252 | jr_compressed_ptr dest) { |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 253 | if (uncompressed_p010_image == nullptr |
| 254 | || uncompressed_yuv_420_image == nullptr |
| 255 | || compressed_jpeg_image == nullptr |
| 256 | || dest == nullptr) { |
Dichen Zhang | 80b7248 | 2022-11-02 01:55:35 +0000 | [diff] [blame] | 257 | return ERROR_JPEGR_INVALID_NULL_PTR; |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 258 | } |
| 259 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 260 | if (uncompressed_p010_image->width != uncompressed_yuv_420_image->width |
| 261 | || uncompressed_p010_image->height != uncompressed_yuv_420_image->height) { |
| 262 | return ERROR_JPEGR_RESOLUTION_MISMATCH; |
| 263 | } |
| 264 | |
Dichen Zhang | 5375127 | 2023-01-17 19:09:01 -0800 | [diff] [blame] | 265 | if (uncompressed_p010_image->width % kJpegBlock != 0 |
| 266 | || uncompressed_p010_image->height % 2 != 0) { |
| 267 | ALOGE("Image size can not be handled: %dx%d", |
| 268 | uncompressed_p010_image->width, uncompressed_p010_image->height); |
| 269 | return ERROR_JPEGR_INVALID_INPUT_TYPE; |
| 270 | } |
| 271 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 272 | jpegr_metadata metadata; |
| 273 | metadata.version = kJpegrVersion; |
| 274 | metadata.transferFunction = hdr_tf; |
| 275 | if (hdr_tf == JPEGR_TF_PQ) { |
| 276 | metadata.hdr10Metadata.st2086Metadata = kSt2086Metadata; |
| 277 | } |
| 278 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 279 | jpegr_uncompressed_struct map; |
Dichen Zhang | a876626 | 2022-11-07 23:48:24 +0000 | [diff] [blame] | 280 | JPEGR_CHECK(generateRecoveryMap( |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 281 | uncompressed_yuv_420_image, uncompressed_p010_image, &metadata, &map)); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 282 | std::unique_ptr<uint8_t[]> map_data; |
| 283 | map_data.reset(reinterpret_cast<uint8_t*>(map.data)); |
| 284 | |
| 285 | jpegr_compressed_struct compressed_map; |
Dichen Zhang | 0b9f7de | 2022-11-18 06:52:46 +0000 | [diff] [blame] | 286 | compressed_map.maxLength = map.width * map.height; |
| 287 | unique_ptr<uint8_t[]> compressed_map_data = make_unique<uint8_t[]>(compressed_map.maxLength); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 288 | compressed_map.data = compressed_map_data.get(); |
| 289 | JPEGR_CHECK(compressRecoveryMap(&map, &compressed_map)); |
| 290 | |
Dichen Zhang | 50ff129 | 2023-01-27 18:03:43 +0000 | [diff] [blame^] | 291 | JPEGR_CHECK(appendRecoveryMap(compressed_jpeg_image, &compressed_map, nullptr, &metadata, dest)); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 292 | |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 293 | return NO_ERROR; |
| 294 | } |
| 295 | |
Dichen Zhang | 636f524 | 2022-12-07 20:25:44 +0000 | [diff] [blame] | 296 | /* Encode API-3 */ |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 297 | status_t RecoveryMap::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image, |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 298 | jr_compressed_ptr compressed_jpeg_image, |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 299 | jpegr_transfer_function hdr_tf, |
Dichen Zhang | 95cbb9f | 2022-11-07 18:32:05 +0000 | [diff] [blame] | 300 | jr_compressed_ptr dest) { |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 301 | if (uncompressed_p010_image == nullptr |
| 302 | || compressed_jpeg_image == nullptr |
| 303 | || dest == nullptr) { |
Dichen Zhang | 80b7248 | 2022-11-02 01:55:35 +0000 | [diff] [blame] | 304 | return ERROR_JPEGR_INVALID_NULL_PTR; |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 305 | } |
| 306 | |
Dichen Zhang | 5375127 | 2023-01-17 19:09:01 -0800 | [diff] [blame] | 307 | if (uncompressed_p010_image->width % kJpegBlock != 0 |
| 308 | || uncompressed_p010_image->height % 2 != 0) { |
| 309 | ALOGE("Image size can not be handled: %dx%d", |
| 310 | uncompressed_p010_image->width, uncompressed_p010_image->height); |
| 311 | return ERROR_JPEGR_INVALID_INPUT_TYPE; |
| 312 | } |
| 313 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 314 | JpegDecoder jpeg_decoder; |
| 315 | if (!jpeg_decoder.decompressImage(compressed_jpeg_image->data, compressed_jpeg_image->length)) { |
| 316 | return ERROR_JPEGR_DECODE_ERROR; |
| 317 | } |
| 318 | jpegr_uncompressed_struct uncompressed_yuv_420_image; |
| 319 | uncompressed_yuv_420_image.data = jpeg_decoder.getDecompressedImagePtr(); |
| 320 | uncompressed_yuv_420_image.width = jpeg_decoder.getDecompressedImageWidth(); |
| 321 | uncompressed_yuv_420_image.height = jpeg_decoder.getDecompressedImageHeight(); |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 322 | uncompressed_yuv_420_image.colorGamut = compressed_jpeg_image->colorGamut; |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 323 | |
| 324 | if (uncompressed_p010_image->width != uncompressed_yuv_420_image.width |
| 325 | || uncompressed_p010_image->height != uncompressed_yuv_420_image.height) { |
| 326 | return ERROR_JPEGR_RESOLUTION_MISMATCH; |
| 327 | } |
| 328 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 329 | jpegr_metadata metadata; |
| 330 | metadata.version = kJpegrVersion; |
| 331 | metadata.transferFunction = hdr_tf; |
| 332 | if (hdr_tf == JPEGR_TF_PQ) { |
| 333 | metadata.hdr10Metadata.st2086Metadata = kSt2086Metadata; |
| 334 | } |
| 335 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 336 | jpegr_uncompressed_struct map; |
Dichen Zhang | a876626 | 2022-11-07 23:48:24 +0000 | [diff] [blame] | 337 | JPEGR_CHECK(generateRecoveryMap( |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 338 | &uncompressed_yuv_420_image, uncompressed_p010_image, &metadata, &map)); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 339 | std::unique_ptr<uint8_t[]> map_data; |
| 340 | map_data.reset(reinterpret_cast<uint8_t*>(map.data)); |
| 341 | |
| 342 | jpegr_compressed_struct compressed_map; |
Dichen Zhang | 0b9f7de | 2022-11-18 06:52:46 +0000 | [diff] [blame] | 343 | compressed_map.maxLength = map.width * map.height; |
| 344 | unique_ptr<uint8_t[]> compressed_map_data = make_unique<uint8_t[]>(compressed_map.maxLength); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 345 | compressed_map.data = compressed_map_data.get(); |
| 346 | JPEGR_CHECK(compressRecoveryMap(&map, &compressed_map)); |
| 347 | |
Dichen Zhang | 50ff129 | 2023-01-27 18:03:43 +0000 | [diff] [blame^] | 348 | JPEGR_CHECK(appendRecoveryMap(compressed_jpeg_image, &compressed_map, nullptr, &metadata, dest)); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 349 | |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 350 | return NO_ERROR; |
| 351 | } |
| 352 | |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 353 | status_t RecoveryMap::getJPEGRInfo(jr_compressed_ptr compressed_jpegr_image, |
| 354 | jr_info_ptr jpegr_info) { |
| 355 | if (compressed_jpegr_image == nullptr || jpegr_info == nullptr) { |
| 356 | return ERROR_JPEGR_INVALID_NULL_PTR; |
| 357 | } |
| 358 | |
| 359 | jpegr_compressed_struct primary_image, recovery_map; |
| 360 | JPEGR_CHECK(extractPrimaryImageAndRecoveryMap(compressed_jpegr_image, |
| 361 | &primary_image, &recovery_map)); |
| 362 | |
| 363 | JpegDecoder jpeg_decoder; |
| 364 | if (!jpeg_decoder.getCompressedImageParameters(primary_image.data, primary_image.length, |
| 365 | &jpegr_info->width, &jpegr_info->height, |
| 366 | jpegr_info->iccData, jpegr_info->exifData)) { |
| 367 | return ERROR_JPEGR_DECODE_ERROR; |
| 368 | } |
| 369 | |
| 370 | return NO_ERROR; |
| 371 | } |
| 372 | |
Dichen Zhang | 636f524 | 2022-12-07 20:25:44 +0000 | [diff] [blame] | 373 | /* Decode API */ |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 374 | status_t RecoveryMap::decodeJPEGR(jr_compressed_ptr compressed_jpegr_image, |
Dichen Zhang | ffa3401 | 2022-11-03 23:21:13 +0000 | [diff] [blame] | 375 | jr_uncompressed_ptr dest, |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 376 | jr_exif_ptr exif, |
| 377 | bool request_sdr) { |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 378 | if (compressed_jpegr_image == nullptr || dest == nullptr) { |
Dichen Zhang | 80b7248 | 2022-11-02 01:55:35 +0000 | [diff] [blame] | 379 | return ERROR_JPEGR_INVALID_NULL_PTR; |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 380 | } |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 381 | // TODO: fill EXIF data |
| 382 | (void) exif; |
| 383 | |
Fyodor Kyslov | ea9180f | 2023-01-06 01:11:43 +0000 | [diff] [blame] | 384 | if (request_sdr) { |
| 385 | JpegDecoder jpeg_decoder; |
| 386 | if (!jpeg_decoder.decompressImage(compressed_jpegr_image->data, compressed_jpegr_image->length, |
| 387 | true)) { |
| 388 | return ERROR_JPEGR_DECODE_ERROR; |
| 389 | } |
| 390 | jpegr_uncompressed_struct uncompressed_rgba_image; |
| 391 | uncompressed_rgba_image.data = jpeg_decoder.getDecompressedImagePtr(); |
| 392 | uncompressed_rgba_image.width = jpeg_decoder.getDecompressedImageWidth(); |
| 393 | uncompressed_rgba_image.height = jpeg_decoder.getDecompressedImageHeight(); |
| 394 | memcpy(dest->data, uncompressed_rgba_image.data, |
| 395 | uncompressed_rgba_image.width * uncompressed_rgba_image.height * 4); |
| 396 | dest->width = uncompressed_rgba_image.width; |
| 397 | dest->height = uncompressed_rgba_image.height; |
| 398 | return NO_ERROR; |
| 399 | } |
| 400 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 401 | jpegr_compressed_struct compressed_map; |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 402 | jpegr_metadata metadata; |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 403 | JPEGR_CHECK(extractRecoveryMap(compressed_jpegr_image, &compressed_map)); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 404 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 405 | JpegDecoder jpeg_decoder; |
| 406 | if (!jpeg_decoder.decompressImage(compressed_jpegr_image->data, compressed_jpegr_image->length)) { |
| 407 | return ERROR_JPEGR_DECODE_ERROR; |
| 408 | } |
| 409 | |
Fyodor Kyslov | bf24157 | 2022-12-13 22:38:07 +0000 | [diff] [blame] | 410 | JpegDecoder recovery_map_decoder; |
Fyodor Kyslov | ea9180f | 2023-01-06 01:11:43 +0000 | [diff] [blame] | 411 | if (!recovery_map_decoder.decompressImage(compressed_map.data, compressed_map.length)) { |
Fyodor Kyslov | bf24157 | 2022-12-13 22:38:07 +0000 | [diff] [blame] | 412 | return ERROR_JPEGR_DECODE_ERROR; |
| 413 | } |
| 414 | |
| 415 | jpegr_uncompressed_struct map; |
| 416 | map.data = recovery_map_decoder.getDecompressedImagePtr(); |
| 417 | map.width = recovery_map_decoder.getDecompressedImageWidth(); |
| 418 | map.height = recovery_map_decoder.getDecompressedImageHeight(); |
| 419 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 420 | jpegr_uncompressed_struct uncompressed_yuv_420_image; |
| 421 | uncompressed_yuv_420_image.data = jpeg_decoder.getDecompressedImagePtr(); |
| 422 | uncompressed_yuv_420_image.width = jpeg_decoder.getDecompressedImageWidth(); |
| 423 | uncompressed_yuv_420_image.height = jpeg_decoder.getDecompressedImageHeight(); |
| 424 | |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 425 | if (!getMetadataFromXMP(static_cast<uint8_t*>(jpeg_decoder.getXMPPtr()), |
Fyodor Kyslov | ea9180f | 2023-01-06 01:11:43 +0000 | [diff] [blame] | 426 | jpeg_decoder.getXMPSize(), &metadata)) { |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 427 | return ERROR_JPEGR_DECODE_ERROR; |
| 428 | } |
| 429 | |
Fyodor Kyslov | ea9180f | 2023-01-06 01:11:43 +0000 | [diff] [blame] | 430 | JPEGR_CHECK(applyRecoveryMap(&uncompressed_yuv_420_image, &map, &metadata, dest)); |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 431 | return NO_ERROR; |
| 432 | } |
| 433 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 434 | status_t RecoveryMap::compressRecoveryMap(jr_uncompressed_ptr uncompressed_recovery_map, |
| 435 | jr_compressed_ptr dest) { |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 436 | if (uncompressed_recovery_map == nullptr || dest == nullptr) { |
Dichen Zhang | 80b7248 | 2022-11-02 01:55:35 +0000 | [diff] [blame] | 437 | return ERROR_JPEGR_INVALID_NULL_PTR; |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 438 | } |
| 439 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 440 | // TODO: should we have ICC data for the map? |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 441 | JpegEncoder jpeg_encoder; |
Dichen Zhang | 0b9f7de | 2022-11-18 06:52:46 +0000 | [diff] [blame] | 442 | if (!jpeg_encoder.compressImage(uncompressed_recovery_map->data, |
| 443 | uncompressed_recovery_map->width, |
| 444 | uncompressed_recovery_map->height, |
| 445 | kMapCompressQuality, |
| 446 | nullptr, |
| 447 | 0, |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 448 | true /* isSingleChannel */)) { |
| 449 | return ERROR_JPEGR_ENCODE_ERROR; |
| 450 | } |
| 451 | |
Dichen Zhang | 0b9f7de | 2022-11-18 06:52:46 +0000 | [diff] [blame] | 452 | if (dest->maxLength < jpeg_encoder.getCompressedImageSize()) { |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 453 | return ERROR_JPEGR_BUFFER_TOO_SMALL; |
| 454 | } |
| 455 | |
| 456 | memcpy(dest->data, jpeg_encoder.getCompressedImagePtr(), jpeg_encoder.getCompressedImageSize()); |
| 457 | dest->length = jpeg_encoder.getCompressedImageSize(); |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 458 | dest->colorGamut = JPEGR_COLORGAMUT_UNSPECIFIED; |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 459 | |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 460 | return NO_ERROR; |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 461 | } |
| 462 | |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 463 | const int kJobSzInRows = 16; |
| 464 | static_assert(kJobSzInRows > 0 && kJobSzInRows % kMapDimensionScaleFactor == 0, |
| 465 | "align job size to kMapDimensionScaleFactor"); |
| 466 | |
| 467 | class JobQueue { |
| 468 | public: |
| 469 | bool dequeueJob(size_t& rowStart, size_t& rowEnd); |
| 470 | void enqueueJob(size_t rowStart, size_t rowEnd); |
| 471 | void markQueueForEnd(); |
| 472 | void reset(); |
| 473 | |
| 474 | private: |
| 475 | bool mQueuedAllJobs = false; |
| 476 | std::deque<std::tuple<size_t, size_t>> mJobs; |
| 477 | std::mutex mMutex; |
| 478 | std::condition_variable mCv; |
| 479 | }; |
| 480 | |
| 481 | bool JobQueue::dequeueJob(size_t& rowStart, size_t& rowEnd) { |
| 482 | std::unique_lock<std::mutex> lock{mMutex}; |
| 483 | while (true) { |
| 484 | if (mJobs.empty()) { |
| 485 | if (mQueuedAllJobs) { |
| 486 | return false; |
| 487 | } else { |
| 488 | mCv.wait(lock); |
| 489 | } |
| 490 | } else { |
| 491 | auto it = mJobs.begin(); |
| 492 | rowStart = std::get<0>(*it); |
| 493 | rowEnd = std::get<1>(*it); |
| 494 | mJobs.erase(it); |
| 495 | return true; |
| 496 | } |
| 497 | } |
| 498 | return false; |
| 499 | } |
| 500 | |
| 501 | void JobQueue::enqueueJob(size_t rowStart, size_t rowEnd) { |
| 502 | std::unique_lock<std::mutex> lock{mMutex}; |
| 503 | mJobs.push_back(std::make_tuple(rowStart, rowEnd)); |
| 504 | lock.unlock(); |
| 505 | mCv.notify_one(); |
| 506 | } |
| 507 | |
| 508 | void JobQueue::markQueueForEnd() { |
| 509 | std::unique_lock<std::mutex> lock{mMutex}; |
| 510 | mQueuedAllJobs = true; |
| 511 | } |
| 512 | |
| 513 | void JobQueue::reset() { |
| 514 | std::unique_lock<std::mutex> lock{mMutex}; |
| 515 | mJobs.clear(); |
| 516 | mQueuedAllJobs = false; |
| 517 | } |
| 518 | |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 519 | status_t RecoveryMap::generateRecoveryMap(jr_uncompressed_ptr uncompressed_yuv_420_image, |
| 520 | jr_uncompressed_ptr uncompressed_p010_image, |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 521 | jr_metadata_ptr metadata, |
| 522 | jr_uncompressed_ptr dest) { |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 523 | if (uncompressed_yuv_420_image == nullptr |
| 524 | || uncompressed_p010_image == nullptr |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 525 | || metadata == nullptr |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 526 | || dest == nullptr) { |
Dichen Zhang | 80b7248 | 2022-11-02 01:55:35 +0000 | [diff] [blame] | 527 | return ERROR_JPEGR_INVALID_NULL_PTR; |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 528 | } |
| 529 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 530 | if (uncompressed_yuv_420_image->width != uncompressed_p010_image->width |
| 531 | || uncompressed_yuv_420_image->height != uncompressed_p010_image->height) { |
| 532 | return ERROR_JPEGR_RESOLUTION_MISMATCH; |
| 533 | } |
| 534 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 535 | if (uncompressed_yuv_420_image->colorGamut == JPEGR_COLORGAMUT_UNSPECIFIED |
| 536 | || uncompressed_p010_image->colorGamut == JPEGR_COLORGAMUT_UNSPECIFIED) { |
| 537 | return ERROR_JPEGR_INVALID_COLORGAMUT; |
| 538 | } |
| 539 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 540 | size_t image_width = uncompressed_yuv_420_image->width; |
| 541 | size_t image_height = uncompressed_yuv_420_image->height; |
| 542 | size_t map_width = image_width / kMapDimensionScaleFactor; |
| 543 | size_t map_height = image_height / kMapDimensionScaleFactor; |
Dichen Zhang | 5375127 | 2023-01-17 19:09:01 -0800 | [diff] [blame] | 544 | size_t map_stride = static_cast<size_t>( |
| 545 | floor((map_width + kJpegBlock - 1) / kJpegBlock)) * kJpegBlock; |
| 546 | size_t map_height_aligned = ((map_height + 1) >> 1) << 1; |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 547 | |
Dichen Zhang | 5375127 | 2023-01-17 19:09:01 -0800 | [diff] [blame] | 548 | dest->width = map_stride; |
| 549 | dest->height = map_height_aligned; |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 550 | dest->colorGamut = JPEGR_COLORGAMUT_UNSPECIFIED; |
Dichen Zhang | 5375127 | 2023-01-17 19:09:01 -0800 | [diff] [blame] | 551 | dest->data = new uint8_t[map_stride * map_height_aligned]; |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 552 | std::unique_ptr<uint8_t[]> map_data; |
| 553 | map_data.reset(reinterpret_cast<uint8_t*>(dest->data)); |
| 554 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 555 | ColorTransformFn hdrInvOetf = nullptr; |
Nick Deakin | 65f492a | 2022-11-29 22:47:40 -0500 | [diff] [blame] | 556 | float hdr_white_nits = 0.0f; |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 557 | switch (metadata->transferFunction) { |
Dichen Zhang | dc8452b | 2022-11-23 17:17:56 +0000 | [diff] [blame] | 558 | case JPEGR_TF_LINEAR: |
| 559 | hdrInvOetf = identityConversion; |
| 560 | break; |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 561 | case JPEGR_TF_HLG: |
Harish Mahendrakar | 555a06b | 2022-12-14 09:37:27 -0800 | [diff] [blame] | 562 | #if USE_HLG_INVOETF_LUT |
| 563 | hdrInvOetf = hlgInvOetfLUT; |
| 564 | #else |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 565 | hdrInvOetf = hlgInvOetf; |
Harish Mahendrakar | 555a06b | 2022-12-14 09:37:27 -0800 | [diff] [blame] | 566 | #endif |
Nick Deakin | 65f492a | 2022-11-29 22:47:40 -0500 | [diff] [blame] | 567 | hdr_white_nits = kHlgMaxNits; |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 568 | break; |
| 569 | case JPEGR_TF_PQ: |
Harish Mahendrakar | 555a06b | 2022-12-14 09:37:27 -0800 | [diff] [blame] | 570 | #if USE_PQ_INVOETF_LUT |
| 571 | hdrInvOetf = pqInvOetfLUT; |
| 572 | #else |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 573 | hdrInvOetf = pqInvOetf; |
Harish Mahendrakar | 555a06b | 2022-12-14 09:37:27 -0800 | [diff] [blame] | 574 | #endif |
Nick Deakin | 65f492a | 2022-11-29 22:47:40 -0500 | [diff] [blame] | 575 | hdr_white_nits = kPqMaxNits; |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 576 | break; |
Dichen Zhang | b27d06d | 2022-12-14 19:57:50 +0000 | [diff] [blame] | 577 | case JPEGR_TF_UNSPECIFIED: |
| 578 | // Should be impossible to hit after input validation. |
| 579 | return ERROR_JPEGR_INVALID_TRANS_FUNC; |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 580 | } |
| 581 | |
| 582 | ColorTransformFn hdrGamutConversionFn = getHdrConversionFn( |
| 583 | uncompressed_yuv_420_image->colorGamut, uncompressed_p010_image->colorGamut); |
| 584 | |
| 585 | ColorCalculationFn luminanceFn = nullptr; |
| 586 | switch (uncompressed_yuv_420_image->colorGamut) { |
| 587 | case JPEGR_COLORGAMUT_BT709: |
| 588 | luminanceFn = srgbLuminance; |
| 589 | break; |
| 590 | case JPEGR_COLORGAMUT_P3: |
| 591 | luminanceFn = p3Luminance; |
| 592 | break; |
| 593 | case JPEGR_COLORGAMUT_BT2100: |
| 594 | luminanceFn = bt2100Luminance; |
| 595 | break; |
| 596 | case JPEGR_COLORGAMUT_UNSPECIFIED: |
| 597 | // Should be impossible to hit after input validation. |
| 598 | return ERROR_JPEGR_INVALID_COLORGAMUT; |
| 599 | } |
| 600 | |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 601 | std::mutex mutex; |
Nick Deakin | 594a4ca | 2022-11-16 20:57:42 -0500 | [diff] [blame] | 602 | float hdr_y_nits_max = 0.0f; |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 603 | double hdr_y_nits_avg = 0.0f; |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 604 | const int threads = std::clamp(GetCPUCoreCount(), 1, 4); |
| 605 | size_t rowStep = threads == 1 ? image_height : kJobSzInRows; |
| 606 | JobQueue jobQueue; |
Nick Deakin | 594a4ca | 2022-11-16 20:57:42 -0500 | [diff] [blame] | 607 | |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 608 | std::function<void()> computeMetadata = [uncompressed_p010_image, hdrInvOetf, |
| 609 | hdrGamutConversionFn, luminanceFn, hdr_white_nits, |
| 610 | threads, &mutex, &hdr_y_nits_avg, |
| 611 | &hdr_y_nits_max, &jobQueue]() -> void { |
| 612 | size_t rowStart, rowEnd; |
| 613 | float hdr_y_nits_max_th = 0.0f; |
| 614 | double hdr_y_nits_avg_th = 0.0f; |
| 615 | while (jobQueue.dequeueJob(rowStart, rowEnd)) { |
| 616 | for (size_t y = rowStart; y < rowEnd; ++y) { |
| 617 | for (size_t x = 0; x < uncompressed_p010_image->width; ++x) { |
| 618 | Color hdr_yuv_gamma = getP010Pixel(uncompressed_p010_image, x, y); |
| 619 | Color hdr_rgb_gamma = bt2100YuvToRgb(hdr_yuv_gamma); |
| 620 | Color hdr_rgb = hdrInvOetf(hdr_rgb_gamma); |
| 621 | hdr_rgb = hdrGamutConversionFn(hdr_rgb); |
| 622 | float hdr_y_nits = luminanceFn(hdr_rgb) * hdr_white_nits; |
| 623 | |
| 624 | hdr_y_nits_avg_th += hdr_y_nits; |
| 625 | if (hdr_y_nits > hdr_y_nits_max_th) { |
| 626 | hdr_y_nits_max_th = hdr_y_nits; |
| 627 | } |
| 628 | } |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 629 | } |
| 630 | } |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 631 | std::unique_lock<std::mutex> lock{mutex}; |
| 632 | hdr_y_nits_avg += hdr_y_nits_avg_th; |
| 633 | hdr_y_nits_max = std::max(hdr_y_nits_max, hdr_y_nits_max_th); |
| 634 | }; |
| 635 | |
| 636 | std::function<void()> generateMap = [uncompressed_yuv_420_image, uncompressed_p010_image, |
| 637 | metadata, dest, hdrInvOetf, hdrGamutConversionFn, |
| 638 | luminanceFn, hdr_white_nits, &jobQueue]() -> void { |
| 639 | size_t rowStart, rowEnd; |
| 640 | while (jobQueue.dequeueJob(rowStart, rowEnd)) { |
| 641 | for (size_t y = rowStart; y < rowEnd; ++y) { |
| 642 | for (size_t x = 0; x < dest->width; ++x) { |
| 643 | Color sdr_yuv_gamma = |
| 644 | sampleYuv420(uncompressed_yuv_420_image, kMapDimensionScaleFactor, x, y); |
| 645 | Color sdr_rgb_gamma = srgbYuvToRgb(sdr_yuv_gamma); |
Harish Mahendrakar | 555a06b | 2022-12-14 09:37:27 -0800 | [diff] [blame] | 646 | #if USE_SRGB_INVOETF_LUT |
| 647 | Color sdr_rgb = srgbInvOetfLUT(sdr_rgb_gamma); |
| 648 | #else |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 649 | Color sdr_rgb = srgbInvOetf(sdr_rgb_gamma); |
Harish Mahendrakar | 555a06b | 2022-12-14 09:37:27 -0800 | [diff] [blame] | 650 | #endif |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 651 | float sdr_y_nits = luminanceFn(sdr_rgb) * kSdrWhiteNits; |
| 652 | |
| 653 | Color hdr_yuv_gamma = sampleP010(uncompressed_p010_image, kMapDimensionScaleFactor, x, y); |
| 654 | Color hdr_rgb_gamma = bt2100YuvToRgb(hdr_yuv_gamma); |
| 655 | Color hdr_rgb = hdrInvOetf(hdr_rgb_gamma); |
| 656 | hdr_rgb = hdrGamutConversionFn(hdr_rgb); |
| 657 | float hdr_y_nits = luminanceFn(hdr_rgb) * hdr_white_nits; |
| 658 | |
| 659 | size_t pixel_idx = x + y * dest->width; |
| 660 | reinterpret_cast<uint8_t*>(dest->data)[pixel_idx] = |
| 661 | encodeRecovery(sdr_y_nits, hdr_y_nits, metadata->rangeScalingFactor); |
| 662 | } |
| 663 | } |
| 664 | } |
| 665 | }; |
| 666 | |
| 667 | std::vector<std::thread> workers; |
| 668 | for (int th = 0; th < threads - 1; th++) { |
| 669 | workers.push_back(std::thread(computeMetadata)); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 670 | } |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 671 | |
| 672 | // compute metadata |
| 673 | for (size_t rowStart = 0; rowStart < image_height;) { |
| 674 | size_t rowEnd = std::min(rowStart + rowStep, image_height); |
| 675 | jobQueue.enqueueJob(rowStart, rowEnd); |
| 676 | rowStart = rowEnd; |
| 677 | } |
| 678 | jobQueue.markQueueForEnd(); |
| 679 | computeMetadata(); |
| 680 | std::for_each(workers.begin(), workers.end(), [](std::thread& t) { t.join(); }); |
| 681 | workers.clear(); |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 682 | hdr_y_nits_avg /= image_width * image_height; |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 683 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 684 | metadata->rangeScalingFactor = hdr_y_nits_max / kSdrWhiteNits; |
| 685 | if (metadata->transferFunction == JPEGR_TF_PQ) { |
| 686 | metadata->hdr10Metadata.maxFALL = hdr_y_nits_avg; |
| 687 | metadata->hdr10Metadata.maxCLL = hdr_y_nits_max; |
| 688 | } |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 689 | |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 690 | // generate map |
| 691 | jobQueue.reset(); |
| 692 | for (int th = 0; th < threads - 1; th++) { |
| 693 | workers.push_back(std::thread(generateMap)); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 694 | } |
| 695 | |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 696 | rowStep = (threads == 1 ? image_height : kJobSzInRows) / kMapDimensionScaleFactor; |
| 697 | for (size_t rowStart = 0; rowStart < map_height;) { |
| 698 | size_t rowEnd = std::min(rowStart + rowStep, map_height); |
| 699 | jobQueue.enqueueJob(rowStart, rowEnd); |
| 700 | rowStart = rowEnd; |
| 701 | } |
| 702 | jobQueue.markQueueForEnd(); |
| 703 | generateMap(); |
| 704 | std::for_each(workers.begin(), workers.end(), [](std::thread& t) { t.join(); }); |
| 705 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 706 | map_data.release(); |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 707 | return NO_ERROR; |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 708 | } |
| 709 | |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 710 | status_t RecoveryMap::applyRecoveryMap(jr_uncompressed_ptr uncompressed_yuv_420_image, |
| 711 | jr_uncompressed_ptr uncompressed_recovery_map, |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 712 | jr_metadata_ptr metadata, |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 713 | jr_uncompressed_ptr dest) { |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 714 | if (uncompressed_yuv_420_image == nullptr |
| 715 | || uncompressed_recovery_map == nullptr |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 716 | || metadata == nullptr |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 717 | || dest == nullptr) { |
Dichen Zhang | 80b7248 | 2022-11-02 01:55:35 +0000 | [diff] [blame] | 718 | return ERROR_JPEGR_INVALID_NULL_PTR; |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 719 | } |
| 720 | |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 721 | dest->width = uncompressed_yuv_420_image->width; |
| 722 | dest->height = uncompressed_yuv_420_image->height; |
Ram Mohan | fe723d6 | 2022-12-15 00:59:11 +0530 | [diff] [blame] | 723 | ShepardsIDW idwTable(kMapDimensionScaleFactor); |
Harish Mahendrakar | f25991f | 2022-12-16 11:57:44 -0800 | [diff] [blame] | 724 | RecoveryLUT recoveryLUT(metadata->rangeScalingFactor); |
Ram Mohan | fe723d6 | 2022-12-15 00:59:11 +0530 | [diff] [blame] | 725 | |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 726 | JobQueue jobQueue; |
| 727 | std::function<void()> applyRecMap = [uncompressed_yuv_420_image, uncompressed_recovery_map, |
Harish Mahendrakar | f25991f | 2022-12-16 11:57:44 -0800 | [diff] [blame] | 728 | metadata, dest, &jobQueue, &idwTable, |
| 729 | &recoveryLUT]() -> void { |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 730 | const float hdr_ratio = metadata->rangeScalingFactor; |
| 731 | size_t width = uncompressed_yuv_420_image->width; |
| 732 | size_t height = uncompressed_yuv_420_image->height; |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 733 | |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 734 | ColorTransformFn hdrOetf = nullptr; |
| 735 | switch (metadata->transferFunction) { |
| 736 | case JPEGR_TF_LINEAR: |
| 737 | hdrOetf = identityConversion; |
| 738 | break; |
| 739 | case JPEGR_TF_HLG: |
Harish Mahendrakar | 555a06b | 2022-12-14 09:37:27 -0800 | [diff] [blame] | 740 | #if USE_HLG_OETF_LUT |
| 741 | hdrOetf = hlgOetfLUT; |
| 742 | #else |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 743 | hdrOetf = hlgOetf; |
Harish Mahendrakar | 555a06b | 2022-12-14 09:37:27 -0800 | [diff] [blame] | 744 | #endif |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 745 | break; |
| 746 | case JPEGR_TF_PQ: |
Harish Mahendrakar | 555a06b | 2022-12-14 09:37:27 -0800 | [diff] [blame] | 747 | #if USE_PQ_OETF_LUT |
| 748 | hdrOetf = pqOetfLUT; |
| 749 | #else |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 750 | hdrOetf = pqOetf; |
Harish Mahendrakar | 555a06b | 2022-12-14 09:37:27 -0800 | [diff] [blame] | 751 | #endif |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 752 | break; |
| 753 | case JPEGR_TF_UNSPECIFIED: |
| 754 | // Should be impossible to hit after input validation. |
| 755 | hdrOetf = identityConversion; |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 756 | } |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 757 | |
| 758 | size_t rowStart, rowEnd; |
| 759 | while (jobQueue.dequeueJob(rowStart, rowEnd)) { |
| 760 | for (size_t y = rowStart; y < rowEnd; ++y) { |
| 761 | for (size_t x = 0; x < width; ++x) { |
| 762 | Color yuv_gamma_sdr = getYuv420Pixel(uncompressed_yuv_420_image, x, y); |
| 763 | Color rgb_gamma_sdr = srgbYuvToRgb(yuv_gamma_sdr); |
Harish Mahendrakar | 555a06b | 2022-12-14 09:37:27 -0800 | [diff] [blame] | 764 | #if USE_SRGB_INVOETF_LUT |
| 765 | Color rgb_sdr = srgbInvOetfLUT(rgb_gamma_sdr); |
| 766 | #else |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 767 | Color rgb_sdr = srgbInvOetf(rgb_gamma_sdr); |
Harish Mahendrakar | 555a06b | 2022-12-14 09:37:27 -0800 | [diff] [blame] | 768 | #endif |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 769 | float recovery; |
| 770 | // TODO: determine map scaling factor based on actual map dims |
| 771 | size_t map_scale_factor = kMapDimensionScaleFactor; |
| 772 | // TODO: If map_scale_factor is guaranteed to be an integer, then remove the following. |
| 773 | // Currently map_scale_factor is of type size_t, but it could be changed to a float |
| 774 | // later. |
| 775 | if (map_scale_factor != floorf(map_scale_factor)) { |
| 776 | recovery = sampleMap(uncompressed_recovery_map, map_scale_factor, x, y); |
| 777 | } else { |
| 778 | recovery = sampleMap(uncompressed_recovery_map, map_scale_factor, x, y, |
| 779 | idwTable); |
| 780 | } |
Harish Mahendrakar | f25991f | 2022-12-16 11:57:44 -0800 | [diff] [blame] | 781 | #if USE_APPLY_RECOVERY_LUT |
| 782 | Color rgb_hdr = applyRecoveryLUT(rgb_sdr, recovery, recoveryLUT); |
| 783 | #else |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 784 | Color rgb_hdr = applyRecovery(rgb_sdr, recovery, hdr_ratio); |
Harish Mahendrakar | f25991f | 2022-12-16 11:57:44 -0800 | [diff] [blame] | 785 | #endif |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 786 | Color rgb_gamma_hdr = hdrOetf(rgb_hdr / metadata->rangeScalingFactor); |
| 787 | uint32_t rgba1010102 = colorToRgba1010102(rgb_gamma_hdr); |
| 788 | |
| 789 | size_t pixel_idx = x + y * width; |
| 790 | reinterpret_cast<uint32_t*>(dest->data)[pixel_idx] = rgba1010102; |
| 791 | } |
| 792 | } |
| 793 | } |
| 794 | }; |
| 795 | |
| 796 | const int threads = std::clamp(GetCPUCoreCount(), 1, 4); |
| 797 | std::vector<std::thread> workers; |
| 798 | for (int th = 0; th < threads - 1; th++) { |
| 799 | workers.push_back(std::thread(applyRecMap)); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 800 | } |
Harish Mahendrakar | 72b6f30 | 2022-12-16 10:39:15 -0800 | [diff] [blame] | 801 | const int rowStep = threads == 1 ? uncompressed_yuv_420_image->height : kJobSzInRows; |
| 802 | for (int rowStart = 0; rowStart < uncompressed_yuv_420_image->height;) { |
| 803 | int rowEnd = std::min(rowStart + rowStep, uncompressed_yuv_420_image->height); |
| 804 | jobQueue.enqueueJob(rowStart, rowEnd); |
| 805 | rowStart = rowEnd; |
| 806 | } |
| 807 | jobQueue.markQueueForEnd(); |
| 808 | applyRecMap(); |
| 809 | std::for_each(workers.begin(), workers.end(), [](std::thread& t) { t.join(); }); |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 810 | return NO_ERROR; |
| 811 | } |
| 812 | |
| 813 | status_t RecoveryMap::extractPrimaryImageAndRecoveryMap(jr_compressed_ptr compressed_jpegr_image, |
| 814 | jr_compressed_ptr primary_image, |
| 815 | jr_compressed_ptr recovery_map) { |
| 816 | if (compressed_jpegr_image == nullptr) { |
| 817 | return ERROR_JPEGR_INVALID_NULL_PTR; |
| 818 | } |
| 819 | |
| 820 | MessageHandler msg_handler; |
| 821 | std::shared_ptr<DataSegment> seg = |
| 822 | DataSegment::Create(DataRange(0, compressed_jpegr_image->length), |
| 823 | static_cast<const uint8_t*>(compressed_jpegr_image->data), |
| 824 | DataSegment::BufferDispositionPolicy::kDontDelete); |
| 825 | DataSegmentDataSource data_source(seg); |
| 826 | JpegInfoBuilder jpeg_info_builder; |
| 827 | jpeg_info_builder.SetImageLimit(2); |
| 828 | JpegScanner jpeg_scanner(&msg_handler); |
| 829 | jpeg_scanner.Run(&data_source, &jpeg_info_builder); |
| 830 | data_source.Reset(); |
| 831 | |
| 832 | if (jpeg_scanner.HasError()) { |
| 833 | return ERROR_JPEGR_INVALID_INPUT_TYPE; |
| 834 | } |
| 835 | |
| 836 | const auto& jpeg_info = jpeg_info_builder.GetInfo(); |
| 837 | const auto& image_ranges = jpeg_info.GetImageRanges(); |
| 838 | if (image_ranges.empty()) { |
| 839 | return ERROR_JPEGR_INVALID_INPUT_TYPE; |
| 840 | } |
| 841 | |
| 842 | if (image_ranges.size() != 2) { |
| 843 | // Must be 2 JPEG Images |
| 844 | return ERROR_JPEGR_INVALID_INPUT_TYPE; |
| 845 | } |
| 846 | |
| 847 | if (primary_image != nullptr) { |
| 848 | primary_image->data = static_cast<uint8_t*>(compressed_jpegr_image->data) + |
| 849 | image_ranges[0].GetBegin(); |
| 850 | primary_image->length = image_ranges[0].GetLength(); |
| 851 | } |
| 852 | |
| 853 | if (recovery_map != nullptr) { |
| 854 | recovery_map->data = static_cast<uint8_t*>(compressed_jpegr_image->data) + |
| 855 | image_ranges[1].GetBegin(); |
| 856 | recovery_map->length = image_ranges[1].GetLength(); |
| 857 | } |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 858 | |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 859 | return NO_ERROR; |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 860 | } |
| 861 | |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 862 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 863 | status_t RecoveryMap::extractRecoveryMap(jr_compressed_ptr compressed_jpegr_image, |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 864 | jr_compressed_ptr dest) { |
| 865 | if (compressed_jpegr_image == nullptr || dest == nullptr) { |
Dichen Zhang | 80b7248 | 2022-11-02 01:55:35 +0000 | [diff] [blame] | 866 | return ERROR_JPEGR_INVALID_NULL_PTR; |
Dichen Zhang | 85b3756 | 2022-10-11 11:08:28 -0700 | [diff] [blame] | 867 | } |
| 868 | |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 869 | return extractPrimaryImageAndRecoveryMap(compressed_jpegr_image, nullptr, dest); |
Dichen Zhang | 85b3756 | 2022-10-11 11:08:28 -0700 | [diff] [blame] | 870 | } |
| 871 | |
Dichen Zhang | d18bc30 | 2022-12-16 20:55:24 +0000 | [diff] [blame] | 872 | // JPEG/R structure: |
| 873 | // SOI (ff d8) |
Dichen Zhang | 50ff129 | 2023-01-27 18:03:43 +0000 | [diff] [blame^] | 874 | // |
| 875 | // (Optional, only if EXIF package is from outside) |
Dichen Zhang | d18bc30 | 2022-12-16 20:55:24 +0000 | [diff] [blame] | 876 | // APP1 (ff e1) |
| 877 | // 2 bytes of length (2 + length of exif package) |
| 878 | // EXIF package (this includes the first two bytes representing the package length) |
Dichen Zhang | 50ff129 | 2023-01-27 18:03:43 +0000 | [diff] [blame^] | 879 | // |
| 880 | // (Required, XMP package) APP1 (ff e1) |
Dichen Zhang | d18bc30 | 2022-12-16 20:55:24 +0000 | [diff] [blame] | 881 | // 2 bytes of length (2 + 29 + length of xmp package) |
| 882 | // name space ("http://ns.adobe.com/xap/1.0/\0") |
| 883 | // xmp |
Dichen Zhang | 50ff129 | 2023-01-27 18:03:43 +0000 | [diff] [blame^] | 884 | // |
| 885 | // (Required) primary image (without the first two bytes (SOI), may have other packages) |
| 886 | // |
| 887 | // (Required) secondary image (the recovery map) |
Dichen Zhang | d18bc30 | 2022-12-16 20:55:24 +0000 | [diff] [blame] | 888 | // |
| 889 | // Metadata versions we are using: |
| 890 | // ECMA TR-98 for JFIF marker |
| 891 | // Exif 2.2 spec for EXIF marker |
| 892 | // Adobe XMP spec part 3 for XMP marker |
| 893 | // ICC v4.3 spec for ICC |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 894 | status_t RecoveryMap::appendRecoveryMap(jr_compressed_ptr compressed_jpeg_image, |
| 895 | jr_compressed_ptr compressed_recovery_map, |
Dichen Zhang | d18bc30 | 2022-12-16 20:55:24 +0000 | [diff] [blame] | 896 | jr_exif_ptr exif, |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 897 | jr_metadata_ptr metadata, |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 898 | jr_compressed_ptr dest) { |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 899 | if (compressed_jpeg_image == nullptr |
| 900 | || compressed_recovery_map == nullptr |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 901 | || metadata == nullptr |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 902 | || dest == nullptr) { |
Dichen Zhang | 80b7248 | 2022-11-02 01:55:35 +0000 | [diff] [blame] | 903 | return ERROR_JPEGR_INVALID_NULL_PTR; |
Dichen Zhang | 85b3756 | 2022-10-11 11:08:28 -0700 | [diff] [blame] | 904 | } |
| 905 | |
Dichen Zhang | a876626 | 2022-11-07 23:48:24 +0000 | [diff] [blame] | 906 | int pos = 0; |
| 907 | |
Dichen Zhang | d18bc30 | 2022-12-16 20:55:24 +0000 | [diff] [blame] | 908 | // Write SOI |
Dichen Zhang | a876626 | 2022-11-07 23:48:24 +0000 | [diff] [blame] | 909 | JPEGR_CHECK(Write(dest, &photos_editing_formats::image_io::JpegMarker::kStart, 1, pos)); |
| 910 | JPEGR_CHECK(Write(dest, &photos_editing_formats::image_io::JpegMarker::kSOI, 1, pos)); |
Dichen Zhang | d18bc30 | 2022-12-16 20:55:24 +0000 | [diff] [blame] | 911 | |
| 912 | // Write EXIF |
Dichen Zhang | 50ff129 | 2023-01-27 18:03:43 +0000 | [diff] [blame^] | 913 | if (exif != nullptr) { |
Dichen Zhang | d18bc30 | 2022-12-16 20:55:24 +0000 | [diff] [blame] | 914 | const int length = 2 + exif->length; |
| 915 | const uint8_t lengthH = ((length >> 8) & 0xff); |
| 916 | const uint8_t lengthL = (length & 0xff); |
| 917 | JPEGR_CHECK(Write(dest, &photos_editing_formats::image_io::JpegMarker::kStart, 1, pos)); |
| 918 | JPEGR_CHECK(Write(dest, &photos_editing_formats::image_io::JpegMarker::kAPP1, 1, pos)); |
| 919 | JPEGR_CHECK(Write(dest, &lengthH, 1, pos)); |
| 920 | JPEGR_CHECK(Write(dest, &lengthL, 1, pos)); |
| 921 | JPEGR_CHECK(Write(dest, exif->data, exif->length, pos)); |
| 922 | } |
| 923 | |
| 924 | // Prepare and write XMP |
| 925 | { |
| 926 | const string xmp = generateXmp(compressed_recovery_map->length, *metadata); |
| 927 | const string nameSpace = "http://ns.adobe.com/xap/1.0/\0"; |
| 928 | const int nameSpaceLength = nameSpace.size() + 1; // need to count the null terminator |
| 929 | // 2 bytes: representing the length of the package |
| 930 | // 29 bytes: length of name space "http://ns.adobe.com/xap/1.0/\0", |
| 931 | // x bytes: length of xmp packet |
Dichen Zhang | 25df9c8 | 2023-01-03 17:04:10 -0800 | [diff] [blame] | 932 | const int length = 2 + nameSpaceLength + xmp.size(); |
Dichen Zhang | d18bc30 | 2022-12-16 20:55:24 +0000 | [diff] [blame] | 933 | const uint8_t lengthH = ((length >> 8) & 0xff); |
| 934 | const uint8_t lengthL = (length & 0xff); |
| 935 | JPEGR_CHECK(Write(dest, &photos_editing_formats::image_io::JpegMarker::kStart, 1, pos)); |
| 936 | JPEGR_CHECK(Write(dest, &photos_editing_formats::image_io::JpegMarker::kAPP1, 1, pos)); |
| 937 | JPEGR_CHECK(Write(dest, &lengthH, 1, pos)); |
| 938 | JPEGR_CHECK(Write(dest, &lengthL, 1, pos)); |
| 939 | JPEGR_CHECK(Write(dest, (void*)nameSpace.c_str(), nameSpaceLength, pos)); |
| 940 | JPEGR_CHECK(Write(dest, (void*)xmp.c_str(), xmp.size(), pos)); |
| 941 | } |
| 942 | |
| 943 | // Write primary image |
Dichen Zhang | a876626 | 2022-11-07 23:48:24 +0000 | [diff] [blame] | 944 | JPEGR_CHECK(Write(dest, |
| 945 | (uint8_t*)compressed_jpeg_image->data + 2, compressed_jpeg_image->length - 2, pos)); |
Dichen Zhang | d18bc30 | 2022-12-16 20:55:24 +0000 | [diff] [blame] | 946 | |
| 947 | // Write secondary image |
Dichen Zhang | a876626 | 2022-11-07 23:48:24 +0000 | [diff] [blame] | 948 | JPEGR_CHECK(Write(dest, compressed_recovery_map->data, compressed_recovery_map->length, pos)); |
Dichen Zhang | d18bc30 | 2022-12-16 20:55:24 +0000 | [diff] [blame] | 949 | |
| 950 | // Set back length |
Dichen Zhang | a876626 | 2022-11-07 23:48:24 +0000 | [diff] [blame] | 951 | dest->length = pos; |
| 952 | |
Dichen Zhang | d18bc30 | 2022-12-16 20:55:24 +0000 | [diff] [blame] | 953 | // Done! |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 954 | return NO_ERROR; |
Dichen Zhang | 85b3756 | 2022-10-11 11:08:28 -0700 | [diff] [blame] | 955 | } |
| 956 | |
Dichen Zhang | c3437ca | 2023-01-04 14:00:08 -0800 | [diff] [blame] | 957 | status_t RecoveryMap::toneMap(jr_uncompressed_ptr src, |
Dichen Zhang | 636f524 | 2022-12-07 20:25:44 +0000 | [diff] [blame] | 958 | jr_uncompressed_ptr dest) { |
Dichen Zhang | c3437ca | 2023-01-04 14:00:08 -0800 | [diff] [blame] | 959 | if (src == nullptr || dest == nullptr) { |
Dichen Zhang | 636f524 | 2022-12-07 20:25:44 +0000 | [diff] [blame] | 960 | return ERROR_JPEGR_INVALID_NULL_PTR; |
| 961 | } |
| 962 | |
Dichen Zhang | c3437ca | 2023-01-04 14:00:08 -0800 | [diff] [blame] | 963 | dest->width = src->width; |
| 964 | dest->height = src->height; |
Dichen Zhang | 636f524 | 2022-12-07 20:25:44 +0000 | [diff] [blame] | 965 | |
Dichen Zhang | c3437ca | 2023-01-04 14:00:08 -0800 | [diff] [blame] | 966 | size_t pixel_count = src->width * src->height; |
| 967 | for (size_t y = 0; y < src->height; ++y) { |
| 968 | for (size_t x = 0; x < src->width; ++x) { |
| 969 | size_t pixel_y_idx = x + y * src->width; |
| 970 | size_t pixel_uv_idx = x / 2 + (y / 2) * (src->width / 2); |
| 971 | |
| 972 | uint16_t y_uint = reinterpret_cast<uint16_t*>(src->data)[pixel_y_idx] |
| 973 | >> 6; |
| 974 | uint16_t u_uint = reinterpret_cast<uint16_t*>(src->data)[pixel_count + pixel_uv_idx * 2] |
| 975 | >> 6; |
| 976 | uint16_t v_uint = reinterpret_cast<uint16_t*>(src->data)[pixel_count + pixel_uv_idx * 2 + 1] |
| 977 | >> 6; |
| 978 | |
| 979 | uint8_t* y = &reinterpret_cast<uint8_t*>(dest->data)[pixel_y_idx]; |
| 980 | uint8_t* u = &reinterpret_cast<uint8_t*>(dest->data)[pixel_count + pixel_uv_idx]; |
| 981 | uint8_t* v = &reinterpret_cast<uint8_t*>(dest->data)[pixel_count * 5 / 4 + pixel_uv_idx]; |
| 982 | |
| 983 | *y = static_cast<uint8_t>((y_uint >> 2) & 0xff); |
| 984 | *u = static_cast<uint8_t>((u_uint >> 2) & 0xff); |
| 985 | *v = static_cast<uint8_t>((v_uint >> 2) & 0xff); |
| 986 | } |
| 987 | } |
| 988 | |
| 989 | dest->colorGamut = src->colorGamut; |
Dichen Zhang | 636f524 | 2022-12-07 20:25:44 +0000 | [diff] [blame] | 990 | |
| 991 | return NO_ERROR; |
| 992 | } |
| 993 | |
Dichen Zhang | 85b3756 | 2022-10-11 11:08:28 -0700 | [diff] [blame] | 994 | } // namespace android::recoverymap |