DO NOT MERGE omx: check buffer port before using (719fd3c0) · Commits · e / os / android_frameworks_av

media/libstagefright/include/OMXNodeInstance.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -161,7 +161,7 @@ private:

		// For buffer id management
		OMX::buffer_id makeBufferID(OMX_BUFFERHEADERTYPE *bufferHeader);
		OMX_BUFFERHEADERTYPE *findBufferHeader(OMX::buffer_id buffer);
		OMX_BUFFERHEADERTYPE *findBufferHeader(OMX::buffer_id buffer, OMX_U32 portIndex);
		OMX::buffer_id findBufferID(OMX_BUFFERHEADERTYPE *bufferHeader);
		void invalidateBufferID(OMX::buffer_id buffer);

media/libstagefright/omx/OMXNodeInstance.cpp

+61 −20

Original line number	Diff line number	Diff line
		@@ -31,23 +31,27 @@
		#include <media/stagefright/MediaErrors.h>

		static const OMX_U32 kPortIndexInput = 0;
		static const OMX_U32 kPortIndexOutput = 1;

		namespace android {

		struct BufferMeta {
		BufferMeta(const sp<IMemory> &mem, bool is_backup = false)
		BufferMeta(const sp<IMemory> &mem, OMX_U32 portIndex, bool is_backup = false)
		: mMem(mem),
		mIsBackup(is_backup) {
		mIsBackup(is_backup),
		mPortIndex(portIndex) {
		}

		BufferMeta(size_t size)
		BufferMeta(size_t size, OMX_U32 portIndex)
		: mSize(size),
		mIsBackup(false) {
		mIsBackup(false),
		mPortIndex(portIndex) {
		}

		BufferMeta(const sp<GraphicBuffer> &graphicBuffer)
		BufferMeta(const sp<GraphicBuffer> &graphicBuffer, OMX_U32 portIndex)
		: mGraphicBuffer(graphicBuffer),
		mIsBackup(false) {
		mIsBackup(false),
		mPortIndex(portIndex) {
		}

		void CopyFromOMX(const OMX_BUFFERHEADERTYPE *header) {
		@@ -74,11 +78,16 @@ struct BufferMeta {
		mGraphicBuffer = graphicBuffer;
		}

		OMX_U32 getPortIndex() {
		return mPortIndex;
		}

		private:
		sp<GraphicBuffer> mGraphicBuffer;
		sp<IMemory> mMem;
		size_t mSize;
		bool mIsBackup;
		OMX_U32 mPortIndex;

		BufferMeta(const BufferMeta &);
		BufferMeta &operator=(const BufferMeta &);
		@@ -532,7 +541,7 @@ status_t OMXNodeInstance::useBuffer(
		OMX::buffer_id *buffer) {
		Mutex::Autolock autoLock(mLock);

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

		OMX_BUFFERHEADERTYPE *header;

		@@ -584,7 +593,7 @@ status_t OMXNodeInstance::useGraphicBuffer2_l(
		return err;
		}

		BufferMeta *bufferMeta = new BufferMeta(graphicBuffer);
		BufferMeta *bufferMeta = new BufferMeta(graphicBuffer, portIndex);

		OMX_BUFFERHEADERTYPE *header = NULL;
		OMX_U8* bufferHandle = const_cast<OMX_U8*>(
		@@ -643,7 +652,7 @@ status_t OMXNodeInstance::useGraphicBuffer(
		return StatusFromOMXError(err);
		}

		BufferMeta *bufferMeta = new BufferMeta(graphicBuffer);
		BufferMeta *bufferMeta = new BufferMeta(graphicBuffer, portIndex);

		OMX_BUFFERHEADERTYPE *header;

		@@ -681,11 +690,14 @@ status_t OMXNodeInstance::useGraphicBuffer(
		}

		status_t OMXNodeInstance::updateGraphicBufferInMeta(
		OMX_U32 /* portIndex */, const sp<GraphicBuffer>& graphicBuffer,
		OMX_U32 portIndex, const sp<GraphicBuffer>& graphicBuffer,
		OMX::buffer_id buffer) {
		Mutex::Autolock autoLock(mLock);

		OMX_BUFFERHEADERTYPE *header = findBufferHeader(buffer);
		OMX_BUFFERHEADERTYPE *header = findBufferHeader(buffer, portIndex);
		if (header == NULL) {
		return BAD_VALUE;
		}
		VideoDecoderOutputMetaData *metadata =
		(VideoDecoderOutputMetaData *)(header->pBuffer);
		BufferMeta bufferMeta = (BufferMeta )(header->pAppPrivate);
		@@ -764,7 +776,7 @@ status_t OMXNodeInstance::allocateBuffer(
		void **buffer_data) {
		Mutex::Autolock autoLock(mLock);

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

		OMX_BUFFERHEADERTYPE *header;

		@@ -802,7 +814,7 @@ status_t OMXNodeInstance::allocateBufferWithBackup(
		OMX::buffer_id *buffer) {
		Mutex::Autolock autoLock(mLock);

		BufferMeta *buffer_meta = new BufferMeta(params, true);
		BufferMeta *buffer_meta = new BufferMeta(params, portIndex, true);

		OMX_BUFFERHEADERTYPE *header;

		@@ -840,7 +852,10 @@ status_t OMXNodeInstance::freeBuffer(

		removeActiveBuffer(portIndex, buffer);

		OMX_BUFFERHEADERTYPE *header = findBufferHeader(buffer);
		OMX_BUFFERHEADERTYPE *header = findBufferHeader(buffer, portIndex);
		if (header == NULL) {
		return BAD_VALUE;
		}
		BufferMeta buffer_meta = static_cast<BufferMeta >(header->pAppPrivate);

		OMX_ERRORTYPE err = OMX_FreeBuffer(mHandle, portIndex, header);
		@@ -855,7 +870,10 @@ status_t OMXNodeInstance::freeBuffer(
		status_t OMXNodeInstance::fillBuffer(OMX::buffer_id buffer) {
		Mutex::Autolock autoLock(mLock);

		OMX_BUFFERHEADERTYPE *header = findBufferHeader(buffer);
		OMX_BUFFERHEADERTYPE *header = findBufferHeader(buffer, kPortIndexOutput);
		if (header == NULL) {
		return BAD_VALUE;
		}
		header->nFilledLen = 0;
		header->nOffset = 0;
		header->nFlags = 0;
		@@ -871,7 +889,10 @@ status_t OMXNodeInstance::emptyBuffer(
		OMX_U32 flags, OMX_TICKS timestamp) {
		Mutex::Autolock autoLock(mLock);

		OMX_BUFFERHEADERTYPE *header = findBufferHeader(buffer);
		OMX_BUFFERHEADERTYPE *header = findBufferHeader(buffer, kPortIndexInput);
		if (header == NULL) {
		return BAD_VALUE;
		}
		// rangeLength and rangeOffset must be a subset of the allocated data in the buffer.
		// corner case: we permit rangeOffset == end-of-buffer with rangeLength == 0.
		if (rangeOffset > header->nAllocLen
		@@ -995,7 +1016,10 @@ void OMXNodeInstance::onMessage(const omx_message &msg) {

		if (msg.type == omx_message::FILL_BUFFER_DONE) {
		OMX_BUFFERHEADERTYPE *buffer =
		findBufferHeader(msg.u.extended_buffer_data.buffer);
		findBufferHeader(msg.u.extended_buffer_data.buffer, kPortIndexOutput);
		if (buffer == NULL) {
		return;
		}

		BufferMeta *buffer_meta =
		static_cast<BufferMeta *>(buffer->pAppPrivate);
		@@ -1020,7 +1044,10 @@ void OMXNodeInstance::onMessage(const omx_message &msg) {
		// be very confused.

		OMX_BUFFERHEADERTYPE *buffer =
		findBufferHeader(msg.u.buffer_data.buffer);
		findBufferHeader(msg.u.buffer_data.buffer, kPortIndexInput);
		if (buffer == NULL) {
		return;
		}

		bufferSource->codecBufferEmptied(buffer);
		return;
		@@ -1146,12 +1173,26 @@ OMX::buffer_id OMXNodeInstance::makeBufferID(OMX_BUFFERHEADERTYPE *bufferHeader)
		return buffer;
		}

		OMX_BUFFERHEADERTYPE *OMXNodeInstance::findBufferHeader(OMX::buffer_id buffer) {
		OMX_BUFFERHEADERTYPE *OMXNodeInstance::findBufferHeader(
		OMX::buffer_id buffer, OMX_U32 portIndex) {
		if (buffer == 0) {
		return NULL;
		}
		Mutex::Autolock autoLock(mBufferIDLock);
		return mBufferIDToBufferHeader.valueFor(buffer);
		ssize_t index = mBufferIDToBufferHeader.indexOfKey(buffer);
		if (index < 0) {
		ALOGW("findBufferHeader: buffer %u not found", buffer);
		return NULL;
		}
		OMX_BUFFERHEADERTYPE *header = mBufferIDToBufferHeader.valueAt(index);
		BufferMeta *buffer_meta =
		static_cast<BufferMeta *>(header->pAppPrivate);
		if (buffer_meta->getPortIndex() != portIndex) {
		ALOGW("findBufferHeader: buffer %u found but with incorrect port index.", buffer);
		android_errorWriteLog(0x534e4554, "28816827");
		return NULL;
		}
		return header;
		}

		OMX::buffer_id OMXNodeInstance::findBufferID(OMX_BUFFERHEADERTYPE *bufferHeader) {