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

Commit 34821f56 authored by Lajos Molnar's avatar Lajos Molnar
Browse files

codec2: switch HAL passing of C2FrameDate to clarified C2InfoBuffer 

Update HAL scaffolding for clarified C2FrameData/C2InfoBuffer. HAL
does not actually pass C2InfoBuffer, but was accessing the individual
C2InfoBuffer objects that are now without shared_ptr.

Change-Id: I597f74050887a484cb2619224b50c0a784269cff
parent d5bc37af

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 << "].";