Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev (922ad618) · Commits · e / os / android_frameworks_av

media/libstagefright/omx/OMXNodeInstance.cpp

+18 −0

Original line number	Diff line number	Diff line
		@@ -574,6 +574,12 @@ status_t OMXNodeInstance::useBuffer(
		// We do not support metadata mode changes past buffer allocation
		mSailed = true;

		if (!mSailed) {
		ALOGE("b/35467458");
		android_errorWriteLog(0x534e4554, "35467458");
		return BAD_VALUE;
		}

		// metadata buffers are not connected cross process
		BufferMeta *buffer_meta;
		bool isMeta = mUsingMetadata[portIndex];
		@@ -837,6 +843,12 @@ status_t OMXNodeInstance::allocateBuffer(
		// We do not support metadata mode changes past buffer allocation
		mSailed = true;

		if (!mSailed) {
		ALOGE("b/35467458");
		android_errorWriteLog(0x534e4554, "35467458");
		return BAD_VALUE;
		}

		BufferMeta *buffer_meta = new BufferMeta(size, portIndex);

		OMX_BUFFERHEADERTYPE *header;
		@@ -880,6 +892,12 @@ status_t OMXNodeInstance::allocateBufferWithBackup(
		// We do not support metadata mode changes past buffer allocation
		mSailed = true;

		if (!mSailed) {
		ALOGE("b/35467458");
		android_errorWriteLog(0x534e4554, "35467458");
		return BAD_VALUE;
		}

		// metadata buffers are not connected cross process
		bool isMeta = mUsingMetadata[portIndex];
		bool copy = !(crossProcess && isMeta);