Merge "Check transaction status in WGraphicBufferSource" into oc-mr1-dev am: 69fe2e5e96 (fe235c86) · Commits · e / os / android_frameworks_av

media/libstagefright/omx/1.0/WGraphicBufferSource.cpp

+16 −3

Original line number	Original line	Diff line number	Diff line
	@@ -67,7 +67,14 @@ struct TWGraphicBufferSource::TWOmxNodeWrapper : public IOmxNodeWrapper {
	tMsg.data.eventData.data1 = dataSpace;		tMsg.data.eventData.data1 = dataSpace;
	tMsg.data.eventData.data2 = aspects;		tMsg.data.eventData.data2 = aspects;
	tMsg.data.eventData.data3 = pixelFormat;		tMsg.data.eventData.data3 = pixelFormat;
	mOmxNode->dispatchMessage(tMsg);		if (!mOmxNode->dispatchMessage(tMsg).isOk()) {
			ALOGE("TWOmxNodeWrapper failed to dispatch message "
			"OMX_EventDataSpaceChanged: "
			"dataSpace = %ld, aspects = %ld, pixelFormat = %ld",
			static_cast<long>(dataSpace),
			static_cast<long>(aspects),
			static_cast<long>(pixelFormat));
			}
	}		}
	};		};

	@@ -143,10 +150,13 @@ Return<Status> TWGraphicBufferSource::configure(
	outParams.data() + outParams.size(),		outParams.data() + outParams.size(),
	params);		params);
	});		});
	omxNode->getParameter(		auto transStatus = omxNode->getParameter(
	static_cast<uint32_t>(OMX_IndexParamConsumerUsageBits),		static_cast<uint32_t>(OMX_IndexParamConsumerUsageBits),
	inHidlBytes(&consumerUsage, sizeof(consumerUsage)),		inHidlBytes(&consumerUsage, sizeof(consumerUsage)),
	_hidl_cb);		_hidl_cb);
			if (!transStatus.isOk()) {
			return toStatus(FAILED_TRANSACTION);
			}
	if (fnStatus != OK) {		if (fnStatus != OK) {
	consumerUsage = 0;		consumerUsage = 0;
	}		}
	@@ -157,10 +167,13 @@ Return<Status> TWGraphicBufferSource::configure(

	_params = &def;		_params = &def;
	params = static_cast<uint8_t*>(_params);		params = static_cast<uint8_t*>(_params);
	omxNode->getParameter(		transStatus = omxNode->getParameter(
	static_cast<uint32_t>(OMX_IndexParamPortDefinition),		static_cast<uint32_t>(OMX_IndexParamPortDefinition),
	inHidlBytes(&def, sizeof(def)),		inHidlBytes(&def, sizeof(def)),
	_hidl_cb);		_hidl_cb);
			if (!transStatus.isOk()) {
			return toStatus(FAILED_TRANSACTION);
			}
	if (fnStatus != NO_ERROR) {		if (fnStatus != NO_ERROR) {
	ALOGE("Failed to get port definition: %d", fnStatus);		ALOGE("Failed to get port definition: %d", fnStatus);
	return toStatus(fnStatus);		return toStatus(fnStatus);