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

Commit 2a2b768e authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "stagefright: don't use allocateBuffer for encoder metadata mode" into nyc-dev

parents 28b86916 e33d922f

media/libstagefright/ACodec.cpp

+1 −2
Original line number Diff line number Diff line
@@ -834,8 +834,7 @@ status_t ACodec::allocateBuffersOnPort(OMX_U32 portIndex) { 
                        ? kRequiresAllocateBufferOnInputPorts

                        : kRequiresAllocateBufferOnOutputPorts;



                if ((portIndex == kPortIndexInput && (mFlags & kFlagIsSecure))

                        || (portIndex == kPortIndexOutput && usingMetadataOnEncoderOutput())) {

                if (portIndex == kPortIndexInput && (mFlags & kFlagIsSecure)) {

                    mem.clear();



                    void *ptr;