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

Commit 63057d22 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh
Browse files

resolve merge conflicts of 4646bb6d to master 

Change-Id: Ic13f334730af2eea1b4c8d38c158deadd0789a1c
parents 870f23ff 4646bb6d

media/libstagefright/omx/GraphicBufferSource.cpp

+2 −1
Original line number Diff line number Diff line
@@ -861,11 +861,12 @@ int GraphicBufferSource::findMatchingCodecBuffer_l(IOMX::buffer_id bufferID) { 
 * 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

    ALOGV("releaseBuffer: slot=%d", id);

    if (mIsPersistent) {

        mConsumer->detachBuffer(id);