From b8b235f6a04facd7b95d7d0ae8fdebe9d8454ff7 Mon Sep 17 00:00:00 2001 From: Ram Mohan Date: Mon, 24 Apr 2023 21:31:21 +0530 Subject: ultrahdr: Update fuzz application for encode API Bug: 282640328 Test: ./ultrahdr_enc_fuzzer Change-Id: I0a547f63da570433dc54eb23fbd41021022aec4e --- libs/ultrahdr/fuzzer/ultrahdr_enc_fuzzer.cpp | 29 ++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) (limited to 'libs') diff --git a/libs/ultrahdr/fuzzer/ultrahdr_enc_fuzzer.cpp b/libs/ultrahdr/fuzzer/ultrahdr_enc_fuzzer.cpp index 472699bb9e..7faa1570f0 100644 --- a/libs/ultrahdr/fuzzer/ultrahdr_enc_fuzzer.cpp +++ b/libs/ultrahdr/fuzzer/ultrahdr_enc_fuzzer.cpp @@ -45,7 +45,7 @@ const int kCgMax = ULTRAHDR_COLORGAMUT_MAX; // Transfer functions for image data, sync with ultrahdr.h 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 const int kOfMin = ULTRAHDR_OUTPUT_UNSPECIFIED + 1; @@ -265,16 +265,29 @@ void JpegHDRFuzzer::process() { } } if (status == android::OK) { - jpegr_uncompressed_struct decodedJpegR; - auto decodedRaw = std::make_unique(width * height * 8); - decodedJpegR.data = decodedRaw.get(); - jpegHdr.decodeJPEGR(&jpegImgR, &decodedJpegR, - mFdp.ConsumeFloatingPointInRange(1.0, FLT_MAX), nullptr, of, - nullptr, nullptr); std::vector iccData(0); std::vector exifData(0); 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(outSize); + decodedJpegR.data = decodedRaw.get(); + ultrahdr_metadata_struct metadata; + jpegr_uncompressed_struct decodedGainMap{}; + status = jpegHdr.decodeJPEGR(&jpegImgR, &decodedJpegR, + mFdp.ConsumeFloatingPointInRange(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); } } } -- cgit v1.2.3-59-g8ed1b