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

Commit 1a7e46db authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "MediaCodec: Pass missing C2Info for MediaCodecLinearBlock." am: 338f4e1d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517717

Change-Id: Ice1fbafbe0393972f8d4f1900c271f5a576f1bcf
parents 1d393044 338f4e1d

media/jni/android_media_MediaCodecLinearBlock.h

+8 −1
Original line number Diff line number Diff line
@@ -49,7 +49,14 @@ struct JMediaCodecLinearBlock { 
            if (offset == 0 && size == block.capacity()) {

                return mBuffer;

            }

            return C2Buffer::CreateLinearBuffer(block.subBlock(offset, size));



            std::shared_ptr<C2Buffer> buffer =

                C2Buffer::CreateLinearBuffer(block.subBlock(offset, size));

            for (const std::shared_ptr<const C2Info> &info : mBuffer->info()) {

                std::shared_ptr<C2Param> param = std::move(C2Param::Copy(*info));

                buffer->setInfo(std::static_pointer_cast<C2Info>(param));

            }

            return buffer;

        }

        if (mBlock) {

            return C2Buffer::CreateLinearBuffer(mBlock->share(offset, size, C2Fence{}));