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

Commit 10d17fdd authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Don't allow using or allocating a buffer after the first state transition" into oc-dev 

am: c24deb62

Change-Id: Idd650cc1704e5b75445b5b0d4f068c7a8b08562b
parents fbf83f4a c24deb62

media/libstagefright/omx/OMXNodeInstance.cpp

+10 −0
Original line number Diff line number Diff line
@@ -1033,6 +1033,11 @@ status_t OMXNodeInstance::useBuffer( 
    }



    Mutex::Autolock autoLock(mLock);

    if (!mSailed) {

        ALOGE("b/35467458");

        android_errorWriteLog(0x534e4554, "35467458");

        return BAD_VALUE;

    }



    switch (omxBuffer.mBufferType) {

        case OMXBuffer::kBufferTypePreset:
@@ -1470,6 +1475,11 @@ status_t OMXNodeInstance::allocateSecureBuffer( 


    Mutex::Autolock autoLock(mLock);



    if (!mSailed) {

        ALOGE("b/35467458");

        android_errorWriteLog(0x534e4554, "35467458");

        return BAD_VALUE;

    }

    BufferMeta *buffer_meta = new BufferMeta(portIndex);



    OMX_BUFFERHEADERTYPE *header;