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

Commit 8bd56112 authored by Wonsik Kim's avatar Wonsik Kim Committed by Android (Google) Code Review
Browse files

Merge "video: Disconnect from native window for secure case"

parents 699921eb 08b5f8a2

media/libstagefright/ACodec.cpp

+14 −1
Original line number Diff line number Diff line
@@ -1310,7 +1310,7 @@ status_t ACodec::allocateOutputMetadataBuffers() { 
    OMX_U32 bufferCount, bufferSize, minUndequeuedBuffers;

    status_t err = configureOutputBuffersFromNativeWindow(

            &bufferCount, &bufferSize, &minUndequeuedBuffers,

            false /* preregister */);

            mFlags & kFlagPreregisterMetadataBuffers /* preregister */);

    if (err != OK)

        return err;

    mNumUndequeuedBuffers = minUndequeuedBuffers;
@@ -1896,6 +1896,19 @@ status_t ACodec::configureCodec( 
            setPortMode(kPortIndexInput, IOMX::kPortModePresetByteBuffer);

            err = OK; // ignore error for now

        }



        OMX_INDEXTYPE index;

        if (mOMXNode->getExtensionIndex(

                "OMX.google.android.index.preregisterMetadataBuffers", &index) == OK) {

            OMX_CONFIG_BOOLEANTYPE param;

            InitOMXParams(&param);

            param.bEnabled = OMX_FALSE;

            if (mOMXNode->getParameter(index, &param, sizeof(param)) == OK) {

                if (param.bEnabled == OMX_TRUE) {

                    mFlags |= kFlagPreregisterMetadataBuffers;

                }

            }

        }

    }

    if (haveNativeWindow) {

        sp<ANativeWindow> nativeWindow =

media/libstagefright/include/media/stagefright/ACodec.h

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ private: 
        kFlagIsSecure                                 = 1,

        kFlagPushBlankBuffersToNativeWindowOnShutdown = 2,

        kFlagIsGrallocUsageProtected                  = 4,

        kFlagPreregisterMetadataBuffers               = 8,

    };



    enum {