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

Commit 2fbcb4fe authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "media: Fix graphic buffer leak." am: 4bcdf599 

am: 4f9ed8b5

Change-Id: Ia795ea0637db79bf00050fb5856ebcde1382059d
parents 893049d5 4f9ed8b5

media/libstagefright/omx/GraphicBufferSource.cpp

+2 −1
Original line number Diff line number Diff line
@@ -921,11 +921,12 @@ int GraphicBufferSource::findMatchingCodecBuffer_l( 
 * frameNum: frame number of the frame being released

 * buffer: GraphicBuffer pointer to release (note this must not be & as we

 *         will clear the original mBufferSlot in persistent case)

 *         Use NOLINT to supress warning on the copy of 'buffer'.

 * fence: fence of the frame being released

 */

void GraphicBufferSource::releaseBuffer(

        int &id, uint64_t frameNum,

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

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

    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();