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

Commit 9c5aaf72 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "gralloc4: fix PlaneLayout encode typecasting" am: 05288dde am:... 

Merge "gralloc4: fix PlaneLayout encode typecasting" am: 05288dde am: ed13f4b2 am: f7c5d663 am: 5b3ce224 am: f417447b

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

Change-Id: Ifd194520408273e0ac3c7350ebb28293b28a1e41
parents ce25ac4f f417447b

libs/gralloc/types/Gralloc4.cpp

+8 −8
Original line number Diff line number Diff line
@@ -706,35 +706,35 @@ status_t encodePlaneLayout(const PlaneLayout& input, OutputHidlVec* output) { 
        return err;

    }



    err = encodeInteger<int64_t>(static_cast<int32_t>(input.offsetInBytes), output);

    err = encodeInteger<int64_t>(static_cast<int64_t>(input.offsetInBytes), output);

    if (err) {

        return err;

    }

    err = encodeInteger<int64_t>(static_cast<int32_t>(input.sampleIncrementInBits), output);

    err = encodeInteger<int64_t>(static_cast<int64_t>(input.sampleIncrementInBits), output);

    if (err) {

        return err;

    }

    err = encodeInteger<int64_t>(static_cast<int32_t>(input.strideInBytes), output);

    err = encodeInteger<int64_t>(static_cast<int64_t>(input.strideInBytes), output);

    if (err) {

        return err;

    }

    err = encodeInteger<int64_t>(static_cast<int32_t>(input.widthInSamples), output);

    err = encodeInteger<int64_t>(static_cast<int64_t>(input.widthInSamples), output);

    if (err) {

        return err;

    }

    err = encodeInteger<int64_t>(static_cast<int32_t>(input.heightInSamples), output);

    err = encodeInteger<int64_t>(static_cast<int64_t>(input.heightInSamples), output);

    if (err) {

        return err;

    }

    err = encodeInteger<int64_t>(static_cast<int32_t>(input.totalSizeInBytes), output);

    err = encodeInteger<int64_t>(static_cast<int64_t>(input.totalSizeInBytes), output);

    if (err) {

        return err;

    }

    err = encodeInteger<int64_t>(static_cast<int32_t>(input.horizontalSubsampling), output);

    err = encodeInteger<int64_t>(static_cast<int64_t>(input.horizontalSubsampling), output);

    if (err) {

        return err;

    }

    return encodeInteger<int64_t>(static_cast<int32_t>(input.verticalSubsampling), output);

    return encodeInteger<int64_t>(static_cast<int64_t>(input.verticalSubsampling), output);

}



status_t decodePlaneLayout(InputHidlVec* input, PlaneLayout* output) {