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

Commit 0c9fc361 authored by Valerie Hau's avatar Valerie Hau
Browse files

Modifying Gralloc to handle bytesPerPixel and bytesPerStride 

Bug: 120493579
Test: build, boot
Change-Id: I1fe5acc17389db6d57529d2e120ab6e1f3715705
parent 502fe80d

libs/ui/Gralloc2.cpp

+8 −1
Original line number Diff line number Diff line
@@ -227,7 +227,14 @@ void Gralloc2Mapper::getTransportSize(buffer_handle_t bufferHandle, uint32_t* ou 
}



status_t Gralloc2Mapper::lock(buffer_handle_t bufferHandle, uint64_t usage, const Rect& bounds,

                              int acquireFence, void** outData) const {

                              int acquireFence, void** outData, int32_t* outBytesPerPixel,

                              int32_t* outBytesPerStride) const {

    if (outBytesPerPixel) {

        *outBytesPerPixel = -1;

    }

    if (outBytesPerStride) {

        *outBytesPerStride = -1;

    }

    auto buffer = const_cast<native_handle_t*>(bufferHandle);



    IMapper::Rect accessRegion = sGralloc2Rect(bounds);

libs/ui/Gralloc3.cpp

+10 −2
Original line number Diff line number Diff line
@@ -192,7 +192,8 @@ void Gralloc3Mapper::getTransportSize(buffer_handle_t bufferHandle, uint32_t* ou 
}



status_t Gralloc3Mapper::lock(buffer_handle_t bufferHandle, uint64_t usage, const Rect& bounds,

                              int acquireFence, void** outData) const {

                              int acquireFence, void** outData, int32_t* outBytesPerPixel,

                              int32_t* outBytesPerStride) const {

    auto buffer = const_cast<native_handle_t*>(bufferHandle);



    IMapper::Rect accessRegion = sGralloc3Rect(bounds);
@@ -208,12 +209,19 @@ status_t Gralloc3Mapper::lock(buffer_handle_t bufferHandle, uint64_t usage, cons 


    Error error;

    auto ret = mMapper->lock(buffer, usage, accessRegion, acquireFenceHandle,

                             [&](const auto& tmpError, const auto& tmpData) {

                             [&](const auto& tmpError, const auto& tmpData,

                                 const auto& tmpBytesPerPixel, const auto& tmpBytesPerStride) {

                                 error = tmpError;

                                 if (error != Error::NONE) {

                                     return;

                                 }

                                 *outData = tmpData;

                                 if (outBytesPerPixel) {

                                     *outBytesPerPixel = tmpBytesPerPixel;

                                 }

                                 if (outBytesPerStride) {

                                     *outBytesPerStride = tmpBytesPerStride;

                                 }

                             });



    // we own acquireFence even on errors

libs/ui/GraphicBuffer.cpp

+8 −3
Original line number Diff line number Diff line
@@ -252,7 +252,10 @@ status_t GraphicBuffer::lock(uint32_t inUsage, const Rect& rect, void** vaddr) 
                width, height);

        return BAD_VALUE;

    }

    status_t res = getBufferMapper().lock(handle, inUsage, rect, vaddr);

    int32_t bytesPerPixel, bytesPerStride;



    status_t res =

            getBufferMapper().lock(handle, inUsage, rect, vaddr, &bytesPerPixel, &bytesPerStride);

    return res;

}
@@ -306,8 +309,10 @@ status_t GraphicBuffer::lockAsync(uint64_t inProducerUsage, 
                width, height);

        return BAD_VALUE;

    }

    status_t res = getBufferMapper().lockAsync(handle, inProducerUsage,

            inConsumerUsage, rect, vaddr, fenceFd);



    int32_t bytesPerPixel, bytesPerStride;

    status_t res = getBufferMapper().lockAsync(handle, inProducerUsage, inConsumerUsage, rect,

                                               vaddr, fenceFd, &bytesPerPixel, &bytesPerStride);

    return res;

}

libs/ui/GraphicBufferMapper.cpp

+15 −13
Original line number Diff line number Diff line
@@ -102,10 +102,10 @@ status_t GraphicBufferMapper::freeBuffer(buffer_handle_t handle) 
    return NO_ERROR;

}



status_t GraphicBufferMapper::lock(buffer_handle_t handle, uint32_t usage,

        const Rect& bounds, void** vaddr)

{

    return lockAsync(handle, usage, bounds, vaddr, -1);

status_t GraphicBufferMapper::lock(buffer_handle_t handle, uint32_t usage, const Rect& bounds,

                                   void** vaddr, int32_t* outBytesPerPixel,

                                   int32_t* outBytesPerStride) {

    return lockAsync(handle, usage, bounds, vaddr, -1, outBytesPerPixel, outBytesPerStride);

}



status_t GraphicBufferMapper::lockYCbCr(buffer_handle_t handle, uint32_t usage,
@@ -125,21 +125,23 @@ status_t GraphicBufferMapper::unlock(buffer_handle_t handle) 
    return error;

}



status_t GraphicBufferMapper::lockAsync(buffer_handle_t handle,

        uint32_t usage, const Rect& bounds, void** vaddr, int fenceFd)

{

    return lockAsync(handle, usage, usage, bounds, vaddr, fenceFd);

status_t GraphicBufferMapper::lockAsync(buffer_handle_t handle, uint32_t usage, const Rect& bounds,

                                        void** vaddr, int fenceFd, int32_t* outBytesPerPixel,

                                        int32_t* outBytesPerStride) {

    return lockAsync(handle, usage, usage, bounds, vaddr, fenceFd, outBytesPerPixel,

                     outBytesPerStride);

}



status_t GraphicBufferMapper::lockAsync(buffer_handle_t handle,

        uint64_t producerUsage, uint64_t consumerUsage, const Rect& bounds,

        void** vaddr, int fenceFd)

{

status_t GraphicBufferMapper::lockAsync(buffer_handle_t handle, uint64_t producerUsage,

                                        uint64_t consumerUsage, const Rect& bounds, void** vaddr,

                                        int fenceFd, int32_t* outBytesPerPixel,

                                        int32_t* outBytesPerStride) {

    ATRACE_CALL();



    const uint64_t usage = static_cast<uint64_t>(

            android_convertGralloc1To0Usage(producerUsage, consumerUsage));

    return mMapper->lock(handle, usage, bounds, fenceFd, vaddr);

    return mMapper->lock(handle, usage, bounds, fenceFd, vaddr, outBytesPerPixel,

                         outBytesPerStride);

}



status_t GraphicBufferMapper::lockAsyncYCbCr(buffer_handle_t handle,

libs/ui/include/ui/Gralloc.h

+2 −1
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ public: 
    // The ownership of acquireFence is always transferred to the callee, even

    // on errors.

    virtual status_t lock(buffer_handle_t bufferHandle, uint64_t usage, const Rect& bounds,

                          int acquireFence, void** outData) const = 0;

                          int acquireFence, void** outData, int32_t* outBytesPerPixel,

                          int32_t* outBytesPerStride) const = 0;



    // The ownership of acquireFence is always transferred to the callee, even

    // on errors.