JPEG/R refactory: rename jpegencoder and jpegdecoder
Rename those to ***helper
Bug: 264715926
Test: build
Change-Id: Ibcfd8554538a711b264f3d4227a9037302437af1
diff --git a/libs/jpegrecoverymap/tests/Android.bp b/libs/jpegrecoverymap/tests/Android.bp
index e381caf..e416db9 100644
--- a/libs/jpegrecoverymap/tests/Android.bp
+++ b/libs/jpegrecoverymap/tests/Android.bp
@@ -44,10 +44,10 @@
}
cc_test {
- name: "libjpegencoder_test",
+ name: "libjpegencoderhelper_test",
test_suites: ["device-tests"],
srcs: [
- "jpegencoder_test.cpp",
+ "jpegencoderhelper_test.cpp",
],
shared_libs: [
"libjpeg",
@@ -60,10 +60,10 @@
}
cc_test {
- name: "libjpegdecoder_test",
+ name: "libjpegdecoderhelper_test",
test_suites: ["device-tests"],
srcs: [
- "jpegdecoder_test.cpp",
+ "jpegdecoderhelper_test.cpp",
],
shared_libs: [
"libjpeg",
diff --git a/libs/jpegrecoverymap/tests/jpegdecoder_test.cpp b/libs/jpegrecoverymap/tests/jpegdecoderhelper_test.cpp
similarity index 79%
rename from libs/jpegrecoverymap/tests/jpegdecoder_test.cpp
rename to libs/jpegrecoverymap/tests/jpegdecoderhelper_test.cpp
index 8e01351..278bf3b 100644
--- a/libs/jpegrecoverymap/tests/jpegdecoder_test.cpp
+++ b/libs/jpegrecoverymap/tests/jpegdecoderhelper_test.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <jpegrecoverymap/jpegdecoder.h>
+#include <jpegrecoverymap/jpegdecoderhelper.h>
#include <gtest/gtest.h>
#include <utils/Log.h>
@@ -27,14 +27,14 @@
#define GREY_IMAGE "/sdcard/Documents/minnie-320x240-y.jpg"
#define GREY_IMAGE_SIZE 20193
-class JpegDecoderTest : public testing::Test {
+class JpegDecoderHelperTest : public testing::Test {
public:
struct Image {
std::unique_ptr<uint8_t[]> buffer;
size_t size;
};
- JpegDecoderTest();
- ~JpegDecoderTest();
+ JpegDecoderHelperTest();
+ ~JpegDecoderHelperTest();
protected:
virtual void SetUp();
virtual void TearDown();
@@ -42,9 +42,9 @@
Image mYuvImage, mGreyImage;
};
-JpegDecoderTest::JpegDecoderTest() {}
+JpegDecoderHelperTest::JpegDecoderHelperTest() {}
-JpegDecoderTest::~JpegDecoderTest() {}
+JpegDecoderHelperTest::~JpegDecoderHelperTest() {}
static size_t getFileSize(int fd) {
struct stat st;
@@ -55,7 +55,7 @@
return st.st_size; // bytes
}
-static bool loadFile(const char filename[], JpegDecoderTest::Image* result) {
+static bool loadFile(const char filename[], JpegDecoderHelperTest::Image* result) {
int fd = open(filename, O_CLOEXEC);
if (fd < 0) {
return false;
@@ -74,7 +74,7 @@
return true;
}
-void JpegDecoderTest::SetUp() {
+void JpegDecoderHelperTest::SetUp() {
if (!loadFile(YUV_IMAGE, &mYuvImage)) {
FAIL() << "Load file " << YUV_IMAGE << " failed";
}
@@ -85,16 +85,16 @@
mGreyImage.size = GREY_IMAGE_SIZE;
}
-void JpegDecoderTest::TearDown() {}
+void JpegDecoderHelperTest::TearDown() {}
-TEST_F(JpegDecoderTest, decodeYuvImage) {
- JpegDecoder decoder;
+TEST_F(JpegDecoderHelperTest, decodeYuvImage) {
+ JpegDecoderHelper decoder;
EXPECT_TRUE(decoder.decompressImage(mYuvImage.buffer.get(), mYuvImage.size));
ASSERT_GT(decoder.getDecompressedImageSize(), static_cast<uint32_t>(0));
}
-TEST_F(JpegDecoderTest, decodeGreyImage) {
- JpegDecoder decoder;
+TEST_F(JpegDecoderHelperTest, decodeGreyImage) {
+ JpegDecoderHelper decoder;
EXPECT_TRUE(decoder.decompressImage(mGreyImage.buffer.get(), mGreyImage.size));
ASSERT_GT(decoder.getDecompressedImageSize(), static_cast<uint32_t>(0));
}
diff --git a/libs/jpegrecoverymap/tests/jpegencoder_test.cpp b/libs/jpegrecoverymap/tests/jpegencoderhelper_test.cpp
similarity index 83%
rename from libs/jpegrecoverymap/tests/jpegencoder_test.cpp
rename to libs/jpegrecoverymap/tests/jpegencoderhelper_test.cpp
index 4cd2a5e..532688d 100644
--- a/libs/jpegrecoverymap/tests/jpegencoder_test.cpp
+++ b/libs/jpegrecoverymap/tests/jpegencoderhelper_test.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <jpegrecoverymap/jpegencoder.h>
+#include <jpegrecoverymap/jpegencoderhelper.h>
#include <gtest/gtest.h>
#include <utils/Log.h>
@@ -33,15 +33,15 @@
#define INVALID_SIZE_IMAGE_HEIGHT 240
#define JPEG_QUALITY 90
-class JpegEncoderTest : public testing::Test {
+class JpegEncoderHelperTest : public testing::Test {
public:
struct Image {
std::unique_ptr<uint8_t[]> buffer;
size_t width;
size_t height;
};
- JpegEncoderTest();
- ~JpegEncoderTest();
+ JpegEncoderHelperTest();
+ ~JpegEncoderHelperTest();
protected:
virtual void SetUp();
virtual void TearDown();
@@ -49,9 +49,9 @@
Image mValidImage, mInvalidSizeImage, mSingleChannelImage;
};
-JpegEncoderTest::JpegEncoderTest() {}
+JpegEncoderHelperTest::JpegEncoderHelperTest() {}
-JpegEncoderTest::~JpegEncoderTest() {}
+JpegEncoderHelperTest::~JpegEncoderHelperTest() {}
static size_t getFileSize(int fd) {
struct stat st;
@@ -62,7 +62,7 @@
return st.st_size; // bytes
}
-static bool loadFile(const char filename[], JpegEncoderTest::Image* result) {
+static bool loadFile(const char filename[], JpegEncoderHelperTest::Image* result) {
int fd = open(filename, O_CLOEXEC);
if (fd < 0) {
return false;
@@ -81,7 +81,7 @@
return true;
}
-void JpegEncoderTest::SetUp() {
+void JpegEncoderHelperTest::SetUp() {
if (!loadFile(VALID_IMAGE, &mValidImage)) {
FAIL() << "Load file " << VALID_IMAGE << " failed";
}
@@ -99,23 +99,23 @@
mSingleChannelImage.height = SINGLE_CHANNEL_IMAGE_HEIGHT;
}
-void JpegEncoderTest::TearDown() {}
+void JpegEncoderHelperTest::TearDown() {}
-TEST_F(JpegEncoderTest, validImage) {
- JpegEncoder encoder;
+TEST_F(JpegEncoderHelperTest, validImage) {
+ JpegEncoderHelper encoder;
EXPECT_TRUE(encoder.compressImage(mValidImage.buffer.get(), mValidImage.width,
mValidImage.height, JPEG_QUALITY, NULL, 0));
ASSERT_GT(encoder.getCompressedImageSize(), static_cast<uint32_t>(0));
}
-TEST_F(JpegEncoderTest, invalidSizeImage) {
- JpegEncoder encoder;
+TEST_F(JpegEncoderHelperTest, invalidSizeImage) {
+ JpegEncoderHelper encoder;
EXPECT_FALSE(encoder.compressImage(mInvalidSizeImage.buffer.get(), mInvalidSizeImage.width,
mInvalidSizeImage.height, JPEG_QUALITY, NULL, 0));
}
-TEST_F(JpegEncoderTest, singleChannelImage) {
- JpegEncoder encoder;
+TEST_F(JpegEncoderHelperTest, singleChannelImage) {
+ JpegEncoderHelper encoder;
EXPECT_TRUE(encoder.compressImage(mSingleChannelImage.buffer.get(), mSingleChannelImage.width,
mSingleChannelImage.height, JPEG_QUALITY, NULL, 0, true));
ASSERT_GT(encoder.getCompressedImageSize(), static_cast<uint32_t>(0));