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

media/libstagefright/omx/OMXNodeInstance.cpp

+18 −0

Original line number	Original line	Diff line number	Diff line
	@@ -792,6 +792,12 @@ status_t OMXNodeInstance::useBuffer(
	return BAD_VALUE;		return BAD_VALUE;
	}		}

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

	// metadata buffers are not connected cross process		// metadata buffers are not connected cross process
	// use a backup buffer instead of the actual buffer		// use a backup buffer instead of the actual buffer
	BufferMeta *buffer_meta;		BufferMeta *buffer_meta;
	@@ -1223,6 +1229,12 @@ status_t OMXNodeInstance::allocateSecureBuffer(

	Mutex::Autolock autoLock(mLock);		Mutex::Autolock autoLock(mLock);

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

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

	OMX_BUFFERHEADERTYPE *header;		OMX_BUFFERHEADERTYPE *header;
	@@ -1278,6 +1290,12 @@ status_t OMXNodeInstance::allocateBufferWithBackup(
	return BAD_VALUE;		return BAD_VALUE;
	}		}

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

	// metadata buffers are not connected cross process; only copy if not meta		// metadata buffers are not connected cross process; only copy if not meta
	bool copy = mMetadataType[portIndex] == kMetadataBufferTypeInvalid;		bool copy = mMetadataType[portIndex] == kMetadataBufferTypeInvalid;