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

Commit b01ea858 authored by Lajos Molnar's avatar Lajos Molnar Committed by Automerger Merge Worker
Browse files

Merge changes I597f7405,I09b65692 am: d68b9c59 am: 5cd45d95 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1457145

Change-Id: I3cc314b96f7d7dd55e09aec18997a24180434800
parents 6e4c2aee 5cd45d95

media/codec2/core/include/C2Work.h

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ struct C2FrameData { 
    //< for initial work item, these may also come from the parser - if provided

    //< for output buffers, these are the responses to requestedInfos

    std::vector<std::unique_ptr<C2Param>>      configUpdate;

    std::vector<std::shared_ptr<C2InfoBuffer>> infoBuffers;

    std::vector<C2InfoBuffer> infoBuffers;

};



struct C2Worklet {

media/codec2/hidl/1.0/utils/types.cpp

+2 −7
Original line number Diff line number Diff line
@@ -943,14 +943,9 @@ bool objcpy(FrameData* d, const C2FrameData& s, 


    d->infoBuffers.resize(s.infoBuffers.size());

    i = 0;

    for (const std::shared_ptr<C2InfoBuffer>& sInfoBuffer : s.infoBuffers) {

    for (const C2InfoBuffer& sInfoBuffer : s.infoBuffers) {

        InfoBuffer& dInfoBuffer = d->infoBuffers[i++];

        if (!sInfoBuffer) {

            LOG(ERROR) << "Null C2FrameData::infoBuffers["

                       << i - 1 << "].";

            return false;

        }

        if (!objcpy(&dInfoBuffer, *sInfoBuffer,

        if (!objcpy(&dInfoBuffer, sInfoBuffer,

                bufferPoolSender, baseBlocks, baseBlockIndices)) {

            LOG(ERROR) << "Invalid C2FrameData::infoBuffers["

                       << i - 1 << "].";