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