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> |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 24 | #include <image_io/xml/xml_writer.h> |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 25 | #include <image_io/jpeg/jpeg_info.h> |
| 26 | #include <image_io/jpeg/jpeg_scanner.h> |
| 27 | #include <image_io/jpeg/jpeg_info_builder.h> |
| 28 | #include <image_io/base/data_segment_data_source.h> |
| 29 | #include <utils/Log.h> |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 30 | |
| 31 | #include <memory> |
Dichen Zhang | 72fd2b1 | 2022-11-01 06:11:50 +0000 | [diff] [blame] | 32 | #include <sstream> |
| 33 | #include <string> |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 34 | #include <cmath> |
Dichen Zhang | 72fd2b1 | 2022-11-01 06:11:50 +0000 | [diff] [blame] | 35 | |
| 36 | using namespace std; |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 37 | using namespace photos_editing_formats::image_io; |
Dichen Zhang | 85b3756 | 2022-10-11 11:08:28 -0700 | [diff] [blame] | 38 | |
| 39 | namespace android::recoverymap { |
| 40 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 41 | #define JPEGR_CHECK(x) \ |
| 42 | { \ |
| 43 | status_t status = (x); \ |
| 44 | if ((status) != NO_ERROR) { \ |
| 45 | return status; \ |
| 46 | } \ |
| 47 | } |
| 48 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 49 | // The current JPEGR version that we encode to |
| 50 | static const uint32_t kJpegrVersion = 1; |
| 51 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 52 | // Map is quarter res / sixteenth size |
| 53 | static const size_t kMapDimensionScaleFactor = 4; |
Dichen Zhang | 0b9f7de | 2022-11-18 06:52:46 +0000 | [diff] [blame] | 54 | // JPEG compress quality (0 ~ 100) for recovery map |
| 55 | static const int kMapCompressQuality = 85; |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 56 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 57 | // TODO: fill in st2086 metadata |
| 58 | static const st2086_metadata kSt2086Metadata = { |
| 59 | {0.0f, 0.0f}, |
| 60 | {0.0f, 0.0f}, |
| 61 | {0.0f, 0.0f}, |
| 62 | {0.0f, 0.0f}, |
| 63 | 0, |
| 64 | 1.0f, |
| 65 | }; |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 66 | |
Dichen Zhang | 72fd2b1 | 2022-11-01 06:11:50 +0000 | [diff] [blame] | 67 | /* |
| 68 | * Helper function used for generating XMP metadata. |
| 69 | * |
| 70 | * @param prefix The prefix part of the name. |
| 71 | * @param suffix The suffix part of the name. |
| 72 | * @return A name of the form "prefix:suffix". |
| 73 | */ |
| 74 | string Name(const string &prefix, const string &suffix) { |
| 75 | std::stringstream ss; |
| 76 | ss << prefix << ":" << suffix; |
| 77 | return ss.str(); |
| 78 | } |
| 79 | |
Dichen Zhang | a876626 | 2022-11-07 23:48:24 +0000 | [diff] [blame] | 80 | /* |
| 81 | * Helper function used for writing data to destination. |
| 82 | * |
| 83 | * @param destination destination of the data to be written. |
| 84 | * @param source source of data being written. |
| 85 | * @param length length of the data to be written. |
| 86 | * @param position cursor in desitination where the data is to be written. |
| 87 | * @return status of succeed or error code. |
| 88 | */ |
| 89 | status_t Write(jr_compressed_ptr destination, const void* source, size_t length, int &position) { |
Dichen Zhang | 0b9f7de | 2022-11-18 06:52:46 +0000 | [diff] [blame] | 90 | if (position + length > destination->maxLength) { |
Dichen Zhang | a876626 | 2022-11-07 23:48:24 +0000 | [diff] [blame] | 91 | return ERROR_JPEGR_BUFFER_TOO_SMALL; |
| 92 | } |
| 93 | |
| 94 | memcpy((uint8_t*)destination->data + sizeof(uint8_t) * position, source, length); |
| 95 | position += length; |
| 96 | return NO_ERROR; |
| 97 | } |
| 98 | |
Dichen Zhang | 636f524 | 2022-12-07 20:25:44 +0000 | [diff] [blame^] | 99 | /* Encode API-0 */ |
| 100 | status_t RecoveryMap::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image, |
| 101 | jpegr_transfer_function hdr_tf, |
| 102 | jr_compressed_ptr dest, |
| 103 | int quality, |
| 104 | jr_exif_ptr /* exif */) { |
| 105 | if (uncompressed_p010_image == nullptr || dest == nullptr) { |
| 106 | return ERROR_JPEGR_INVALID_NULL_PTR; |
| 107 | } |
| 108 | |
| 109 | if (quality < 0 || quality > 100) { |
| 110 | return ERROR_JPEGR_INVALID_INPUT_TYPE; |
| 111 | } |
| 112 | |
| 113 | jpegr_metadata metadata; |
| 114 | metadata.version = kJpegrVersion; |
| 115 | metadata.transferFunction = hdr_tf; |
| 116 | if (hdr_tf == JPEGR_TF_PQ) { |
| 117 | metadata.hdr10Metadata.st2086Metadata = kSt2086Metadata; |
| 118 | } |
| 119 | |
| 120 | jpegr_uncompressed_struct uncompressed_yuv_420_image; |
| 121 | JPEGR_CHECK(toneMap(uncompressed_p010_image, &uncompressed_yuv_420_image)); |
| 122 | |
| 123 | jpegr_uncompressed_struct map; |
| 124 | JPEGR_CHECK(generateRecoveryMap( |
| 125 | &uncompressed_yuv_420_image, uncompressed_p010_image, &metadata, &map)); |
| 126 | std::unique_ptr<uint8_t[]> map_data; |
| 127 | map_data.reset(reinterpret_cast<uint8_t*>(map.data)); |
| 128 | |
| 129 | jpegr_compressed_struct compressed_map; |
| 130 | compressed_map.maxLength = map.width * map.height; |
| 131 | unique_ptr<uint8_t[]> compressed_map_data = make_unique<uint8_t[]>(compressed_map.maxLength); |
| 132 | compressed_map.data = compressed_map_data.get(); |
| 133 | JPEGR_CHECK(compressRecoveryMap(&map, &compressed_map)); |
| 134 | |
| 135 | JpegEncoder jpeg_encoder; |
| 136 | // TODO: determine ICC data based on color gamut information |
| 137 | if (!jpeg_encoder.compressImage(uncompressed_yuv_420_image.data, |
| 138 | uncompressed_yuv_420_image.width, |
| 139 | uncompressed_yuv_420_image.height, quality, nullptr, 0)) { |
| 140 | return ERROR_JPEGR_ENCODE_ERROR; |
| 141 | } |
| 142 | jpegr_compressed_struct jpeg; |
| 143 | jpeg.data = jpeg_encoder.getCompressedImagePtr(); |
| 144 | jpeg.length = jpeg_encoder.getCompressedImageSize(); |
| 145 | |
| 146 | JPEGR_CHECK(appendRecoveryMap(&jpeg, &compressed_map, &metadata, dest)); |
| 147 | |
| 148 | return NO_ERROR; |
| 149 | } |
| 150 | |
| 151 | /* Encode API-1 */ |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 152 | status_t RecoveryMap::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image, |
| 153 | jr_uncompressed_ptr uncompressed_yuv_420_image, |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 154 | jpegr_transfer_function hdr_tf, |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 155 | jr_compressed_ptr dest, |
Dichen Zhang | ffa3401 | 2022-11-03 23:21:13 +0000 | [diff] [blame] | 156 | int quality, |
Dichen Zhang | 95cbb9f | 2022-11-07 18:32:05 +0000 | [diff] [blame] | 157 | jr_exif_ptr /* exif */) { |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 158 | if (uncompressed_p010_image == nullptr |
| 159 | || uncompressed_yuv_420_image == nullptr |
| 160 | || dest == nullptr) { |
Dichen Zhang | 80b7248 | 2022-11-02 01:55:35 +0000 | [diff] [blame] | 161 | return ERROR_JPEGR_INVALID_NULL_PTR; |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 162 | } |
| 163 | |
Dichen Zhang | ffa3401 | 2022-11-03 23:21:13 +0000 | [diff] [blame] | 164 | if (quality < 0 || quality > 100) { |
| 165 | return ERROR_JPEGR_INVALID_INPUT_TYPE; |
| 166 | } |
| 167 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 168 | if (uncompressed_p010_image->width != uncompressed_yuv_420_image->width |
| 169 | || uncompressed_p010_image->height != uncompressed_yuv_420_image->height) { |
| 170 | return ERROR_JPEGR_RESOLUTION_MISMATCH; |
| 171 | } |
| 172 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 173 | jpegr_metadata metadata; |
| 174 | metadata.version = kJpegrVersion; |
| 175 | metadata.transferFunction = hdr_tf; |
| 176 | if (hdr_tf == JPEGR_TF_PQ) { |
| 177 | metadata.hdr10Metadata.st2086Metadata = kSt2086Metadata; |
| 178 | } |
| 179 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 180 | jpegr_uncompressed_struct map; |
Dichen Zhang | a876626 | 2022-11-07 23:48:24 +0000 | [diff] [blame] | 181 | JPEGR_CHECK(generateRecoveryMap( |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 182 | uncompressed_yuv_420_image, uncompressed_p010_image, &metadata, &map)); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 183 | std::unique_ptr<uint8_t[]> map_data; |
| 184 | map_data.reset(reinterpret_cast<uint8_t*>(map.data)); |
| 185 | |
| 186 | jpegr_compressed_struct compressed_map; |
Dichen Zhang | 0b9f7de | 2022-11-18 06:52:46 +0000 | [diff] [blame] | 187 | compressed_map.maxLength = map.width * map.height; |
| 188 | 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] | 189 | compressed_map.data = compressed_map_data.get(); |
| 190 | JPEGR_CHECK(compressRecoveryMap(&map, &compressed_map)); |
| 191 | |
| 192 | JpegEncoder jpeg_encoder; |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 193 | // TODO: determine ICC data based on color gamut information |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 194 | if (!jpeg_encoder.compressImage(uncompressed_yuv_420_image->data, |
| 195 | uncompressed_yuv_420_image->width, |
Dichen Zhang | 95cbb9f | 2022-11-07 18:32:05 +0000 | [diff] [blame] | 196 | uncompressed_yuv_420_image->height, quality, nullptr, 0)) { |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 197 | return ERROR_JPEGR_ENCODE_ERROR; |
| 198 | } |
| 199 | jpegr_compressed_struct jpeg; |
| 200 | jpeg.data = jpeg_encoder.getCompressedImagePtr(); |
| 201 | jpeg.length = jpeg_encoder.getCompressedImageSize(); |
| 202 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 203 | JPEGR_CHECK(appendRecoveryMap(&jpeg, &compressed_map, &metadata, dest)); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 204 | |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 205 | return NO_ERROR; |
| 206 | } |
| 207 | |
Dichen Zhang | 636f524 | 2022-12-07 20:25:44 +0000 | [diff] [blame^] | 208 | /* Encode API-2 */ |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 209 | status_t RecoveryMap::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image, |
| 210 | jr_uncompressed_ptr uncompressed_yuv_420_image, |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 211 | jr_compressed_ptr compressed_jpeg_image, |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 212 | jpegr_transfer_function hdr_tf, |
Dichen Zhang | 95cbb9f | 2022-11-07 18:32:05 +0000 | [diff] [blame] | 213 | jr_compressed_ptr dest) { |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 214 | if (uncompressed_p010_image == nullptr |
| 215 | || uncompressed_yuv_420_image == nullptr |
| 216 | || compressed_jpeg_image == nullptr |
| 217 | || dest == nullptr) { |
Dichen Zhang | 80b7248 | 2022-11-02 01:55:35 +0000 | [diff] [blame] | 218 | return ERROR_JPEGR_INVALID_NULL_PTR; |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 219 | } |
| 220 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 221 | if (uncompressed_p010_image->width != uncompressed_yuv_420_image->width |
| 222 | || uncompressed_p010_image->height != uncompressed_yuv_420_image->height) { |
| 223 | return ERROR_JPEGR_RESOLUTION_MISMATCH; |
| 224 | } |
| 225 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 226 | jpegr_metadata metadata; |
| 227 | metadata.version = kJpegrVersion; |
| 228 | metadata.transferFunction = hdr_tf; |
| 229 | if (hdr_tf == JPEGR_TF_PQ) { |
| 230 | metadata.hdr10Metadata.st2086Metadata = kSt2086Metadata; |
| 231 | } |
| 232 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 233 | jpegr_uncompressed_struct map; |
Dichen Zhang | a876626 | 2022-11-07 23:48:24 +0000 | [diff] [blame] | 234 | JPEGR_CHECK(generateRecoveryMap( |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 235 | uncompressed_yuv_420_image, uncompressed_p010_image, &metadata, &map)); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 236 | std::unique_ptr<uint8_t[]> map_data; |
| 237 | map_data.reset(reinterpret_cast<uint8_t*>(map.data)); |
| 238 | |
| 239 | jpegr_compressed_struct compressed_map; |
Dichen Zhang | 0b9f7de | 2022-11-18 06:52:46 +0000 | [diff] [blame] | 240 | compressed_map.maxLength = map.width * map.height; |
| 241 | 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] | 242 | compressed_map.data = compressed_map_data.get(); |
| 243 | JPEGR_CHECK(compressRecoveryMap(&map, &compressed_map)); |
| 244 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 245 | JPEGR_CHECK(appendRecoveryMap(compressed_jpeg_image, &compressed_map, &metadata, dest)); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 246 | |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 247 | return NO_ERROR; |
| 248 | } |
| 249 | |
Dichen Zhang | 636f524 | 2022-12-07 20:25:44 +0000 | [diff] [blame^] | 250 | /* Encode API-3 */ |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 251 | status_t RecoveryMap::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image, |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 252 | jr_compressed_ptr compressed_jpeg_image, |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 253 | jpegr_transfer_function hdr_tf, |
Dichen Zhang | 95cbb9f | 2022-11-07 18:32:05 +0000 | [diff] [blame] | 254 | jr_compressed_ptr dest) { |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 255 | if (uncompressed_p010_image == nullptr |
| 256 | || compressed_jpeg_image == nullptr |
| 257 | || dest == nullptr) { |
Dichen Zhang | 80b7248 | 2022-11-02 01:55:35 +0000 | [diff] [blame] | 258 | return ERROR_JPEGR_INVALID_NULL_PTR; |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 259 | } |
| 260 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 261 | JpegDecoder jpeg_decoder; |
| 262 | if (!jpeg_decoder.decompressImage(compressed_jpeg_image->data, compressed_jpeg_image->length)) { |
| 263 | return ERROR_JPEGR_DECODE_ERROR; |
| 264 | } |
| 265 | jpegr_uncompressed_struct uncompressed_yuv_420_image; |
| 266 | uncompressed_yuv_420_image.data = jpeg_decoder.getDecompressedImagePtr(); |
| 267 | uncompressed_yuv_420_image.width = jpeg_decoder.getDecompressedImageWidth(); |
| 268 | uncompressed_yuv_420_image.height = jpeg_decoder.getDecompressedImageHeight(); |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 269 | uncompressed_yuv_420_image.colorGamut = compressed_jpeg_image->colorGamut; |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 270 | |
| 271 | if (uncompressed_p010_image->width != uncompressed_yuv_420_image.width |
| 272 | || uncompressed_p010_image->height != uncompressed_yuv_420_image.height) { |
| 273 | return ERROR_JPEGR_RESOLUTION_MISMATCH; |
| 274 | } |
| 275 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 276 | jpegr_metadata metadata; |
| 277 | metadata.version = kJpegrVersion; |
| 278 | metadata.transferFunction = hdr_tf; |
| 279 | if (hdr_tf == JPEGR_TF_PQ) { |
| 280 | metadata.hdr10Metadata.st2086Metadata = kSt2086Metadata; |
| 281 | } |
| 282 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 283 | jpegr_uncompressed_struct map; |
Dichen Zhang | a876626 | 2022-11-07 23:48:24 +0000 | [diff] [blame] | 284 | JPEGR_CHECK(generateRecoveryMap( |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 285 | &uncompressed_yuv_420_image, uncompressed_p010_image, &metadata, &map)); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 286 | std::unique_ptr<uint8_t[]> map_data; |
| 287 | map_data.reset(reinterpret_cast<uint8_t*>(map.data)); |
| 288 | |
| 289 | jpegr_compressed_struct compressed_map; |
Dichen Zhang | 0b9f7de | 2022-11-18 06:52:46 +0000 | [diff] [blame] | 290 | compressed_map.maxLength = map.width * map.height; |
| 291 | 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] | 292 | compressed_map.data = compressed_map_data.get(); |
| 293 | JPEGR_CHECK(compressRecoveryMap(&map, &compressed_map)); |
| 294 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 295 | JPEGR_CHECK(appendRecoveryMap(compressed_jpeg_image, &compressed_map, &metadata, dest)); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 296 | |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 297 | return NO_ERROR; |
| 298 | } |
| 299 | |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 300 | status_t RecoveryMap::getJPEGRInfo(jr_compressed_ptr compressed_jpegr_image, |
| 301 | jr_info_ptr jpegr_info) { |
| 302 | if (compressed_jpegr_image == nullptr || jpegr_info == nullptr) { |
| 303 | return ERROR_JPEGR_INVALID_NULL_PTR; |
| 304 | } |
| 305 | |
| 306 | jpegr_compressed_struct primary_image, recovery_map; |
| 307 | JPEGR_CHECK(extractPrimaryImageAndRecoveryMap(compressed_jpegr_image, |
| 308 | &primary_image, &recovery_map)); |
| 309 | |
| 310 | JpegDecoder jpeg_decoder; |
| 311 | if (!jpeg_decoder.getCompressedImageParameters(primary_image.data, primary_image.length, |
| 312 | &jpegr_info->width, &jpegr_info->height, |
| 313 | jpegr_info->iccData, jpegr_info->exifData)) { |
| 314 | return ERROR_JPEGR_DECODE_ERROR; |
| 315 | } |
| 316 | |
| 317 | return NO_ERROR; |
| 318 | } |
| 319 | |
Dichen Zhang | 636f524 | 2022-12-07 20:25:44 +0000 | [diff] [blame^] | 320 | /* Decode API */ |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 321 | status_t RecoveryMap::decodeJPEGR(jr_compressed_ptr compressed_jpegr_image, |
Dichen Zhang | ffa3401 | 2022-11-03 23:21:13 +0000 | [diff] [blame] | 322 | jr_uncompressed_ptr dest, |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 323 | jr_exif_ptr exif, |
| 324 | bool request_sdr) { |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 325 | if (compressed_jpegr_image == nullptr || dest == nullptr) { |
Dichen Zhang | 80b7248 | 2022-11-02 01:55:35 +0000 | [diff] [blame] | 326 | return ERROR_JPEGR_INVALID_NULL_PTR; |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 327 | } |
| 328 | |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 329 | // TODO: fill EXIF data |
| 330 | (void) exif; |
| 331 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 332 | jpegr_compressed_struct compressed_map; |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 333 | jpegr_metadata metadata; |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 334 | JPEGR_CHECK(extractRecoveryMap(compressed_jpegr_image, &compressed_map)); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 335 | |
| 336 | jpegr_uncompressed_struct map; |
| 337 | JPEGR_CHECK(decompressRecoveryMap(&compressed_map, &map)); |
| 338 | |
| 339 | JpegDecoder jpeg_decoder; |
| 340 | if (!jpeg_decoder.decompressImage(compressed_jpegr_image->data, compressed_jpegr_image->length)) { |
| 341 | return ERROR_JPEGR_DECODE_ERROR; |
| 342 | } |
| 343 | |
| 344 | jpegr_uncompressed_struct uncompressed_yuv_420_image; |
| 345 | uncompressed_yuv_420_image.data = jpeg_decoder.getDecompressedImagePtr(); |
| 346 | uncompressed_yuv_420_image.width = jpeg_decoder.getDecompressedImageWidth(); |
| 347 | uncompressed_yuv_420_image.height = jpeg_decoder.getDecompressedImageHeight(); |
| 348 | |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 349 | if (!getMetadataFromXMP(static_cast<uint8_t*>(jpeg_decoder.getXMPPtr()), |
| 350 | jpeg_decoder.getXMPSize(), &metadata)) { |
| 351 | return ERROR_JPEGR_DECODE_ERROR; |
| 352 | } |
| 353 | |
| 354 | if (request_sdr) { |
| 355 | memcpy(dest->data, uncompressed_yuv_420_image.data, |
| 356 | uncompressed_yuv_420_image.width*uncompressed_yuv_420_image.height *3 / 2); |
| 357 | dest->width = uncompressed_yuv_420_image.width; |
| 358 | dest->height = uncompressed_yuv_420_image.height; |
| 359 | } else { |
| 360 | JPEGR_CHECK(applyRecoveryMap(&uncompressed_yuv_420_image, &map, &metadata, dest)); |
| 361 | } |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 362 | |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 363 | return NO_ERROR; |
| 364 | } |
| 365 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 366 | status_t RecoveryMap::decompressRecoveryMap(jr_compressed_ptr compressed_recovery_map, |
| 367 | jr_uncompressed_ptr dest) { |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 368 | if (compressed_recovery_map == nullptr || dest == nullptr) { |
Dichen Zhang | 80b7248 | 2022-11-02 01:55:35 +0000 | [diff] [blame] | 369 | return ERROR_JPEGR_INVALID_NULL_PTR; |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 370 | } |
| 371 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 372 | JpegDecoder jpeg_decoder; |
| 373 | if (!jpeg_decoder.decompressImage(compressed_recovery_map->data, |
| 374 | compressed_recovery_map->length)) { |
| 375 | return ERROR_JPEGR_DECODE_ERROR; |
| 376 | } |
| 377 | |
| 378 | dest->data = jpeg_decoder.getDecompressedImagePtr(); |
| 379 | dest->width = jpeg_decoder.getDecompressedImageWidth(); |
| 380 | dest->height = jpeg_decoder.getDecompressedImageHeight(); |
| 381 | |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 382 | return NO_ERROR; |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 383 | } |
| 384 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 385 | status_t RecoveryMap::compressRecoveryMap(jr_uncompressed_ptr uncompressed_recovery_map, |
| 386 | jr_compressed_ptr dest) { |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 387 | if (uncompressed_recovery_map == nullptr || dest == nullptr) { |
Dichen Zhang | 80b7248 | 2022-11-02 01:55:35 +0000 | [diff] [blame] | 388 | return ERROR_JPEGR_INVALID_NULL_PTR; |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 389 | } |
| 390 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 391 | // TODO: should we have ICC data for the map? |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 392 | JpegEncoder jpeg_encoder; |
Dichen Zhang | 0b9f7de | 2022-11-18 06:52:46 +0000 | [diff] [blame] | 393 | if (!jpeg_encoder.compressImage(uncompressed_recovery_map->data, |
| 394 | uncompressed_recovery_map->width, |
| 395 | uncompressed_recovery_map->height, |
| 396 | kMapCompressQuality, |
| 397 | nullptr, |
| 398 | 0, |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 399 | true /* isSingleChannel */)) { |
| 400 | return ERROR_JPEGR_ENCODE_ERROR; |
| 401 | } |
| 402 | |
Dichen Zhang | 0b9f7de | 2022-11-18 06:52:46 +0000 | [diff] [blame] | 403 | if (dest->maxLength < jpeg_encoder.getCompressedImageSize()) { |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 404 | return ERROR_JPEGR_BUFFER_TOO_SMALL; |
| 405 | } |
| 406 | |
| 407 | memcpy(dest->data, jpeg_encoder.getCompressedImagePtr(), jpeg_encoder.getCompressedImageSize()); |
| 408 | dest->length = jpeg_encoder.getCompressedImageSize(); |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 409 | dest->colorGamut = JPEGR_COLORGAMUT_UNSPECIFIED; |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 410 | |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 411 | return NO_ERROR; |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 412 | } |
| 413 | |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 414 | status_t RecoveryMap::generateRecoveryMap(jr_uncompressed_ptr uncompressed_yuv_420_image, |
| 415 | jr_uncompressed_ptr uncompressed_p010_image, |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 416 | jr_metadata_ptr metadata, |
| 417 | jr_uncompressed_ptr dest) { |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 418 | if (uncompressed_yuv_420_image == nullptr |
| 419 | || uncompressed_p010_image == nullptr |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 420 | || metadata == nullptr |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 421 | || dest == nullptr) { |
Dichen Zhang | 80b7248 | 2022-11-02 01:55:35 +0000 | [diff] [blame] | 422 | return ERROR_JPEGR_INVALID_NULL_PTR; |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 423 | } |
| 424 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 425 | if (uncompressed_yuv_420_image->width != uncompressed_p010_image->width |
| 426 | || uncompressed_yuv_420_image->height != uncompressed_p010_image->height) { |
| 427 | return ERROR_JPEGR_RESOLUTION_MISMATCH; |
| 428 | } |
| 429 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 430 | if (uncompressed_yuv_420_image->colorGamut == JPEGR_COLORGAMUT_UNSPECIFIED |
| 431 | || uncompressed_p010_image->colorGamut == JPEGR_COLORGAMUT_UNSPECIFIED) { |
| 432 | return ERROR_JPEGR_INVALID_COLORGAMUT; |
| 433 | } |
| 434 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 435 | size_t image_width = uncompressed_yuv_420_image->width; |
| 436 | size_t image_height = uncompressed_yuv_420_image->height; |
| 437 | size_t map_width = image_width / kMapDimensionScaleFactor; |
| 438 | size_t map_height = image_height / kMapDimensionScaleFactor; |
| 439 | |
| 440 | dest->width = map_width; |
| 441 | dest->height = map_height; |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 442 | dest->colorGamut = JPEGR_COLORGAMUT_UNSPECIFIED; |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 443 | dest->data = new uint8_t[map_width * map_height]; |
| 444 | std::unique_ptr<uint8_t[]> map_data; |
| 445 | map_data.reset(reinterpret_cast<uint8_t*>(dest->data)); |
| 446 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 447 | ColorTransformFn hdrInvOetf = nullptr; |
| 448 | switch (metadata->transferFunction) { |
| 449 | case JPEGR_TF_HLG: |
| 450 | hdrInvOetf = hlgInvOetf; |
| 451 | break; |
| 452 | case JPEGR_TF_PQ: |
| 453 | hdrInvOetf = pqInvOetf; |
| 454 | break; |
| 455 | } |
| 456 | |
| 457 | ColorTransformFn hdrGamutConversionFn = getHdrConversionFn( |
| 458 | uncompressed_yuv_420_image->colorGamut, uncompressed_p010_image->colorGamut); |
| 459 | |
| 460 | ColorCalculationFn luminanceFn = nullptr; |
| 461 | switch (uncompressed_yuv_420_image->colorGamut) { |
| 462 | case JPEGR_COLORGAMUT_BT709: |
| 463 | luminanceFn = srgbLuminance; |
| 464 | break; |
| 465 | case JPEGR_COLORGAMUT_P3: |
| 466 | luminanceFn = p3Luminance; |
| 467 | break; |
| 468 | case JPEGR_COLORGAMUT_BT2100: |
| 469 | luminanceFn = bt2100Luminance; |
| 470 | break; |
| 471 | case JPEGR_COLORGAMUT_UNSPECIFIED: |
| 472 | // Should be impossible to hit after input validation. |
| 473 | return ERROR_JPEGR_INVALID_COLORGAMUT; |
| 474 | } |
| 475 | |
Nick Deakin | 594a4ca | 2022-11-16 20:57:42 -0500 | [diff] [blame] | 476 | float hdr_y_nits_max = 0.0f; |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 477 | double hdr_y_nits_avg = 0.0f; |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 478 | for (size_t y = 0; y < image_height; ++y) { |
| 479 | for (size_t x = 0; x < image_width; ++x) { |
Nick Deakin | 594a4ca | 2022-11-16 20:57:42 -0500 | [diff] [blame] | 480 | Color hdr_yuv_gamma = getP010Pixel(uncompressed_p010_image, x, y); |
| 481 | Color hdr_rgb_gamma = bt2100YuvToRgb(hdr_yuv_gamma); |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 482 | Color hdr_rgb = hdrInvOetf(hdr_rgb_gamma); |
| 483 | hdr_rgb = hdrGamutConversionFn(hdr_rgb); |
| 484 | float hdr_y_nits = luminanceFn(hdr_rgb); |
Nick Deakin | 594a4ca | 2022-11-16 20:57:42 -0500 | [diff] [blame] | 485 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 486 | hdr_y_nits_avg += hdr_y_nits; |
Nick Deakin | 594a4ca | 2022-11-16 20:57:42 -0500 | [diff] [blame] | 487 | if (hdr_y_nits > hdr_y_nits_max) { |
| 488 | hdr_y_nits_max = hdr_y_nits; |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 489 | } |
| 490 | } |
| 491 | } |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 492 | hdr_y_nits_avg /= image_width * image_height; |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 493 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 494 | metadata->rangeScalingFactor = hdr_y_nits_max / kSdrWhiteNits; |
| 495 | if (metadata->transferFunction == JPEGR_TF_PQ) { |
| 496 | metadata->hdr10Metadata.maxFALL = hdr_y_nits_avg; |
| 497 | metadata->hdr10Metadata.maxCLL = hdr_y_nits_max; |
| 498 | } |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 499 | |
| 500 | for (size_t y = 0; y < map_height; ++y) { |
| 501 | for (size_t x = 0; x < map_width; ++x) { |
Nick Deakin | 594a4ca | 2022-11-16 20:57:42 -0500 | [diff] [blame] | 502 | Color sdr_yuv_gamma = sampleYuv420(uncompressed_yuv_420_image, |
| 503 | kMapDimensionScaleFactor, x, y); |
| 504 | Color sdr_rgb_gamma = srgbYuvToRgb(sdr_yuv_gamma); |
| 505 | Color sdr_rgb = srgbInvOetf(sdr_rgb_gamma); |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 506 | float sdr_y_nits = luminanceFn(sdr_rgb); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 507 | |
Nick Deakin | 594a4ca | 2022-11-16 20:57:42 -0500 | [diff] [blame] | 508 | Color hdr_yuv_gamma = sampleP010(uncompressed_p010_image, kMapDimensionScaleFactor, x, y); |
| 509 | Color hdr_rgb_gamma = bt2100YuvToRgb(hdr_yuv_gamma); |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 510 | Color hdr_rgb = hdrInvOetf(hdr_rgb_gamma); |
| 511 | hdr_rgb = hdrGamutConversionFn(hdr_rgb); |
| 512 | float hdr_y_nits = luminanceFn(hdr_rgb); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 513 | |
| 514 | size_t pixel_idx = x + y * map_width; |
| 515 | reinterpret_cast<uint8_t*>(dest->data)[pixel_idx] = |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 516 | encodeRecovery(sdr_y_nits, hdr_y_nits, metadata->rangeScalingFactor); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 517 | } |
| 518 | } |
| 519 | |
| 520 | map_data.release(); |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 521 | return NO_ERROR; |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 522 | } |
| 523 | |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 524 | status_t RecoveryMap::applyRecoveryMap(jr_uncompressed_ptr uncompressed_yuv_420_image, |
| 525 | jr_uncompressed_ptr uncompressed_recovery_map, |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 526 | jr_metadata_ptr metadata, |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 527 | jr_uncompressed_ptr dest) { |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 528 | if (uncompressed_yuv_420_image == nullptr |
| 529 | || uncompressed_recovery_map == nullptr |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 530 | || metadata == nullptr |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 531 | || dest == nullptr) { |
Dichen Zhang | 80b7248 | 2022-11-02 01:55:35 +0000 | [diff] [blame] | 532 | return ERROR_JPEGR_INVALID_NULL_PTR; |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 533 | } |
| 534 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 535 | size_t width = uncompressed_yuv_420_image->width; |
| 536 | size_t height = uncompressed_yuv_420_image->height; |
| 537 | |
| 538 | dest->width = width; |
| 539 | dest->height = height; |
| 540 | size_t pixel_count = width * height; |
| 541 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 542 | ColorTransformFn hdrOetf = nullptr; |
| 543 | switch (metadata->transferFunction) { |
| 544 | case JPEGR_TF_HLG: |
| 545 | hdrOetf = hlgOetf; |
| 546 | break; |
| 547 | case JPEGR_TF_PQ: |
| 548 | hdrOetf = pqOetf; |
| 549 | break; |
| 550 | } |
| 551 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 552 | for (size_t y = 0; y < height; ++y) { |
| 553 | for (size_t x = 0; x < width; ++x) { |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 554 | Color yuv_gamma_sdr = getYuv420Pixel(uncompressed_yuv_420_image, x, y); |
| 555 | Color rgb_gamma_sdr = srgbYuvToRgb(yuv_gamma_sdr); |
| 556 | Color rgb_sdr = srgbInvOetf(rgb_gamma_sdr); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 557 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 558 | // TODO: determine map scaling factor based on actual map dims |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 559 | float recovery = sampleMap(uncompressed_recovery_map, kMapDimensionScaleFactor, x, y); |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 560 | Color rgb_hdr = applyRecovery(rgb_sdr, recovery, metadata->rangeScalingFactor); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 561 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 562 | Color rgb_gamma_hdr = hdrOetf(rgb_hdr); |
| 563 | uint32_t rgba1010102 = colorToRgba1010102(rgb_gamma_hdr); |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 564 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 565 | size_t pixel_idx = x + y * width; |
| 566 | reinterpret_cast<uint32_t*>(dest->data)[pixel_idx] = rgba1010102; |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 567 | } |
| 568 | } |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 569 | return NO_ERROR; |
| 570 | } |
| 571 | |
| 572 | status_t RecoveryMap::extractPrimaryImageAndRecoveryMap(jr_compressed_ptr compressed_jpegr_image, |
| 573 | jr_compressed_ptr primary_image, |
| 574 | jr_compressed_ptr recovery_map) { |
| 575 | if (compressed_jpegr_image == nullptr) { |
| 576 | return ERROR_JPEGR_INVALID_NULL_PTR; |
| 577 | } |
| 578 | |
| 579 | MessageHandler msg_handler; |
| 580 | std::shared_ptr<DataSegment> seg = |
| 581 | DataSegment::Create(DataRange(0, compressed_jpegr_image->length), |
| 582 | static_cast<const uint8_t*>(compressed_jpegr_image->data), |
| 583 | DataSegment::BufferDispositionPolicy::kDontDelete); |
| 584 | DataSegmentDataSource data_source(seg); |
| 585 | JpegInfoBuilder jpeg_info_builder; |
| 586 | jpeg_info_builder.SetImageLimit(2); |
| 587 | JpegScanner jpeg_scanner(&msg_handler); |
| 588 | jpeg_scanner.Run(&data_source, &jpeg_info_builder); |
| 589 | data_source.Reset(); |
| 590 | |
| 591 | if (jpeg_scanner.HasError()) { |
| 592 | return ERROR_JPEGR_INVALID_INPUT_TYPE; |
| 593 | } |
| 594 | |
| 595 | const auto& jpeg_info = jpeg_info_builder.GetInfo(); |
| 596 | const auto& image_ranges = jpeg_info.GetImageRanges(); |
| 597 | if (image_ranges.empty()) { |
| 598 | return ERROR_JPEGR_INVALID_INPUT_TYPE; |
| 599 | } |
| 600 | |
| 601 | if (image_ranges.size() != 2) { |
| 602 | // Must be 2 JPEG Images |
| 603 | return ERROR_JPEGR_INVALID_INPUT_TYPE; |
| 604 | } |
| 605 | |
| 606 | if (primary_image != nullptr) { |
| 607 | primary_image->data = static_cast<uint8_t*>(compressed_jpegr_image->data) + |
| 608 | image_ranges[0].GetBegin(); |
| 609 | primary_image->length = image_ranges[0].GetLength(); |
| 610 | } |
| 611 | |
| 612 | if (recovery_map != nullptr) { |
| 613 | recovery_map->data = static_cast<uint8_t*>(compressed_jpegr_image->data) + |
| 614 | image_ranges[1].GetBegin(); |
| 615 | recovery_map->length = image_ranges[1].GetLength(); |
| 616 | } |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 617 | |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 618 | return NO_ERROR; |
Dichen Zhang | 596a756 | 2022-10-12 14:57:05 -0700 | [diff] [blame] | 619 | } |
| 620 | |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 621 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 622 | status_t RecoveryMap::extractRecoveryMap(jr_compressed_ptr compressed_jpegr_image, |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 623 | jr_compressed_ptr dest) { |
| 624 | if (compressed_jpegr_image == nullptr || dest == nullptr) { |
Dichen Zhang | 80b7248 | 2022-11-02 01:55:35 +0000 | [diff] [blame] | 625 | return ERROR_JPEGR_INVALID_NULL_PTR; |
Dichen Zhang | 85b3756 | 2022-10-11 11:08:28 -0700 | [diff] [blame] | 626 | } |
| 627 | |
Fyodor Kyslov | 1dcc442 | 2022-11-16 01:40:53 +0000 | [diff] [blame] | 628 | return extractPrimaryImageAndRecoveryMap(compressed_jpegr_image, nullptr, dest); |
Dichen Zhang | 85b3756 | 2022-10-11 11:08:28 -0700 | [diff] [blame] | 629 | } |
| 630 | |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 631 | status_t RecoveryMap::appendRecoveryMap(jr_compressed_ptr compressed_jpeg_image, |
| 632 | jr_compressed_ptr compressed_recovery_map, |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 633 | jr_metadata_ptr metadata, |
Nick Deakin | f6bca5a | 2022-11-04 10:43:43 -0400 | [diff] [blame] | 634 | jr_compressed_ptr dest) { |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 635 | if (compressed_jpeg_image == nullptr |
| 636 | || compressed_recovery_map == nullptr |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 637 | || metadata == nullptr |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 638 | || dest == nullptr) { |
Dichen Zhang | 80b7248 | 2022-11-02 01:55:35 +0000 | [diff] [blame] | 639 | return ERROR_JPEGR_INVALID_NULL_PTR; |
Dichen Zhang | 85b3756 | 2022-10-11 11:08:28 -0700 | [diff] [blame] | 640 | } |
| 641 | |
Dichen Zhang | fbb687a | 2022-11-22 00:57:00 +0000 | [diff] [blame] | 642 | const string xmp = generateXmp(compressed_recovery_map->length, *metadata); |
| 643 | const string nameSpace = "http://ns.adobe.com/xap/1.0/\0"; |
| 644 | const int nameSpaceLength = nameSpace.size() + 1; // need to count the null terminator |
Dichen Zhang | a876626 | 2022-11-07 23:48:24 +0000 | [diff] [blame] | 645 | |
| 646 | // 2 bytes: APP1 sign (ff e1) |
Dichen Zhang | fbb687a | 2022-11-22 00:57:00 +0000 | [diff] [blame] | 647 | // 29 bytes: length of name space "http://ns.adobe.com/xap/1.0/\0", |
Dichen Zhang | a876626 | 2022-11-07 23:48:24 +0000 | [diff] [blame] | 648 | // x bytes: length of xmp packet |
Dichen Zhang | fbb687a | 2022-11-22 00:57:00 +0000 | [diff] [blame] | 649 | |
| 650 | const int length = 3 + nameSpaceLength + xmp.size(); |
| 651 | const uint8_t lengthH = ((length >> 8) & 0xff); |
| 652 | const uint8_t lengthL = (length & 0xff); |
Dichen Zhang | a876626 | 2022-11-07 23:48:24 +0000 | [diff] [blame] | 653 | |
| 654 | int pos = 0; |
| 655 | |
| 656 | // JPEG/R structure: |
| 657 | // SOI (ff d8) |
| 658 | // APP1 (ff e1) |
| 659 | // 2 bytes of length (2 + 29 + length of xmp packet) |
| 660 | // name space ("http://ns.adobe.com/xap/1.0/\0") |
| 661 | // xmp |
| 662 | // primary image (without the first two bytes, the SOI sign) |
| 663 | // secondary image (the recovery map) |
| 664 | JPEGR_CHECK(Write(dest, &photos_editing_formats::image_io::JpegMarker::kStart, 1, pos)); |
| 665 | JPEGR_CHECK(Write(dest, &photos_editing_formats::image_io::JpegMarker::kSOI, 1, pos)); |
| 666 | JPEGR_CHECK(Write(dest, &photos_editing_formats::image_io::JpegMarker::kStart, 1, pos)); |
| 667 | JPEGR_CHECK(Write(dest, &photos_editing_formats::image_io::JpegMarker::kAPP1, 1, pos)); |
| 668 | JPEGR_CHECK(Write(dest, &lengthH, 1, pos)); |
| 669 | JPEGR_CHECK(Write(dest, &lengthL, 1, pos)); |
Dichen Zhang | fbb687a | 2022-11-22 00:57:00 +0000 | [diff] [blame] | 670 | JPEGR_CHECK(Write(dest, (void*)nameSpace.c_str(), nameSpaceLength, pos)); |
Dichen Zhang | a876626 | 2022-11-07 23:48:24 +0000 | [diff] [blame] | 671 | JPEGR_CHECK(Write(dest, (void*)xmp.c_str(), xmp.size(), pos)); |
| 672 | JPEGR_CHECK(Write(dest, |
| 673 | (uint8_t*)compressed_jpeg_image->data + 2, compressed_jpeg_image->length - 2, pos)); |
| 674 | JPEGR_CHECK(Write(dest, compressed_recovery_map->data, compressed_recovery_map->length, pos)); |
| 675 | dest->length = pos; |
| 676 | |
Dichen Zhang | 6947d53 | 2022-10-22 02:16:21 +0000 | [diff] [blame] | 677 | return NO_ERROR; |
Dichen Zhang | 85b3756 | 2022-10-11 11:08:28 -0700 | [diff] [blame] | 678 | } |
| 679 | |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 680 | string RecoveryMap::generateXmp(int secondary_image_length, jpegr_metadata& metadata) { |
Dichen Zhang | 72fd2b1 | 2022-11-01 06:11:50 +0000 | [diff] [blame] | 681 | const string kContainerPrefix = "GContainer"; |
| 682 | const string kContainerUri = "http://ns.google.com/photos/1.0/container/"; |
| 683 | const string kItemPrefix = "Item"; |
| 684 | const string kRecoveryMap = "RecoveryMap"; |
| 685 | const string kDirectory = "Directory"; |
| 686 | const string kImageJpeg = "image/jpeg"; |
| 687 | const string kItem = "Item"; |
| 688 | const string kLength = "Length"; |
| 689 | const string kMime = "Mime"; |
| 690 | const string kPrimary = "Primary"; |
| 691 | const string kSemantic = "Semantic"; |
| 692 | const string kVersion = "Version"; |
Dichen Zhang | 72fd2b1 | 2022-11-01 06:11:50 +0000 | [diff] [blame] | 693 | |
| 694 | const string kConDir = Name(kContainerPrefix, kDirectory); |
| 695 | const string kContainerItem = Name(kContainerPrefix, kItem); |
| 696 | const string kItemLength = Name(kItemPrefix, kLength); |
| 697 | const string kItemMime = Name(kItemPrefix, kMime); |
| 698 | const string kItemSemantic = Name(kItemPrefix, kSemantic); |
| 699 | |
| 700 | const vector<string> kConDirSeq({kConDir, string("rdf:Seq")}); |
| 701 | const vector<string> kLiItem({string("rdf:li"), kContainerItem}); |
| 702 | |
| 703 | std::stringstream ss; |
| 704 | photos_editing_formats::image_io::XmlWriter writer(ss); |
| 705 | writer.StartWritingElement("x:xmpmeta"); |
| 706 | writer.WriteXmlns("x", "adobe:ns:meta/"); |
| 707 | writer.WriteAttributeNameAndValue("x:xmptk", "Adobe XMP Core 5.1.2"); |
| 708 | writer.StartWritingElement("rdf:RDF"); |
| 709 | writer.WriteXmlns("rdf", "http://www.w3.org/1999/02/22-rdf-syntax-ns#"); |
| 710 | writer.StartWritingElement("rdf:Description"); |
| 711 | writer.WriteXmlns(kContainerPrefix, kContainerUri); |
Nick Deakin | 6bd9043 | 2022-11-20 16:26:37 -0500 | [diff] [blame] | 712 | writer.WriteElementAndContent(Name(kContainerPrefix, kVersion), metadata.version); |
| 713 | writer.WriteElementAndContent(Name(kContainerPrefix, "rangeScalingFactor"), |
| 714 | metadata.rangeScalingFactor); |
| 715 | // TODO: determine structure for hdr10 metadata |
| 716 | // TODO: write rest of metadata |
Dichen Zhang | 72fd2b1 | 2022-11-01 06:11:50 +0000 | [diff] [blame] | 717 | writer.StartWritingElements(kConDirSeq); |
| 718 | size_t item_depth = writer.StartWritingElements(kLiItem); |
| 719 | writer.WriteAttributeNameAndValue(kItemSemantic, kPrimary); |
| 720 | writer.WriteAttributeNameAndValue(kItemMime, kImageJpeg); |
| 721 | writer.FinishWritingElementsToDepth(item_depth); |
| 722 | writer.StartWritingElements(kLiItem); |
| 723 | writer.WriteAttributeNameAndValue(kItemSemantic, kRecoveryMap); |
| 724 | writer.WriteAttributeNameAndValue(kItemMime, kImageJpeg); |
| 725 | writer.WriteAttributeNameAndValue(kItemLength, secondary_image_length); |
| 726 | writer.FinishWriting(); |
| 727 | |
| 728 | return ss.str(); |
| 729 | } |
| 730 | |
Dichen Zhang | 636f524 | 2022-12-07 20:25:44 +0000 | [diff] [blame^] | 731 | status_t RecoveryMap::toneMap(jr_uncompressed_ptr uncompressed_p010_image, |
| 732 | jr_uncompressed_ptr dest) { |
| 733 | if (uncompressed_p010_image == nullptr || dest == nullptr) { |
| 734 | return ERROR_JPEGR_INVALID_NULL_PTR; |
| 735 | } |
| 736 | |
| 737 | dest->width = uncompressed_p010_image->width; |
| 738 | dest->height = uncompressed_p010_image->height; |
| 739 | unique_ptr<uint8_t[]> dest_data = make_unique<uint8_t[]>(dest->width * dest->height * 3 / 2); |
| 740 | dest->data = dest_data.get(); |
| 741 | |
| 742 | // TODO: Tone map algorighm here. |
| 743 | |
| 744 | return NO_ERROR; |
| 745 | } |
| 746 | |
Dichen Zhang | 85b3756 | 2022-10-11 11:08:28 -0700 | [diff] [blame] | 747 | } // namespace android::recoverymap |