Merge "Don't allow using or allocating a buffer after the first state... (4a920030) · Commits · e / os / android_frameworks_av

media/libstagefright/omx/OMXNodeInstance.cpp

+18 −0

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

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

		// metadata buffers are not connected cross process
		BufferMeta *buffer_meta;
		bool isMeta = mMetadataType[portIndex] != kMetadataBufferTypeInvalid;
		@@ -1112,6 +1118,12 @@ status_t OMXNodeInstance::allocateBuffer(
		void **buffer_data) {
		Mutex::Autolock autoLock(mLock);

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

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

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

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

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