summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dichen Zhang <dichenzhang@google.com> 2023-08-02 15:14:54 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-08-02 15:14:54 +0000
commit5bab2d8085d9c312dd68831e675debd37dc2ef06 (patch)
tree1346a035acea1a1d74caecc80c47b85613594673
parent6cb305e12c3060ab1b6cea9cda236f66d7207729 (diff)
parent1790bb5d5bd420047ed14ec0bfd2c73478c747d0 (diff)
Merge "ultrahdr: do not select less accurate integer method during dct" into main
-rw-r--r--libs/ultrahdr/jpegdecoderhelper.cpp2
-rw-r--r--libs/ultrahdr/jpegencoderhelper.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/ultrahdr/jpegdecoderhelper.cpp b/libs/ultrahdr/jpegdecoderhelper.cpp
index fef544452a..c077bcb02a 100644
--- a/libs/ultrahdr/jpegdecoderhelper.cpp
+++ b/libs/ultrahdr/jpegdecoderhelper.cpp
@@ -256,7 +256,7 @@ bool JpegDecoderHelper::decode(const void* image, int length, bool decodeToRGBA)
cinfo.raw_data_out = TRUE;
}
- cinfo.dct_method = JDCT_IFAST;
+ cinfo.dct_method = JDCT_ISLOW;
jpeg_start_decompress(&cinfo);
diff --git a/libs/ultrahdr/jpegencoderhelper.cpp b/libs/ultrahdr/jpegencoderhelper.cpp
index a03547b538..de621bd24f 100644
--- a/libs/ultrahdr/jpegencoderhelper.cpp
+++ b/libs/ultrahdr/jpegencoderhelper.cpp
@@ -140,7 +140,7 @@ void JpegEncoderHelper::setJpegCompressStruct(int width, int height, int quality
jpeg_set_quality(cinfo, quality, TRUE);
jpeg_set_colorspace(cinfo, isSingleChannel ? JCS_GRAYSCALE : JCS_YCbCr);
cinfo->raw_data_in = TRUE;
- cinfo->dct_method = JDCT_IFAST;
+ cinfo->dct_method = JDCT_ISLOW;
if (!isSingleChannel) {
// Configure sampling factors. The sampling factor is JPEG subsampling 420 because the