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

Commit 3bc41e29 authored by Hangyu Kuang's avatar Hangyu Kuang Committed by Android (Google) Code Review
Browse files

Merge "media: Fix graphic buffer leak."

parents e12e4065 50c92866

media/libstagefright/omx/GraphicBufferSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -929,7 +929,7 @@ int GraphicBufferSource::findMatchingCodecBuffer_l( 
 */

void GraphicBufferSource::releaseBuffer(

        int &id, uint64_t frameNum,

        const sp<GraphicBuffer> &buffer, const sp<Fence> &fence) {

        const sp<GraphicBuffer> buffer, const sp<Fence> &fence) {

    if (mIsPersistent) {

        mConsumer->detachBuffer(id);

        mBufferSlot[id] = NULL;

media/libstagefright/omx/GraphicBufferSource.h

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ private: 
    // Release buffer to the consumer

    void releaseBuffer(

            int &id, uint64_t frameNum,

            const sp<GraphicBuffer> &buffer, const sp<Fence> &fence);

            const sp<GraphicBuffer> buffer, const sp<Fence> &fence);



    void setLatestBuffer_l(const BufferItem &item, bool dropped);

    bool repeatLatestBuffer_l();