Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bab2d80 authored by Dichen Zhang's avatar Dichen Zhang Committed by Android (Google) Code Review
Browse files

Merge "ultrahdr: do not select less accurate integer method during dct" into main

parents 6cb305e1 1790bb5d

libs/ultrahdr/jpegdecoderhelper.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

libs/ultrahdr/jpegencoderhelper.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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