Merge "stagefright: add graceful handling when setting port definition" into lmp-mr1-dev (b2cf160f) · Commits · e / os / android_frameworks_av

media/libstagefright/omx/SimpleSoftOMXComponent.cpp

+12 −12

Original line number	Diff line number	Diff line
		@@ -152,28 +152,28 @@ OMX_ERRORTYPE SimpleSoftOMXComponent::internalSetParameter(
		OMX_PARAM_PORTDEFINITIONTYPE *defParams =
		(OMX_PARAM_PORTDEFINITIONTYPE *)params;

		if (defParams->nPortIndex >= mPorts.size()
		\|\| defParams->nSize
		!= sizeof(OMX_PARAM_PORTDEFINITIONTYPE)) {
		return OMX_ErrorUndefined;
		if (defParams->nPortIndex >= mPorts.size()) {
		return OMX_ErrorBadPortIndex;
		}
		if (defParams->nSize != sizeof(OMX_PARAM_PORTDEFINITIONTYPE)) {
		return OMX_ErrorUnsupportedSetting;
		}

		PortInfo *port =
		&mPorts.editItemAt(defParams->nPortIndex);

		if (defParams->nBufferSize != port->mDef.nBufferSize) {
		CHECK_GE(defParams->nBufferSize, port->mDef.nBufferSize);
		// default behavior is that we only allow buffer size to increase
		if (defParams->nBufferSize > port->mDef.nBufferSize) {
		port->mDef.nBufferSize = defParams->nBufferSize;
		}

		if (defParams->nBufferCountActual
		!= port->mDef.nBufferCountActual) {
		CHECK_GE(defParams->nBufferCountActual,
		port->mDef.nBufferCountMin);

		port->mDef.nBufferCountActual = defParams->nBufferCountActual;
		if (defParams->nBufferCountActual < port->mDef.nBufferCountMin) {
		ALOGW("component requires at least %u buffers (%u requested)",
		port->mDef.nBufferCountMin, defParams->nBufferCountActual);
		return OMX_ErrorUnsupportedSetting;
		}

		port->mDef.nBufferCountActual = defParams->nBufferCountActual;
		return OMX_ErrorNone;
		}