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

Commit dbfb32e9 authored by Jamie Gennis's avatar Jamie Gennis
Browse files

Fix the non-ANW video decode path. 

The BufferInfo::mOwnedByNativeWindow field was not being initialized in
the non-ANativeWindow video decode path.

Change-Id: If2f6249902a08690f6c62ef30791b9979050c0e5
parent e6aaa3da

media/libstagefright/OMXCodec.cpp

+4 −2
Original line number Diff line number Diff line
@@ -744,7 +744,8 @@ status_t OMXCodec::configureCodec(const sp<MetaData> &meta, uint32_t flags) { 
        mQuirks &= ~kOutputBuffersAreUnreadable;

    }



    if (!mIsEncoder

    if (mNativeWindow != NULL

        && !mIsEncoder

        && !strncasecmp(mMIME, "video/", 6)

        && !strncmp(mComponentName, "OMX.", 4)) {

        status_t err = initNativeWindow();
@@ -1606,7 +1607,7 @@ status_t OMXCodec::allocateBuffers() { 
}



status_t OMXCodec::allocateBuffersOnPort(OMX_U32 portIndex) {

    if (mNativeWindow != 0 && portIndex == kPortIndexOutput) {

    if (mNativeWindow != NULL && portIndex == kPortIndexOutput) {

        return allocateOutputBuffersFromNativeWindow();

    }
@@ -1676,6 +1677,7 @@ status_t OMXCodec::allocateBuffersOnPort(OMX_U32 portIndex) { 


        info.mBuffer = buffer;

        info.mOwnedByComponent = false;

        info.mOwnedByNativeWindow = false;

        info.mMem = mem;

        info.mMediaBuffer = NULL;