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

Commit 2f26d6e3 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "Zero-initialize HIDL structs before passing" into oc-dev 

am: 8b5a2218

Change-Id: I70bde19a4d39edfca7ae923e0863e19447ab0795
parents e27023e7 8b5a2218

media/libstagefright/omx/1.0/WGraphicBufferProducer.cpp

+12 −12
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ Return<void> TWGraphicBufferProducer::requestBuffer( 
        int32_t slot, requestBuffer_cb _hidl_cb) {

    sp<GraphicBuffer> buf;

    status_t status = mBase->requestBuffer(slot, &buf);

    AnwBuffer anwBuffer;

    AnwBuffer anwBuffer{};

    wrapAs(&anwBuffer, *buf);

    _hidl_cb(static_cast<int32_t>(status), anwBuffer);

    return Void();
@@ -60,7 +60,7 @@ Return<void> TWGraphicBufferProducer::dequeueBuffer( 
        uint32_t width, uint32_t height,

        PixelFormat format, uint32_t usage,

        bool getFrameTimestamps, dequeueBuffer_cb _hidl_cb) {

    int slot;

    int slot{};

    sp<Fence> fence;

    ::android::FrameEventHistoryDelta outTimestamps;

    status_t status = mBase->dequeueBuffer(
@@ -68,8 +68,8 @@ Return<void> TWGraphicBufferProducer::dequeueBuffer( 
            width, height,

            static_cast<::android::PixelFormat>(format), usage,

            getFrameTimestamps ? &outTimestamps : nullptr);

    hidl_handle tFence;

    FrameEventHistoryDelta tOutTimestamps;

    hidl_handle tFence{};

    FrameEventHistoryDelta tOutTimestamps{};



    native_handle_t* nh = nullptr;

    if ((fence == nullptr) || !wrapAs(&tFence, &nh, *fence)) {
@@ -117,8 +117,8 @@ Return<void> TWGraphicBufferProducer::detachNextBuffer( 
    sp<GraphicBuffer> outBuffer;

    sp<Fence> outFence;

    status_t status = mBase->detachNextBuffer(&outBuffer, &outFence);

    AnwBuffer tBuffer;

    hidl_handle tFence;

    AnwBuffer tBuffer{};

    hidl_handle tFence{};



    if (outBuffer == nullptr) {

        LOG(ERROR) << "TWGraphicBufferProducer::detachNextBuffer - "
@@ -160,7 +160,7 @@ Return<void> TWGraphicBufferProducer::attachBuffer( 
Return<void> TWGraphicBufferProducer::queueBuffer(

        int32_t slot, const QueueBufferInput& input,

        queueBuffer_cb _hidl_cb) {

    QueueBufferOutput tOutput;

    QueueBufferOutput tOutput{};

    BGraphicBufferProducer::QueueBufferInput lInput(

            0, false, HAL_DATASPACE_UNKNOWN,

            ::android::Rect(0, 0, 1, 1),
@@ -222,7 +222,7 @@ Return<void> TWGraphicBufferProducer::connect( 
            producerControlledByApp,

            &lOutput);



    QueueBufferOutput tOutput;

    QueueBufferOutput tOutput{};

    std::vector<std::vector<native_handle_t*> > nhAA;

    if (!wrapAs(&tOutput, &nhAA, lOutput)) {

        LOG(ERROR) << "TWGraphicBufferProducer::connect - "
@@ -294,11 +294,11 @@ Return<void> TWGraphicBufferProducer::getLastQueuedBuffer( 
    status_t status = mBase->getLastQueuedBuffer(

            &lOutBuffer, &lOutFence, lOutTransformMatrix);



    AnwBuffer tOutBuffer;

    AnwBuffer tOutBuffer{};

    if (lOutBuffer != nullptr) {

        wrapAs(&tOutBuffer, *lOutBuffer);

    }

    hidl_handle tOutFence;

    hidl_handle tOutFence{};

    native_handle_t* nh = nullptr;

    if ((lOutFence == nullptr) || !wrapAs(&tOutFence, &nh, *lOutFence)) {

        LOG(ERROR) << "TWGraphicBufferProducer::getLastQueuedBuffer - "
@@ -321,7 +321,7 @@ Return<void> TWGraphicBufferProducer::getFrameTimestamps( 
    ::android::FrameEventHistoryDelta lDelta;

    mBase->getFrameTimestamps(&lDelta);



    FrameEventHistoryDelta tDelta;

    FrameEventHistoryDelta tDelta{};

    std::vector<std::vector<native_handle_t*> > nhAA;

    if (!wrapAs(&tDelta, &nhAA, lDelta)) {

        LOG(ERROR) << "TWGraphicBufferProducer::getFrameTimestamps - "
@@ -340,7 +340,7 @@ Return<void> TWGraphicBufferProducer::getFrameTimestamps( 
}



Return<void> TWGraphicBufferProducer::getUniqueId(getUniqueId_cb _hidl_cb) {

    uint64_t outId;

    uint64_t outId{};

    status_t status = mBase->getUniqueId(&outId);

    _hidl_cb(static_cast<int32_t>(status), outId);

    return Void();