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

Commit 00f4a983 authored by Jeff Tinker's avatar Jeff Tinker Committed by android-build-merger
Browse files

Merge "Fix mmap size 0 errors" into oc-dev am: d72bb124 

am: ea098bf5

Change-Id: Iacdad15953cf6e391b6148666ca1a240095066fd
parents e68f2a7c ea098bf5

media/libstagefright/ACodecBufferChannel.cpp

+4 −2
Original line number Diff line number Diff line
@@ -300,9 +300,11 @@ void ACodecBufferChannel::setInputBufferArray(const std::vector<BufferAndId> &ar 
                });

        size_t destinationBufferSize = maxSize;

        size_t heapSize = totalSize + destinationBufferSize;

        if (heapSize > 0) {

            mDealer = makeMemoryDealer(heapSize);

            mDecryptDestination = mDealer->allocate(destinationBufferSize);

        }

    }

    std::vector<const BufferInfo> inputBuffers;

    for (const BufferAndId &elem : array) {

        sp<IMemory> sharedEncryptedBuffer;