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

Commit 0d2b34b4 authored by Jason Macnak's avatar Jason Macnak Committed by Automerger Merge Worker
Browse files

Merge "Revert "Updates encoding/decoding of optional metadata"" into tm-dev am: e8207cf8 

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



Change-Id: Ieffe00b3258ec07c0a081511c53ab9da586a09eb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 18c6fcf6 e8207cf8

libs/gralloc/types/Gralloc4.cpp

+34 −89
Original line number Diff line number Diff line
@@ -195,35 +195,6 @@ using ErrorHandler = void(*)(T*); 
status_t encodeMetadataType(const MetadataType& input, OutputHidlVec* output);

status_t validateMetadataType(InputHidlVec* input, const MetadataType& expectedMetadataType);



/**

 * Private helper functions

 */

template <class T>

status_t encodeInteger(const T& input, OutputHidlVec* output) {

    static_assert(std::is_same<T, uint32_t>::value || std::is_same<T, int32_t>::value ||

                  std::is_same<T, uint64_t>::value || std::is_same<T, int64_t>::value ||

                  std::is_same<T, float>::value || std::is_same<T, double>::value);

    if (!output) {

        return BAD_VALUE;

    }



    const uint8_t* tmp = reinterpret_cast<const uint8_t*>(&input);

    return output->encode(tmp, sizeof(input));

}



template <class T>

status_t decodeInteger(InputHidlVec* input, T* output) {

    static_assert(std::is_same<T, uint32_t>::value || std::is_same<T, int32_t>::value ||

                  std::is_same<T, uint64_t>::value || std::is_same<T, int64_t>::value ||

                  std::is_same<T, float>::value || std::is_same<T, double>::value);

    if (!output) {

        return BAD_VALUE;

    }



    uint8_t* tmp = reinterpret_cast<uint8_t*>(output);

    return input->decode(tmp, sizeof(*output));

}



/**

 * encode/encodeMetadata are the main encoding functions. They take in T and uses the encodeHelper

 * function to turn T into the hidl_vec byte stream.
@@ -280,46 +251,11 @@ status_t encodeMetadata(const MetadataType& metadataType, const T& input, hidl_v 
template <class T>

status_t encodeOptionalMetadata(const MetadataType& metadataType, const std::optional<T>& input,

                        hidl_vec<uint8_t>* output, EncodeHelper<T> encodeHelper) {

    OutputHidlVec outputHidlVec{output};



    status_t err = encodeMetadataType(metadataType, &outputHidlVec);

    if (err) {

        return err;

    }



    err = encodeInteger<uint32_t>(input.has_value() ? 1 : 0, &outputHidlVec);

    if (err) {

        return err;

    }



    if (input) {

        err = encodeHelper(*input, &outputHidlVec);

        if (err) {

            return err;

        }

    }



    err = outputHidlVec.resize();

    if (err) {

        return err;

    }



    err = encodeMetadataType(metadataType, &outputHidlVec);

    if (err) {

        return err;

    }



    err = encodeInteger<uint32_t>(input.has_value() ? 1 : 0, &outputHidlVec);

    if (err) {

        return err;

    }



    if (input) {

        return encodeHelper(*input, &outputHidlVec);

    }



    if (!input) {

        return NO_ERROR;

    }

    return encodeMetadata(metadataType, *input, output, encodeHelper);

}



/**

 * decode/decodeMetadata are the main decoding functions. They take in a hidl_vec and use the
@@ -379,36 +315,45 @@ status_t decodeOptionalMetadata(const MetadataType& metadataType, const hidl_vec 
    if (!output) {

        return BAD_VALUE;

    }



    InputHidlVec inputHidlVec{&input};



    status_t err = validateMetadataType(&inputHidlVec, metadataType);

    if (err) {

        return err;

    if (input.size() <= 0) {

        output->reset();

        return NO_ERROR;

    }

    T tmp;

    status_t err = decodeMetadata(metadataType, input, &tmp, decodeHelper);

    if (!err) {

        *output = tmp;

    }



    uint32_t present = 0;

    err = decodeInteger<uint32_t>(&inputHidlVec, &present);

    if (err) {

    return err;

}



    if (present) {

        T tmp;

        err = decodeHelper(&inputHidlVec, &tmp);

        if (err) {

            return err;

/**

 * Private helper functions

 */

template <class T>

status_t encodeInteger(const T& input, OutputHidlVec* output) {

    static_assert(std::is_same<T, uint32_t>::value || std::is_same<T, int32_t>::value ||

                  std::is_same<T, uint64_t>::value || std::is_same<T, int64_t>::value ||

                  std::is_same<T, float>::value || std::is_same<T, double>::value);

    if (!output) {

        return BAD_VALUE;

    }



        *output = tmp;

    const uint8_t* tmp = reinterpret_cast<const uint8_t*>(&input);

    return output->encode(tmp, sizeof(input));

}



    err = inputHidlVec.hasRemainingData();

    if (err) {

template <class T>

status_t decodeInteger(InputHidlVec* input, T* output) {

    static_assert(std::is_same<T, uint32_t>::value || std::is_same<T, int32_t>::value ||

                  std::is_same<T, uint64_t>::value || std::is_same<T, int64_t>::value ||

                  std::is_same<T, float>::value || std::is_same<T, double>::value);

    if (!output) {

        return BAD_VALUE;

    }



    return NO_ERROR;

    uint8_t* tmp = reinterpret_cast<uint8_t*>(output);

    return input->decode(tmp, sizeof(*output));

}



status_t encodeString(const std::string& input, OutputHidlVec* output) {