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

Commit f98d29f2 authored by Nick Desaulniers's avatar Nick Desaulniers Committed by android-build-merger
Browse files

Merge "[media][sfplugin] fix -Wdangling-gsl" am: d3dd89ca am: 548b9b40 am: bdbe8adc 

am: a55de24a

Change-Id: Iacdb587366e13e4177d6071f90303ff227946f10
parents bfc674d8 a55de24a

media/codec2/sfplugin/CCodecBuffers.cpp

+4 −3
Original line number Diff line number Diff line
@@ -878,9 +878,10 @@ void OutputBuffersArray::realloc(const std::shared_ptr<C2Buffer> &c2buffer) { 
    switch (c2buffer->data().type()) {

        case C2BufferData::LINEAR: {

            uint32_t size = kLinearBufferSize;

            const C2ConstLinearBlock &block = c2buffer->data().linearBlocks().front();

            if (block.size() < kMaxLinearBufferSize / 2) {

                size = block.size() * 2;

            const std::vector<C2ConstLinearBlock> &linear_blocks = c2buffer->data().linearBlocks();

            const uint32_t block_size = linear_blocks.front().size();

            if (block_size < kMaxLinearBufferSize / 2) {

                size = block_size * 2;

            } else {

                size = kMaxLinearBufferSize;

            }