summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dichen Zhang <dichenzhang@google.com> 2023-02-10 23:05:04 +0000
committer Dichen Zhang <dichenzhang@google.com> 2023-02-14 06:09:15 +0000
commitb2ed830b7ab522f06d34a0fde93094b9648a7166 (patch)
treef7e64b5c55e56f94e582f1dd8f6a6db397c6d6d2
parent5e5454fbb04ee986f81cc2afe78545e8234c2fc6 (diff)
jpegr refactor: rename namespace
Bug: 264715926 Test: build Change-Id: Ie60ae4f9362de50fe7d7d93790922333bc26a238
-rw-r--r--libs/jpegrecoverymap/include/jpegrecoverymap/jpegdecoderhelper.h4
-rw-r--r--libs/jpegrecoverymap/include/jpegrecoverymap/jpegencoderhelper.h4
-rw-r--r--libs/jpegrecoverymap/include/jpegrecoverymap/jpegr.h4
-rw-r--r--libs/jpegrecoverymap/include/jpegrecoverymap/jpegrerrorcode.h4
-rw-r--r--libs/jpegrecoverymap/include/jpegrecoverymap/jpegrutils.h4
-rw-r--r--libs/jpegrecoverymap/include/jpegrecoverymap/recoverymapmath.h4
-rw-r--r--libs/jpegrecoverymap/jpegdecoderhelper.cpp4
-rw-r--r--libs/jpegrecoverymap/jpegencoderhelper.cpp4
-rw-r--r--libs/jpegrecoverymap/jpegr.cpp9
-rw-r--r--libs/jpegrecoverymap/jpegrutils.cpp4
-rw-r--r--libs/jpegrecoverymap/recoverymapmath.cpp4
-rw-r--r--libs/jpegrecoverymap/tests/jpegdecoderhelper_test.cpp4
-rw-r--r--libs/jpegrecoverymap/tests/jpegencoderhelper_test.cpp4
-rw-r--r--libs/jpegrecoverymap/tests/jpegr_test.cpp2
-rw-r--r--libs/jpegrecoverymap/tests/recoverymapmath_test.cpp4
15 files changed, 32 insertions, 31 deletions
diff --git a/libs/jpegrecoverymap/include/jpegrecoverymap/jpegdecoderhelper.h b/libs/jpegrecoverymap/include/jpegrecoverymap/jpegdecoderhelper.h
index 485869da25..874823709c 100644
--- a/libs/jpegrecoverymap/include/jpegrecoverymap/jpegdecoderhelper.h
+++ b/libs/jpegrecoverymap/include/jpegrecoverymap/jpegdecoderhelper.h
@@ -25,7 +25,7 @@ extern "C" {
}
#include <utils/Errors.h>
#include <vector>
-namespace android::recoverymap {
+namespace android::jpegrecoverymap {
/*
* Encapsulates a converter from JPEG to raw image (YUV420planer or grey-scale) format.
* This class is not thread-safe.
@@ -115,6 +115,6 @@ private:
// Position of EXIF package, default value is -1 which means no EXIF package appears.
size_t mExifPos;
};
-} /* namespace android */
+} /* namespace android::jpegrecoverymap */
#endif // ANDROID_JPEGRECOVERYMAP_JPEGDECODERHELPER_H
diff --git a/libs/jpegrecoverymap/include/jpegrecoverymap/jpegencoderhelper.h b/libs/jpegrecoverymap/include/jpegrecoverymap/jpegencoderhelper.h
index f087b55b6f..8b82b2b00a 100644
--- a/libs/jpegrecoverymap/include/jpegrecoverymap/jpegencoderhelper.h
+++ b/libs/jpegrecoverymap/include/jpegrecoverymap/jpegencoderhelper.h
@@ -28,7 +28,7 @@ extern "C" {
#include <utils/Errors.h>
#include <vector>
-namespace android::recoverymap {
+namespace android::jpegrecoverymap {
/*
* Encapsulates a converter from raw image (YUV420planer or grey-scale) to JPEG format.
@@ -90,6 +90,6 @@ private:
std::vector<JOCTET> mResultBuffer;
};
-} /* namespace android */
+} /* namespace android::jpegrecoverymap */
#endif // ANDROID_JPEGRECOVERYMAP_JPEGENCODERHELPER_H
diff --git a/libs/jpegrecoverymap/include/jpegrecoverymap/jpegr.h b/libs/jpegrecoverymap/include/jpegrecoverymap/jpegr.h
index 9f8801e1bb..5455ba61d6 100644
--- a/libs/jpegrecoverymap/include/jpegrecoverymap/jpegr.h
+++ b/libs/jpegrecoverymap/include/jpegrecoverymap/jpegr.h
@@ -19,7 +19,7 @@
#include "jpegrerrorcode.h"
-namespace android::recoverymap {
+namespace android::jpegrecoverymap {
// Color gamuts for image data
typedef enum {
@@ -323,6 +323,6 @@ private:
jr_uncompressed_ptr dest);
};
-} // namespace android::recoverymap
+} // namespace android::jpegrecoverymap
#endif // ANDROID_JPEGRECOVERYMAP_JPEGR_H
diff --git a/libs/jpegrecoverymap/include/jpegrecoverymap/jpegrerrorcode.h b/libs/jpegrecoverymap/include/jpegrecoverymap/jpegrerrorcode.h
index 699c0d3ca1..f73034338b 100644
--- a/libs/jpegrecoverymap/include/jpegrecoverymap/jpegrerrorcode.h
+++ b/libs/jpegrecoverymap/include/jpegrecoverymap/jpegrerrorcode.h
@@ -16,7 +16,7 @@
#include <utils/Errors.h>
-namespace android::recoverymap {
+namespace android::jpegrecoverymap {
enum {
// status_t map for errors in the media framework
@@ -48,4 +48,4 @@ enum {
ERROR_JPEGR_TONEMAP_ERROR = JPEGR_RUNTIME_ERROR_BASE - 5,
};
-} // namespace android::recoverymap
+} // namespace android::jpegrecoverymap
diff --git a/libs/jpegrecoverymap/include/jpegrecoverymap/jpegrutils.h b/libs/jpegrecoverymap/include/jpegrecoverymap/jpegrutils.h
index 73867f9552..3a0f67de19 100644
--- a/libs/jpegrecoverymap/include/jpegrecoverymap/jpegrutils.h
+++ b/libs/jpegrecoverymap/include/jpegrecoverymap/jpegrutils.h
@@ -24,7 +24,7 @@
#include <string>
#include <cstdio>
-namespace android::recoverymap {
+namespace android::jpegrecoverymap {
struct jpegr_metadata;
@@ -92,6 +92,6 @@ bool getMetadataFromXMP(uint8_t* xmp_data, size_t xmp_size, jpegr_metadata* meta
* @return XMP metadata in type of string
*/
std::string generateXmp(int secondary_image_length, jpegr_metadata& metadata);
-}
+} // namespace android::jpegrecoverymap
#endif //ANDROID_JPEGRECOVERYMAP_JPEGRUTILS_H
diff --git a/libs/jpegrecoverymap/include/jpegrecoverymap/recoverymapmath.h b/libs/jpegrecoverymap/include/jpegrecoverymap/recoverymapmath.h
index 71b18b9094..c12cee9f19 100644
--- a/libs/jpegrecoverymap/include/jpegrecoverymap/recoverymapmath.h
+++ b/libs/jpegrecoverymap/include/jpegrecoverymap/recoverymapmath.h
@@ -22,7 +22,7 @@
#include <jpegrecoverymap/jpegr.h>
-namespace android::recoverymap {
+namespace android::jpegrecoverymap {
#define CLIP3(x, min, max) ((x) < (min)) ? (min) : ((x) > (max)) ? (max) : (x)
@@ -392,6 +392,6 @@ float sampleMap(jr_uncompressed_ptr map, size_t map_scale_factor, size_t x, size
*/
uint32_t colorToRgba1010102(Color e_gamma);
-} // namespace android::recoverymap
+} // namespace android::jpegrecoverymap
#endif // ANDROID_JPEGRECOVERYMAP_RECOVERYMAPMATH_H
diff --git a/libs/jpegrecoverymap/jpegdecoderhelper.cpp b/libs/jpegrecoverymap/jpegdecoderhelper.cpp
index 0754ec9dd6..d36bbf8165 100644
--- a/libs/jpegrecoverymap/jpegdecoderhelper.cpp
+++ b/libs/jpegrecoverymap/jpegdecoderhelper.cpp
@@ -24,7 +24,7 @@
using namespace std;
-namespace android::recoverymap {
+namespace android::jpegrecoverymap {
const uint32_t kAPP0Marker = JPEG_APP0; // JFIF
const uint32_t kAPP1Marker = JPEG_APP0 + 1; // EXIF, XMP
@@ -413,4 +413,4 @@ bool JpegDecoderHelper::decompressSingleChannel(jpeg_decompress_struct* cinfo, c
return true;
}
-} // namespace android
+} // namespace jpegrecoverymap
diff --git a/libs/jpegrecoverymap/jpegencoderhelper.cpp b/libs/jpegrecoverymap/jpegencoderhelper.cpp
index 54b184d2ef..586cd346e4 100644
--- a/libs/jpegrecoverymap/jpegencoderhelper.cpp
+++ b/libs/jpegrecoverymap/jpegencoderhelper.cpp
@@ -20,7 +20,7 @@
#include <errno.h>
-namespace android::recoverymap {
+namespace android::jpegrecoverymap {
// The destination manager that can access |mResultBuffer| in JpegEncoderHelper.
struct destination_mgr {
@@ -236,4 +236,4 @@ bool JpegEncoderHelper::compressSingleChannel(jpeg_compress_struct* cinfo, const
return true;
}
-} // namespace android
+} // namespace jpegrecoverymap
diff --git a/libs/jpegrecoverymap/jpegr.cpp b/libs/jpegrecoverymap/jpegr.cpp
index fbd511a600..bd8874ed5d 100644
--- a/libs/jpegrecoverymap/jpegr.cpp
+++ b/libs/jpegrecoverymap/jpegr.cpp
@@ -43,7 +43,7 @@
using namespace std;
using namespace photos_editing_formats::image_io;
-namespace android::recoverymap {
+namespace android::jpegrecoverymap {
#define USE_SRGB_INVOETF_LUT 1
#define USE_HLG_OETF_LUT 1
@@ -86,14 +86,15 @@ int GetCPUCoreCount() {
return cpuCoreCount;
}
-static const map<recoverymap::jpegr_color_gamut, skcms_Matrix3x3> jrGamut_to_skGamut {
+static const map<jpegrecoverymap::jpegr_color_gamut, skcms_Matrix3x3> jrGamut_to_skGamut {
{JPEGR_COLORGAMUT_BT709, SkNamedGamut::kSRGB},
{JPEGR_COLORGAMUT_P3, SkNamedGamut::kDisplayP3},
{JPEGR_COLORGAMUT_BT2100, SkNamedGamut::kRec2020},
};
static const map<
- recoverymap::jpegr_transfer_function, skcms_TransferFunction> jrTransFunc_to_skTransFunc {
+ jpegrecoverymap::jpegr_transfer_function,
+ skcms_TransferFunction> jrTransFunc_to_skTransFunc {
{JPEGR_TF_SRGB, SkNamedTransferFn::kSRGB},
{JPEGR_TF_LINEAR, SkNamedTransferFn::kLinear},
{JPEGR_TF_HLG, SkNamedTransferFn::kHLG},
@@ -954,4 +955,4 @@ status_t JpegR::toneMap(jr_uncompressed_ptr src,
return NO_ERROR;
}
-} // namespace android::recoverymap
+} // namespace android::jpegrecoverymap
diff --git a/libs/jpegrecoverymap/jpegrutils.cpp b/libs/jpegrecoverymap/jpegrutils.cpp
index e5323c7b85..bcca91af35 100644
--- a/libs/jpegrecoverymap/jpegrutils.cpp
+++ b/libs/jpegrecoverymap/jpegrutils.cpp
@@ -25,7 +25,7 @@
using namespace photos_editing_formats::image_io;
using namespace std;
-namespace android::recoverymap {
+namespace android::jpegrecoverymap {
/*
* Helper function used for generating XMP metadata.
@@ -247,4 +247,4 @@ string generateXmp(int secondary_image_length, jpegr_metadata& metadata) {
return ss.str();
}
-} // namespace android::recoverymap
+} // namespace android::jpegrecoverymap
diff --git a/libs/jpegrecoverymap/recoverymapmath.cpp b/libs/jpegrecoverymap/recoverymapmath.cpp
index 9c89c8afd4..7812e18b23 100644
--- a/libs/jpegrecoverymap/recoverymapmath.cpp
+++ b/libs/jpegrecoverymap/recoverymapmath.cpp
@@ -18,7 +18,7 @@
#include <vector>
#include <jpegrecoverymap/recoverymapmath.h>
-namespace android::recoverymap {
+namespace android::jpegrecoverymap {
static const std::vector<float> kPqOETF = [] {
std::vector<float> result;
@@ -631,4 +631,4 @@ uint32_t colorToRgba1010102(Color e_gamma) {
| (0x3 << 30); // Set alpha to 1.0
}
-} // namespace android::recoverymap
+} // namespace android::jpegrecoverymap
diff --git a/libs/jpegrecoverymap/tests/jpegdecoderhelper_test.cpp b/libs/jpegrecoverymap/tests/jpegdecoderhelper_test.cpp
index 278bf3b847..2f32a5685b 100644
--- a/libs/jpegrecoverymap/tests/jpegdecoderhelper_test.cpp
+++ b/libs/jpegrecoverymap/tests/jpegdecoderhelper_test.cpp
@@ -20,7 +20,7 @@
#include <fcntl.h>
-namespace android::recoverymap {
+namespace android::jpegrecoverymap {
#define YUV_IMAGE "/sdcard/Documents/minnie-320x240-yuv.jpg"
#define YUV_IMAGE_SIZE 20193
@@ -99,4 +99,4 @@ TEST_F(JpegDecoderHelperTest, decodeGreyImage) {
ASSERT_GT(decoder.getDecompressedImageSize(), static_cast<uint32_t>(0));
}
-} \ No newline at end of file
+} // namespace android::jpegrecoverymap \ No newline at end of file
diff --git a/libs/jpegrecoverymap/tests/jpegencoderhelper_test.cpp b/libs/jpegrecoverymap/tests/jpegencoderhelper_test.cpp
index 532688d06f..095ac2fbf6 100644
--- a/libs/jpegrecoverymap/tests/jpegencoderhelper_test.cpp
+++ b/libs/jpegrecoverymap/tests/jpegencoderhelper_test.cpp
@@ -20,7 +20,7 @@
#include <fcntl.h>
-namespace android::recoverymap {
+namespace android::jpegrecoverymap {
#define VALID_IMAGE "/sdcard/Documents/minnie-320x240.yu12"
#define VALID_IMAGE_WIDTH 320
@@ -121,5 +121,5 @@ TEST_F(JpegEncoderHelperTest, singleChannelImage) {
ASSERT_GT(encoder.getCompressedImageSize(), static_cast<uint32_t>(0));
}
-}
+} // namespace android::jpegrecoverymap
diff --git a/libs/jpegrecoverymap/tests/jpegr_test.cpp b/libs/jpegrecoverymap/tests/jpegr_test.cpp
index 9a0bd3b37c..c0347e39c7 100644
--- a/libs/jpegrecoverymap/tests/jpegr_test.cpp
+++ b/libs/jpegrecoverymap/tests/jpegr_test.cpp
@@ -34,7 +34,7 @@
#define SAVE_DECODING_RESULT true
#define SAVE_INPUT_RGBA true
-namespace android::recoverymap {
+namespace android::jpegrecoverymap {
struct Timer {
struct timeval StartingTime;
diff --git a/libs/jpegrecoverymap/tests/recoverymapmath_test.cpp b/libs/jpegrecoverymap/tests/recoverymapmath_test.cpp
index 80a9596e3c..6c61ff13d7 100644
--- a/libs/jpegrecoverymap/tests/recoverymapmath_test.cpp
+++ b/libs/jpegrecoverymap/tests/recoverymapmath_test.cpp
@@ -19,7 +19,7 @@
#include <gmock/gmock.h>
#include <jpegrecoverymap/recoverymapmath.h>
-namespace android::recoverymap {
+namespace android::jpegrecoverymap {
class RecoveryMapMathTest : public testing::Test {
public:
@@ -1066,4 +1066,4 @@ TEST_F(RecoveryMapMathTest, ApplyMap) {
RgbWhite() / 2.0f);
}
-} // namespace android::recoverymap
+} // namespace android::jpegrecoverymap