omx: restrict useBuffer according to buffer type and port mode (af7ec75b) · Commits · e / os / android_frameworks_av

media/libstagefright/omx/OMXNodeInstance.cpp

+56 −20

Original line number	Diff line number	Diff line
		@@ -672,6 +672,7 @@ status_t OMXNodeInstance::setPortMode(OMX_U32 portIndex, IOMX::PortMode mode) {

		CLOG_CONFIG(setPortMode, "%s(%d), port %d", asString(mode), mode, portIndex);

		status_t err = OK;
		switch (mode) {
		case IOMX::kPortModeDynamicANWBuffer:
		{
		@@ -680,17 +681,19 @@ status_t OMXNodeInstance::setPortMode(OMX_U32 portIndex, IOMX::PortMode mode) {
		CLOG_INTERNAL(setPortMode, "Legacy adaptive experiment: "
		"not setting port mode to %s(%d) on output",
		asString(mode), mode);
		return StatusFromOMXError(OMX_ErrorUnsupportedIndex);
		err = StatusFromOMXError(OMX_ErrorUnsupportedIndex);
		break;
		}

		status_t err = enableNativeBuffers_l(
		err = enableNativeBuffers_l(
		portIndex, OMX_TRUE /graphic/, OMX_TRUE);
		if (err != OK) {
		return err;
		break;
		}
		}
		(void)enableNativeBuffers_l(portIndex, OMX_FALSE /graphic/, OMX_FALSE);
		return storeMetaDataInBuffers_l(portIndex, OMX_TRUE, NULL);
		err = storeMetaDataInBuffers_l(portIndex, OMX_TRUE, NULL);
		break;
		}

		case IOMX::kPortModeDynamicNativeHandle:
		@@ -698,13 +701,15 @@ status_t OMXNodeInstance::setPortMode(OMX_U32 portIndex, IOMX::PortMode mode) {
		if (portIndex != kPortIndexInput) {
		CLOG_ERROR(setPortMode, BAD_VALUE,
		"%s(%d) mode is only supported on input port", asString(mode), mode);
		return BAD_VALUE;
		err = BAD_VALUE;
		break;
		}
		(void)enableNativeBuffers_l(portIndex, OMX_TRUE /graphic/, OMX_FALSE);
		(void)enableNativeBuffers_l(portIndex, OMX_FALSE /graphic/, OMX_FALSE);

		MetadataBufferType metaType = kMetadataBufferTypeNativeHandleSource;
		return storeMetaDataInBuffers_l(portIndex, OMX_TRUE, &metaType);
		err = storeMetaDataInBuffers_l(portIndex, OMX_TRUE, &metaType);
		break;
		}

		case IOMX::kPortModePresetSecureBuffer:
		@@ -712,7 +717,8 @@ status_t OMXNodeInstance::setPortMode(OMX_U32 portIndex, IOMX::PortMode mode) {
		// Allow on both input and output.
		(void)storeMetaDataInBuffers_l(portIndex, OMX_FALSE, NULL);
		(void)enableNativeBuffers_l(portIndex, OMX_TRUE /graphic/, OMX_FALSE);
		return enableNativeBuffers_l(portIndex, OMX_FALSE /graphic/, OMX_TRUE);
		err = enableNativeBuffers_l(portIndex, OMX_FALSE /graphic/, OMX_TRUE);
		break;
		}

		case IOMX::kPortModePresetANWBuffer:
		@@ -720,7 +726,8 @@ status_t OMXNodeInstance::setPortMode(OMX_U32 portIndex, IOMX::PortMode mode) {
		if (portIndex != kPortIndexOutput) {
		CLOG_ERROR(setPortMode, BAD_VALUE,
		"%s(%d) mode is only supported on output port", asString(mode), mode);
		return BAD_VALUE;
		err = BAD_VALUE;
		break;
		}

		// Check if we're simulating legacy mode with metadata mode,
		@@ -729,7 +736,7 @@ status_t OMXNodeInstance::setPortMode(OMX_U32 portIndex, IOMX::PortMode mode) {
		if (storeMetaDataInBuffers_l(portIndex, OMX_TRUE, NULL) == OK) {
		CLOG_INTERNAL(setPortMode, "Legacy adaptive experiment: "
		"metdata mode enabled successfully");
		return OK;
		break;
		}

		CLOG_INTERNAL(setPortMode, "Legacy adaptive experiment: "
		@@ -740,15 +747,15 @@ status_t OMXNodeInstance::setPortMode(OMX_U32 portIndex, IOMX::PortMode mode) {

		// Disable secure buffer and enable graphic buffer
		(void)enableNativeBuffers_l(portIndex, OMX_FALSE /graphic/, OMX_FALSE);
		status_t err = enableNativeBuffers_l(portIndex, OMX_TRUE /graphic/, OMX_TRUE);
		err = enableNativeBuffers_l(portIndex, OMX_TRUE /graphic/, OMX_TRUE);
		if (err != OK) {
		return err;
		break;
		}

		// Not running experiment, or metadata is not supported.
		// Disable metadata mode and use legacy mode.
		(void)storeMetaDataInBuffers_l(portIndex, OMX_FALSE, NULL);
		return OK;
		break;
		}

		case IOMX::kPortModePresetByteBuffer:
		@@ -757,15 +764,19 @@ status_t OMXNodeInstance::setPortMode(OMX_U32 portIndex, IOMX::PortMode mode) {
		(void)enableNativeBuffers_l(portIndex, OMX_TRUE /graphic/, OMX_FALSE);
		(void)enableNativeBuffers_l(portIndex, OMX_FALSE /graphic/, OMX_FALSE);
		(void)storeMetaDataInBuffers_l(portIndex, OMX_FALSE, NULL);
		return OK;
		break;
		}

		default:
		CLOG_ERROR(setPortMode, BAD_VALUE, "invalid port mode %d", mode);
		err = BAD_VALUE;
		break;
		}

		CLOG_ERROR(setPortMode, BAD_VALUE, "invalid port mode %d", mode);
		return BAD_VALUE;
		if (err == OK) {
		mPortMode[portIndex] = mode;
		}
		return err;
		}

		status_t OMXNodeInstance::enableNativeBuffers_l(
		@@ -1043,16 +1054,33 @@ status_t OMXNodeInstance::useBuffer(
		}

		switch (omxBuffer.mBufferType) {
		case OMXBuffer::kBufferTypePreset:
		case OMXBuffer::kBufferTypePreset: {
		if (mPortMode[portIndex] != IOMX::kPortModeDynamicANWBuffer
		&& mPortMode[portIndex] != IOMX::kPortModeDynamicNativeHandle) {
		break;
		}
		return useBuffer_l(portIndex, NULL, NULL, buffer);
		}

		case OMXBuffer::kBufferTypeSharedMem:
		case OMXBuffer::kBufferTypeSharedMem: {
		if (mPortMode[portIndex] != IOMX::kPortModePresetByteBuffer) {
		break;
		}
		return useBuffer_l(portIndex, omxBuffer.mMem, NULL, buffer);
		}

		case OMXBuffer::kBufferTypeANWBuffer:
		case OMXBuffer::kBufferTypeANWBuffer: {
		if (mPortMode[portIndex] != IOMX::kPortModePresetANWBuffer) {
		break;
		}
		return useGraphicBuffer_l(portIndex, omxBuffer.mGraphicBuffer, buffer);
		}

		case OMXBuffer::kBufferTypeHidlMemory: {
		if (mPortMode[portIndex] != IOMX::kPortModePresetByteBuffer
		&& mPortMode[portIndex] != IOMX::kPortModeDynamicANWBuffer) {
		break;
		}
		sp<IHidlMemory> hidlMemory = mapMemory(omxBuffer.mHidlMemory);
		if (hidlMemory == nullptr) {
		ALOGE("OMXNodeInstance useBuffer() failed to map memory");
		@@ -1061,10 +1089,13 @@ status_t OMXNodeInstance::useBuffer(
		return useBuffer_l(portIndex, NULL, hidlMemory, buffer);
		}
		default:
		return BAD_VALUE;
		break;
		}

		return BAD_VALUE;
		ALOGE("b/77486542");
		android_errorWriteLog(0x534e4554, "77486542");
		return INVALID_OPERATION;
		}

		status_t OMXNodeInstance::useBuffer_l(
		@@ -1501,6 +1532,11 @@ status_t OMXNodeInstance::allocateSecureBuffer(
		android_errorWriteLog(0x534e4554, "35467458");
		return BAD_VALUE;
		}
		if (mPortMode[portIndex] != IOMX::kPortModePresetSecureBuffer) {
		ALOGE("b/77486542");
		android_errorWriteLog(0x534e4554, "77486542");
		return INVALID_OPERATION;
		}
		BufferMeta *buffer_meta = new BufferMeta(portIndex);

		OMX_BUFFERHEADERTYPE *header;