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

Commit ba8ec341 authored by Michael Lane's avatar Michael Lane Committed by android-build-merger
Browse files

Merge "stagefright: allow secure audio input buffer" into oc-mr1-dev 

am: 14bedfd0

Change-Id: I17e79efb252bbaf0983570bdb1650143eb64f9b2
parents 717f4643 14bedfd0

media/libstagefright/ACodec.cpp

+8 −9
Original line number Diff line number Diff line
@@ -1866,7 +1866,7 @@ status_t ACodec::configureCodec( 
            mFlags |= kFlagIsGrallocUsageProtected;

            mFlags |= kFlagPushBlankBuffersToNativeWindowOnShutdown;

        }



    }

    if (mFlags & kFlagIsSecure) {

        // use native_handles for secure input buffers

        err = setPortMode(kPortIndexInput, IOMX::kPortModePresetSecureBuffer);
@@ -1877,7 +1877,6 @@ status_t ACodec::configureCodec( 
            err = OK; // ignore error for now

        }

    }

    }

    if (haveNativeWindow) {

        sp<ANativeWindow> nativeWindow =

            static_cast<ANativeWindow *>(static_cast<Surface *>(obj.get()));