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

Commit 7964d4f6 authored by Dichen Zhang's avatar Dichen Zhang Committed by Automerger Merge Worker
Browse files

Merge "ultrahdr: Update fuzz application for encode API" into udc-dev am: 7fbf5f1a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23503349



Change-Id: I3841ec12d997f777b2154cf1604cf32507ce8859
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a6f72dd2 7fbf5f1a

libs/ultrahdr/fuzzer/ultrahdr_enc_fuzzer.cpp

+21 −8
Original line number Original line Diff line number Diff line
@@ -45,7 +45,7 @@ const int kCgMax = ULTRAHDR_COLORGAMUT_MAX; 




// Transfer functions for image data, sync with ultrahdr.h

// Transfer functions for image data, sync with ultrahdr.h

const int kTfMin = ULTRAHDR_TF_UNSPECIFIED + 1;

const int kTfMin = ULTRAHDR_TF_UNSPECIFIED + 1;

const int kTfMax = ULTRAHDR_TF_MAX;

const int kTfMax = ULTRAHDR_TF_PQ;





// Transfer functions for image data, sync with ultrahdr.h

// Transfer functions for image data, sync with ultrahdr.h

const int kOfMin = ULTRAHDR_OUTPUT_UNSPECIFIED + 1;

const int kOfMin = ULTRAHDR_OUTPUT_UNSPECIFIED + 1;
@@ -265,16 +265,29 @@ void JpegHDRFuzzer::process() { 
            }

            }

        }

        }

        if (status == android::OK) {

        if (status == android::OK) {

            jpegr_uncompressed_struct decodedJpegR;

            auto decodedRaw = std::make_unique<uint8_t[]>(width * height * 8);

            decodedJpegR.data = decodedRaw.get();

            jpegHdr.decodeJPEGR(&jpegImgR, &decodedJpegR,

                                mFdp.ConsumeFloatingPointInRange<float>(1.0, FLT_MAX), nullptr, of,

                                nullptr, nullptr);

            std::vector<uint8_t> iccData(0);

            std::vector<uint8_t> iccData(0);

            std::vector<uint8_t> exifData(0);

            std::vector<uint8_t> exifData(0);

            jpegr_info_struct info{0, 0, &iccData, &exifData};

            jpegr_info_struct info{0, 0, &iccData, &exifData};

            jpegHdr.getJPEGRInfo(&jpegImgR, &info);

            status = jpegHdr.getJPEGRInfo(&jpegImgR, &info);

            if (status == android::OK) {

                size_t outSize = info.width * info.height * ((of == ULTRAHDR_OUTPUT_SDR) ? 4 : 8);

                jpegr_uncompressed_struct decodedJpegR;

                auto decodedRaw = std::make_unique<uint8_t[]>(outSize);

                decodedJpegR.data = decodedRaw.get();

                ultrahdr_metadata_struct metadata;

                jpegr_uncompressed_struct decodedGainMap{};

                status = jpegHdr.decodeJPEGR(&jpegImgR, &decodedJpegR,

                                             mFdp.ConsumeFloatingPointInRange<float>(1.0, FLT_MAX),

                                             nullptr, of, &decodedGainMap, &metadata);

                if (status != android::OK) {

                    ALOGE("encountered error during decoding %d", status);

                }

                if (decodedGainMap.data) free(decodedGainMap.data);

            } else {

                ALOGE("encountered error during get jpeg info %d", status);

            }

        } else {

            ALOGE("encountered error during encoding %d", status);

        }

        }

    }

    }

}

}