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

Commit bfdf3888 authored by Dichen Zhang's avatar Dichen Zhang
Browse files

Removed duplicade library 

Bug: 313791883
Test: build

Change-Id: Ib4d58ebec02270f2c6dda4b307d03bd7e5526391
parent c6546923

libs/ultrahdr/OWNERS

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
arifdikici@google.com

dichenzhang@google.com

kyslov@google.com
 
 No newline at end of file

libs/ultrahdr/adobe-hdr-gain-map-license/Android.bp

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
// Copyright 2023 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



license {

    name: "adobe_hdr_gain_map_license-deprecated",

    license_kinds: ["legacy_by_exception_only"],

    license_text: ["NOTICE"],

}

libs/ultrahdr/adobe-hdr-gain-map-license/NOTICE

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
This product includes Gain Map technology under license by Adobe.

libs/ultrahdr/fuzzer/ultrahdr_dec_fuzzer.cpp

deleted100644 → 0
+0 −73
Original line number Diff line number Diff line 
/*

 * Copyright 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



// System include files

#include <fuzzer/FuzzedDataProvider.h>

#include <iostream>

#include <vector>



// User include files

#include "ultrahdr/jpegr.h"



using namespace android::ultrahdr;



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

const int kOfMin = ULTRAHDR_OUTPUT_UNSPECIFIED + 1;

const int kOfMax = ULTRAHDR_OUTPUT_MAX;



class UltraHdrDecFuzzer {

public:

    UltraHdrDecFuzzer(const uint8_t* data, size_t size) : mFdp(data, size){};

    void process();



private:

    FuzzedDataProvider mFdp;

};



void UltraHdrDecFuzzer::process() {

    // hdr_of

    auto of = static_cast<ultrahdr_output_format>(mFdp.ConsumeIntegralInRange<int>(kOfMin, kOfMax));

    auto buffer = mFdp.ConsumeRemainingBytes<uint8_t>();

    jpegr_compressed_struct jpegImgR{buffer.data(), (int)buffer.size(), (int)buffer.size(),

                                     ULTRAHDR_COLORGAMUT_UNSPECIFIED};



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

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

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

    JpegR jpegHdr;

    (void)jpegHdr.getJPEGRInfo(&jpegImgR, &info);

//#define DUMP_PARAM

#ifdef DUMP_PARAM

    std::cout << "input buffer size " << jpegImgR.length << std::endl;

    std::cout << "image dimensions " << info.width << " x " << info.width << std::endl;

#endif

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

    jpegr_uncompressed_struct decodedJpegR;

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

    decodedJpegR.data = decodedRaw.get();

    ultrahdr_metadata_struct metadata;

    jpegr_uncompressed_struct decodedGainMap{};

    (void)jpegHdr.decodeJPEGR(&jpegImgR, &decodedJpegR,

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

                              &decodedGainMap, &metadata);

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

}



extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {

    UltraHdrDecFuzzer fuzzHandle(data, size);

    fuzzHandle.process();

    return 0;

}

libs/ultrahdr/fuzzer/ultrahdr_enc_fuzzer.cpp

deleted100644 → 0
+0 −333
Original line number Diff line number Diff line 
/*

 * Copyright 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



// System include files

#include <fuzzer/FuzzedDataProvider.h>

#include <algorithm>

#include <iostream>

#include <random>

#include <vector>



// User include files

#include "ultrahdr/gainmapmath.h"

#include "ultrahdr/jpegdecoderhelper.h"

#include "ultrahdr/jpegencoderhelper.h"

#include "utils/Log.h"



using namespace android::ultrahdr;



// Color gamuts for image data, sync with ultrahdr.h

const int kCgMin = ULTRAHDR_COLORGAMUT_UNSPECIFIED + 1;

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_PQ;



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

const int kOfMin = ULTRAHDR_OUTPUT_UNSPECIFIED + 1;

const int kOfMax = ULTRAHDR_OUTPUT_MAX;



// quality factor

const int kQfMin = 0;

const int kQfMax = 100;



class UltraHdrEncFuzzer {

public:

    UltraHdrEncFuzzer(const uint8_t* data, size_t size) : mFdp(data, size){};

    void process();

    void fillP010Buffer(uint16_t* data, int width, int height, int stride);

    void fill420Buffer(uint8_t* data, int width, int height, int stride);



private:

    FuzzedDataProvider mFdp;

};



void UltraHdrEncFuzzer::fillP010Buffer(uint16_t* data, int width, int height, int stride) {

    uint16_t* tmp = data;

    std::vector<uint16_t> buffer(16);

    for (int i = 0; i < buffer.size(); i++) {

        buffer[i] = (mFdp.ConsumeIntegralInRange<int>(0, (1 << 10) - 1)) << 6;

    }

    for (int j = 0; j < height; j++) {

        for (int i = 0; i < width; i += buffer.size()) {

            memcpy(tmp + i, buffer.data(),

                   std::min((int)buffer.size(), (width - i)) * sizeof(*data));

            std::shuffle(buffer.begin(), buffer.end(),

                         std::default_random_engine(std::random_device{}()));

        }

        tmp += stride;

    }

}



void UltraHdrEncFuzzer::fill420Buffer(uint8_t* data, int width, int height, int stride) {

    uint8_t* tmp = data;

    std::vector<uint8_t> buffer(16);

    mFdp.ConsumeData(buffer.data(), buffer.size());

    for (int j = 0; j < height; j++) {

        for (int i = 0; i < width; i += buffer.size()) {

            memcpy(tmp + i, buffer.data(),

                   std::min((int)buffer.size(), (width - i)) * sizeof(*data));

            std::shuffle(buffer.begin(), buffer.end(),

                         std::default_random_engine(std::random_device{}()));

        }

        tmp += stride;

    }

}



void UltraHdrEncFuzzer::process() {

    while (mFdp.remaining_bytes()) {

        struct jpegr_uncompressed_struct p010Img {};

        struct jpegr_uncompressed_struct yuv420Img {};

        struct jpegr_uncompressed_struct grayImg {};

        struct jpegr_compressed_struct jpegImgR {};

        struct jpegr_compressed_struct jpegImg {};

        struct jpegr_compressed_struct jpegGainMap {};



        // which encode api to select

        int muxSwitch = mFdp.ConsumeIntegralInRange<int>(0, 4);



        // quality factor

        int quality = mFdp.ConsumeIntegralInRange<int>(kQfMin, kQfMax);



        // hdr_tf

        auto tf = static_cast<ultrahdr_transfer_function>(

                mFdp.ConsumeIntegralInRange<int>(kTfMin, kTfMax));



        // p010 Cg

        auto p010Cg =

                static_cast<ultrahdr_color_gamut>(mFdp.ConsumeIntegralInRange<int>(kCgMin, kCgMax));



        // 420 Cg

        auto yuv420Cg =

                static_cast<ultrahdr_color_gamut>(mFdp.ConsumeIntegralInRange<int>(kCgMin, kCgMax));



        // hdr_of

        auto of = static_cast<ultrahdr_output_format>(

                mFdp.ConsumeIntegralInRange<int>(kOfMin, kOfMax));



        int width = mFdp.ConsumeIntegralInRange<int>(kMinWidth, kMaxWidth);

        width = (width >> 1) << 1;



        int height = mFdp.ConsumeIntegralInRange<int>(kMinHeight, kMaxHeight);

        height = (height >> 1) << 1;



        std::unique_ptr<uint16_t[]> bufferYHdr = nullptr;

        std::unique_ptr<uint16_t[]> bufferUVHdr = nullptr;

        std::unique_ptr<uint8_t[]> bufferYSdr = nullptr;

        std::unique_ptr<uint8_t[]> bufferUVSdr = nullptr;

        std::unique_ptr<uint8_t[]> grayImgRaw = nullptr;

        if (muxSwitch != 4) {

            // init p010 image

            bool isUVContiguous = mFdp.ConsumeBool();

            bool hasYStride = mFdp.ConsumeBool();

            int yStride = hasYStride ? mFdp.ConsumeIntegralInRange<int>(width, width + 128) : width;

            p010Img.width = width;

            p010Img.height = height;

            p010Img.colorGamut = p010Cg;

            p010Img.luma_stride = hasYStride ? yStride : 0;

            int bppP010 = 2;

            if (isUVContiguous) {

                size_t p010Size = yStride * height * 3 / 2;

                bufferYHdr = std::make_unique<uint16_t[]>(p010Size);

                p010Img.data = bufferYHdr.get();

                p010Img.chroma_data = nullptr;

                p010Img.chroma_stride = 0;

                fillP010Buffer(bufferYHdr.get(), width, height, yStride);

                fillP010Buffer(bufferYHdr.get() + yStride * height, width, height / 2, yStride);

            } else {

                int uvStride = mFdp.ConsumeIntegralInRange<int>(width, width + 128);

                size_t p010YSize = yStride * height;

                bufferYHdr = std::make_unique<uint16_t[]>(p010YSize);

                p010Img.data = bufferYHdr.get();

                fillP010Buffer(bufferYHdr.get(), width, height, yStride);

                size_t p010UVSize = uvStride * p010Img.height / 2;

                bufferUVHdr = std::make_unique<uint16_t[]>(p010UVSize);

                p010Img.chroma_data = bufferUVHdr.get();

                p010Img.chroma_stride = uvStride;

                fillP010Buffer(bufferUVHdr.get(), width, height / 2, uvStride);

            }

        } else {

            size_t map_width = width / kMapDimensionScaleFactor;

            size_t map_height = height / kMapDimensionScaleFactor;

            // init 400 image

            grayImg.width = map_width;

            grayImg.height = map_height;

            grayImg.colorGamut = ULTRAHDR_COLORGAMUT_UNSPECIFIED;



            const size_t graySize = map_width * map_height;

            grayImgRaw = std::make_unique<uint8_t[]>(graySize);

            grayImg.data = grayImgRaw.get();

            fill420Buffer(grayImgRaw.get(), map_width, map_height, map_width);

            grayImg.chroma_data = nullptr;

            grayImg.luma_stride = 0;

            grayImg.chroma_stride = 0;

        }



        if (muxSwitch > 0) {

            // init 420 image

            bool isUVContiguous = mFdp.ConsumeBool();

            bool hasYStride = mFdp.ConsumeBool();

            int yStride = hasYStride ? mFdp.ConsumeIntegralInRange<int>(width, width + 128) : width;

            yuv420Img.width = width;

            yuv420Img.height = height;

            yuv420Img.colorGamut = yuv420Cg;

            yuv420Img.luma_stride = hasYStride ? yStride : 0;

            if (isUVContiguous) {

                size_t yuv420Size = yStride * height * 3 / 2;

                bufferYSdr = std::make_unique<uint8_t[]>(yuv420Size);

                yuv420Img.data = bufferYSdr.get();

                yuv420Img.chroma_data = nullptr;

                yuv420Img.chroma_stride = 0;

                fill420Buffer(bufferYSdr.get(), width, height, yStride);

                fill420Buffer(bufferYSdr.get() + yStride * height, width / 2, height / 2,

                              yStride / 2);

                fill420Buffer(bufferYSdr.get() + yStride * height * 5 / 4, width / 2, height / 2,

                              yStride / 2);

            } else {

                int uvStride = mFdp.ConsumeIntegralInRange<int>(width / 2, width / 2 + 128);

                size_t yuv420YSize = yStride * height;

                bufferYSdr = std::make_unique<uint8_t[]>(yuv420YSize);

                yuv420Img.data = bufferYSdr.get();

                fill420Buffer(bufferYSdr.get(), width, height, yStride);

                size_t yuv420UVSize = uvStride * yuv420Img.height / 2 * 2;

                bufferUVSdr = std::make_unique<uint8_t[]>(yuv420UVSize);

                yuv420Img.chroma_data = bufferUVSdr.get();

                yuv420Img.chroma_stride = uvStride;

                fill420Buffer(bufferUVSdr.get(), width / 2, height / 2, uvStride);

                fill420Buffer(bufferUVSdr.get() + uvStride * height / 2, width / 2, height / 2,

                              uvStride);

            }

        }



        // dest

        // 2 * p010 size as input data is random, DCT compression might not behave as expected

        jpegImgR.maxLength = std::max(8 * 1024 /* min size 8kb */, width * height * 3 * 2);

        auto jpegImgRaw = std::make_unique<uint8_t[]>(jpegImgR.maxLength);

        jpegImgR.data = jpegImgRaw.get();



//#define DUMP_PARAM

#ifdef DUMP_PARAM

        std::cout << "Api Select " << muxSwitch << std::endl;

        std::cout << "image dimensions " << width << " x " << height << std::endl;

        std::cout << "p010 color gamut " << p010Img.colorGamut << std::endl;

        std::cout << "p010 luma stride " << p010Img.luma_stride << std::endl;

        std::cout << "p010 chroma stride " << p010Img.chroma_stride << std::endl;

        std::cout << "420 color gamut " << yuv420Img.colorGamut << std::endl;

        std::cout << "420 luma stride " << yuv420Img.luma_stride << std::endl;

        std::cout << "420 chroma stride " << yuv420Img.chroma_stride << std::endl;

        std::cout << "quality factor " << quality << std::endl;

#endif



        JpegR jpegHdr;

        android::status_t status = android::UNKNOWN_ERROR;

        if (muxSwitch == 0) { // api 0

            jpegImgR.length = 0;

            status = jpegHdr.encodeJPEGR(&p010Img, tf, &jpegImgR, quality, nullptr);

        } else if (muxSwitch == 1) { // api 1

            jpegImgR.length = 0;

            status = jpegHdr.encodeJPEGR(&p010Img, &yuv420Img, tf, &jpegImgR, quality, nullptr);

        } else {

            // compressed img

            JpegEncoderHelper encoder;

            struct jpegr_uncompressed_struct yuv420ImgCopy = yuv420Img;

            if (yuv420ImgCopy.luma_stride == 0) yuv420ImgCopy.luma_stride = yuv420Img.width;

            if (!yuv420ImgCopy.chroma_data) {

                uint8_t* data = reinterpret_cast<uint8_t*>(yuv420Img.data);

                yuv420ImgCopy.chroma_data = data + yuv420Img.luma_stride * yuv420Img.height;

                yuv420ImgCopy.chroma_stride = yuv420Img.luma_stride >> 1;

            }



            if (encoder.compressImage(reinterpret_cast<uint8_t*>(yuv420ImgCopy.data),

                                      reinterpret_cast<uint8_t*>(yuv420ImgCopy.chroma_data),

                                      yuv420ImgCopy.width, yuv420ImgCopy.height,

                                      yuv420ImgCopy.luma_stride, yuv420ImgCopy.chroma_stride,

                                      quality, nullptr, 0)) {

                jpegImg.length = encoder.getCompressedImageSize();

                jpegImg.maxLength = jpegImg.length;

                jpegImg.data = encoder.getCompressedImagePtr();

                jpegImg.colorGamut = yuv420Cg;



                if (muxSwitch == 2) { // api 2

                    jpegImgR.length = 0;

                    status = jpegHdr.encodeJPEGR(&p010Img, &yuv420Img, &jpegImg, tf, &jpegImgR);

                } else if (muxSwitch == 3) { // api 3

                    jpegImgR.length = 0;

                    status = jpegHdr.encodeJPEGR(&p010Img, &jpegImg, tf, &jpegImgR);

                } else if (muxSwitch == 4) { // api 4

                    jpegImgR.length = 0;

                    JpegEncoderHelper gainMapEncoder;

                    if (gainMapEncoder.compressImage(reinterpret_cast<uint8_t*>(grayImg.data),

                                                     nullptr, grayImg.width, grayImg.height,

                                                     grayImg.width, 0, quality, nullptr, 0)) {

                        jpegGainMap.length = gainMapEncoder.getCompressedImageSize();

                        jpegGainMap.maxLength = jpegImg.length;

                        jpegGainMap.data = gainMapEncoder.getCompressedImagePtr();

                        jpegGainMap.colorGamut = ULTRAHDR_COLORGAMUT_UNSPECIFIED;

                        ultrahdr_metadata_struct metadata;

                        metadata.version = kJpegrVersion;

                        if (tf == ULTRAHDR_TF_HLG) {

                            metadata.maxContentBoost = kHlgMaxNits / kSdrWhiteNits;

                        } else if (tf == ULTRAHDR_TF_PQ) {

                            metadata.maxContentBoost = kPqMaxNits / kSdrWhiteNits;

                        } else {

                            metadata.maxContentBoost = 1.0f;

                        }

                        metadata.minContentBoost = 1.0f;

                        metadata.gamma = 1.0f;

                        metadata.offsetSdr = 0.0f;

                        metadata.offsetHdr = 0.0f;

                        metadata.hdrCapacityMin = 1.0f;

                        metadata.hdrCapacityMax = metadata.maxContentBoost;

                        status = jpegHdr.encodeJPEGR(&jpegImg, &jpegGainMap, &metadata, &jpegImgR);

                    }

                }

            }

        }

        if (status == android::OK) {

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

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

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

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

            if (status == android::OK) {

                size_t outSize =

                        info.width * info.height * ((of == ULTRAHDR_OUTPUT_HDR_LINEAR) ? 8 : 4);

                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);

        }

    }

}



extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {

    UltraHdrEncFuzzer fuzzHandle(data, size);

    fuzzHandle.process();

    return 0;

}