Merge "OMXNodeInstance: Allow dynamic native handle mode for input buffers" into oc-dev (e41dfae5) · Commits · e / devices / smdk4412 / android_frameworks_av

media/libstagefright/omx/OMXNodeInstance.cpp

+6 −3

Original line number	Diff line number	Diff line
		@@ -1063,7 +1063,8 @@ status_t OMXNodeInstance::useBuffer(
		}

		case OMXBuffer::kBufferTypeSharedMem: {
		if (mPortMode[portIndex] != IOMX::kPortModePresetByteBuffer) {
		if (mPortMode[portIndex] != IOMX::kPortModePresetByteBuffer
		&& mPortMode[portIndex] != IOMX::kPortModeDynamicANWBuffer) {
		break;
		}
		return useBuffer_l(portIndex, omxBuffer.mMem, NULL, buffer);
		@@ -1078,7 +1079,8 @@ status_t OMXNodeInstance::useBuffer(

		case OMXBuffer::kBufferTypeHidlMemory: {
		if (mPortMode[portIndex] != IOMX::kPortModePresetByteBuffer
		&& mPortMode[portIndex] != IOMX::kPortModeDynamicANWBuffer) {
		&& mPortMode[portIndex] != IOMX::kPortModeDynamicANWBuffer
		&& mPortMode[portIndex] != IOMX::kPortModeDynamicNativeHandle) {
		break;
		}
		sp<IHidlMemory> hidlMemory = mapMemory(omxBuffer.mHidlMemory);
		@@ -1089,7 +1091,8 @@ status_t OMXNodeInstance::useBuffer(
		break;
		}

		ALOGE("b/77486542");
		ALOGE("b/77486542 : bufferType = %d vs. portMode = %d",
		omxBuffer.mBufferType, mPortMode[portIndex]);
		android_errorWriteLog(0x534e4554, "77486542");
		return INVALID_OPERATION;
		}