commit 06edce0c78db2334305d678c8e5dccf4e0af4137
author Dichen Zhang <dichenzhang@google.com> Fri Feb 10 23:07:15 2023 +0000
committer Dichen Zhang <dichenzhang@google.com> Fri Feb 10 23:07:15 2023 +0000
tree 115fd532c034f268dbbf35bdfa89cf86f09983b5
parent 809ed0800393e57904f6b062e9ea9f101a51d03b

jpegr refactor: rename namespace

Bug: 264715926
Test: build
Change-Id: Ia9b55e94cda161588c4d86be30ac281ff6d865ae

services/camera/libcameraservice/api2/JpegRCompositeStream.cpp

diff --git a/services/camera/libcameraservice/api2/JpegRCompositeStream.cpp b/services/camera/libcameraservice/api2/JpegRCompositeStream.cpp
index 911b654..71f52db 100644
--- a/services/camera/libcameraservice/api2/JpegRCompositeStream.cpp
+++ b/services/camera/libcameraservice/api2/JpegRCompositeStream.cpp
@@ -285,13 +285,13 @@
     }
 
     size_t actualJpegRSize = 0;
-    recoverymap::jpegr_uncompressed_struct p010;
-    recoverymap::jpegr_compressed_struct jpegR;
-    recoverymap::JpegR jpegREncoder;
+    jpegrecoverymap::jpegr_uncompressed_struct p010;
+    jpegrecoverymap::jpegr_compressed_struct jpegR;
+    jpegrecoverymap::JpegR jpegREncoder;
 
     p010.height = inputFrame.p010Buffer.height;
     p010.width = inputFrame.p010Buffer.width;
-    p010.colorGamut = recoverymap::jpegr_color_gamut::JPEGR_COLORGAMUT_BT2100;
+    p010.colorGamut = jpegrecoverymap::jpegr_color_gamut::JPEGR_COLORGAMUT_BT2100;
     size_t yChannelSizeInByte = p010.width * p010.height * 2;
     size_t uvChannelSizeInByte = p010.width * p010.height;
     p010.data = new uint8_t[yChannelSizeInByte + uvChannelSizeInByte];
@@ -304,18 +304,18 @@
     jpegR.data = dstBuffer;
     jpegR.maxLength = maxJpegRBufferSize;
 
-    recoverymap::jpegr_transfer_function transferFunction;
+    jpegrecoverymap::jpegr_transfer_function transferFunction;
     switch (mP010DynamicRange) {
         case ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_HDR10:
         case ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_HDR10_PLUS:
-            transferFunction = recoverymap::jpegr_transfer_function::JPEGR_TF_PQ;
+            transferFunction = jpegrecoverymap::jpegr_transfer_function::JPEGR_TF_PQ;
             break;
         default:
-            transferFunction = recoverymap::jpegr_transfer_function::JPEGR_TF_HLG;
+            transferFunction = jpegrecoverymap::jpegr_transfer_function::JPEGR_TF_HLG;
     }
 
     if (mSupportInternalJpeg) {
-        recoverymap::jpegr_compressed_struct jpeg;
+        jpegrecoverymap::jpegr_compressed_struct jpeg;
 
         jpeg.data = inputFrame.jpegBuffer.data;
         jpeg.length = android::camera2::JpegProcessor::findJpegSize(inputFrame.jpegBuffer.data,
@@ -327,9 +327,9 @@
         }
 
         if (mOutputColorSpace == ANDROID_REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_DISPLAY_P3) {
-            jpeg.colorGamut = recoverymap::jpegr_color_gamut::JPEGR_COLORGAMUT_P3;
+            jpeg.colorGamut = jpegrecoverymap::jpegr_color_gamut::JPEGR_COLORGAMUT_P3;
         } else {
-            jpeg.colorGamut = recoverymap::jpegr_color_gamut::JPEGR_COLORGAMUT_BT709;
+            jpeg.colorGamut = jpegrecoverymap::jpegr_color_gamut::JPEGR_COLORGAMUT_BT709;
         }
 
         res = jpegREncoder.encodeJPEGR(&p010, &jpeg, transferFunction, &jpegR);
@@ -347,7 +347,7 @@
             ALOGE("%s: Unable to generate App1 buffer", __FUNCTION__);
         }
 
-        recoverymap::jpegr_exif_struct exif;
+        jpegrecoverymap::jpegr_exif_struct exif;
         exif.data = reinterpret_cast<void*>(const_cast<uint8_t*>(exifBuffer));
         exif.length = exifBufferSize;