commit 95cbb9fb54bfd588c73e8fb68e724cdeb285405f
author Dichen Zhang <dichenzhang@google.com> Mon Nov 07 18:32:05 2022 +0000
committer Dichen Zhang <dichenzhang@google.com> Mon Nov 07 18:33:45 2022 +0000
tree 2e06349dbc8add6006dc2b18ea162674db8a97c9
parent 28fc04d650598220e44a603070605a1fd2eb705e

libjpegrecoverymap: refactor encode APIs

1. remove hdr_ratio as an input parameter
2. pass quality into encoder

Bug: b/252835416
Test: build

Change-Id: If877e153f786e9b7daeacb7a65ab1296455faf67

libs/jpegrecoverymap/recoverymap.cpp

diff --git a/libs/jpegrecoverymap/recoverymap.cpp b/libs/jpegrecoverymap/recoverymap.cpp
index 4a90053..d46025c 100644
--- a/libs/jpegrecoverymap/recoverymap.cpp
+++ b/libs/jpegrecoverymap/recoverymap.cpp
@@ -64,8 +64,7 @@
                                   jr_uncompressed_ptr uncompressed_yuv_420_image,
                                   jr_compressed_ptr dest,
                                   int quality,
-                                  jr_exif_ptr /* exif */,
-                                  float /* hdr_ratio */) {
+                                  jr_exif_ptr /* exif */) {
   if (uncompressed_p010_image == nullptr
    || uncompressed_yuv_420_image == nullptr
    || dest == nullptr) {
@@ -93,11 +92,10 @@
   JPEGR_CHECK(compressRecoveryMap(&map, &compressed_map));
 
   JpegEncoder jpeg_encoder;
-  // TODO: what quality to use?
   // TODO: ICC data - need color space information
   if (!jpeg_encoder.compressImage(uncompressed_yuv_420_image->data,
                                   uncompressed_yuv_420_image->width,
-                                  uncompressed_yuv_420_image->height, 95, nullptr, 0)) {
+                                  uncompressed_yuv_420_image->height, quality, nullptr, 0)) {
     return ERROR_JPEGR_ENCODE_ERROR;
   }
   jpegr_compressed_struct jpeg;
@@ -112,8 +110,7 @@
 status_t RecoveryMap::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image,
                                   jr_uncompressed_ptr uncompressed_yuv_420_image,
                                   jr_compressed_ptr compressed_jpeg_image,
-                                  jr_compressed_ptr dest,
-                                  float /* hdr_ratio */) {
+                                  jr_compressed_ptr dest) {
   if (uncompressed_p010_image == nullptr
    || uncompressed_yuv_420_image == nullptr
    || compressed_jpeg_image == nullptr
@@ -144,8 +141,7 @@
 
 status_t RecoveryMap::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image,
                                   jr_compressed_ptr compressed_jpeg_image,
-                                  jr_compressed_ptr dest,
-                                  float /* hdr_ratio */) {
+                                  jr_compressed_ptr dest) {
   if (uncompressed_p010_image == nullptr
    || compressed_jpeg_image == nullptr
    || dest == nullptr) {