Merge "Handle nullptr from mapMemory properly" into oc-dr1-dev am: b9bacc624e (55d21d80) · Commits · e / os / android_frameworks_av

media/libstagefright/ACodec.cpp

+6 −1

Original line number	Diff line number	Diff line
		@@ -960,7 +960,9 @@ status_t ACodec::allocateBuffersOnPort(OMX_U32 portIndex) {
		return NO_MEMORY;
		}
		hidlMem = mapMemory(hidlMemToken);

		if (hidlMem == nullptr) {
		return NO_MEMORY;
		}
		err = mOMXNode->useBuffer(
		portIndex, hidlMemToken, &info.mBufferID);
		} else {
		@@ -1008,6 +1010,9 @@ status_t ACodec::allocateBuffersOnPort(OMX_U32 portIndex) {
		return NO_MEMORY;
		}
		hidlMem = mapMemory(hidlMemToken);
		if (hidlMem == nullptr) {
		return NO_MEMORY;
		}
		info.mData = new SharedMemoryBuffer(format, hidlMem);
		info.mMemRef = hidlMem;
		} else {

+4 −0

Original line number	Diff line number	Diff line
		@@ -1052,6 +1052,10 @@ status_t OMXNodeInstance::useBuffer(

		case OMXBuffer::kBufferTypeHidlMemory: {
		sp<IHidlMemory> hidlMemory = mapMemory(omxBuffer.mHidlMemory);
		if (hidlMemory == nullptr) {
		ALOGE("OMXNodeInstance useBuffer() failed to map memory");
		return NO_MEMORY;
		}
		return useBuffer_l(portIndex, NULL, hidlMemory, buffer);
		}
		default: