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