Merge "DO NOT MERGE More OMX struct checking" into lmp-dev (a3c7788e) · Commits · e / os / android_frameworks_av

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -334,6 +334,11 @@ OMX_ERRORTYPE SoftAAC2::internalSetParameter(
		{
		const OMX_AUDIO_PARAM_ANDROID_AACPRESENTATIONTYPE *aacPresParams =
		(const OMX_AUDIO_PARAM_ANDROID_AACPRESENTATIONTYPE *)params;

		if (!isValidOMXParam(aacPresParams)) {
		return OMX_ErrorBadParameter;
		}

		// for the following parameters of the OMX_AUDIO_PARAM_AACPROFILETYPE structure,
		// a value of -1 implies the parameter is not set by the application:
		// nMaxOutputChannels uses default platform properties, see configureDownmix()

media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp

+26 −0

Original line number	Diff line number	Diff line
		@@ -441,6 +441,10 @@ OMX_ERRORTYPE SoftAVCEncoder::internalGetParameter(
		OMX_VIDEO_PARAM_PORTFORMATTYPE *formatParams =
		(OMX_VIDEO_PARAM_PORTFORMATTYPE *)params;

		if (!isValidOMXParam(formatParams)) {
		return OMX_ErrorBadParameter;
		}

		if (formatParams->nPortIndex > 1) {
		return OMX_ErrorUndefined;
		}
		@@ -508,6 +512,10 @@ OMX_ERRORTYPE SoftAVCEncoder::internalGetParameter(
		OMX_VIDEO_PARAM_PROFILELEVELTYPE *profileLevel =
		(OMX_VIDEO_PARAM_PROFILELEVELTYPE *)params;

		if (!isValidOMXParam(profileLevel)) {
		return OMX_ErrorBadParameter;
		}

		if (profileLevel->nPortIndex != 1) {
		return OMX_ErrorUndefined;
		}
		@@ -562,6 +570,11 @@ OMX_ERRORTYPE SoftAVCEncoder::internalSetParameter(
		{
		OMX_PARAM_PORTDEFINITIONTYPE *def =
		(OMX_PARAM_PORTDEFINITIONTYPE *)params;

		if (!isValidOMXParam(def)) {
		return OMX_ErrorBadParameter;
		}

		if (def->nPortIndex > 1) {
		return OMX_ErrorUndefined;
		}
		@@ -613,6 +626,10 @@ OMX_ERRORTYPE SoftAVCEncoder::internalSetParameter(
		const OMX_PARAM_COMPONENTROLETYPE *roleParams =
		(const OMX_PARAM_COMPONENTROLETYPE *)params;

		if (!isValidOMXParam(roleParams)) {
		return OMX_ErrorBadParameter;
		}

		if (strncmp((const char *)roleParams->cRole,
		"video_encoder.avc",
		OMX_MAX_STRINGNAME_SIZE - 1)) {
		@@ -627,6 +644,10 @@ OMX_ERRORTYPE SoftAVCEncoder::internalSetParameter(
		const OMX_VIDEO_PARAM_PORTFORMATTYPE *formatParams =
		(const OMX_VIDEO_PARAM_PORTFORMATTYPE *)params;

		if (!isValidOMXParam(formatParams)) {
		return OMX_ErrorBadParameter;
		}

		if (formatParams->nPortIndex > 1) {
		return OMX_ErrorUndefined;
		}
		@@ -697,6 +718,11 @@ OMX_ERRORTYPE SoftAVCEncoder::internalSetParameter(
		{
		StoreMetaDataInBuffersParams *storeParams =
		(StoreMetaDataInBuffersParams*)params;

		if (!isValidOMXParam(storeParams)) {
		return OMX_ErrorBadParameter;
		}

		if (storeParams->nPortIndex != 0) {
		ALOGE("%s: StoreMetadataInBuffersParams.nPortIndex not zero!",
		__FUNCTION__);

media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp

+26 −0

Original line number	Diff line number	Diff line
		@@ -308,6 +308,10 @@ OMX_ERRORTYPE SoftMPEG4Encoder::internalGetParameter(
		OMX_VIDEO_PARAM_PORTFORMATTYPE *formatParams =
		(OMX_VIDEO_PARAM_PORTFORMATTYPE *)params;

		if (!isValidOMXParam(formatParams)) {
		return OMX_ErrorBadParameter;
		}

		if (formatParams->nPortIndex > 1) {
		return OMX_ErrorUndefined;
		}
		@@ -395,6 +399,10 @@ OMX_ERRORTYPE SoftMPEG4Encoder::internalGetParameter(
		OMX_VIDEO_PARAM_PROFILELEVELTYPE *profileLevel =
		(OMX_VIDEO_PARAM_PROFILELEVELTYPE *)params;

		if (!isValidOMXParam(profileLevel)) {
		return OMX_ErrorBadParameter;
		}

		if (profileLevel->nPortIndex != 1) {
		return OMX_ErrorUndefined;
		}
		@@ -451,6 +459,11 @@ OMX_ERRORTYPE SoftMPEG4Encoder::internalSetParameter(
		{
		OMX_PARAM_PORTDEFINITIONTYPE *def =
		(OMX_PARAM_PORTDEFINITIONTYPE *)params;

		if (!isValidOMXParam(def)) {
		return OMX_ErrorBadParameter;
		}

		if (def->nPortIndex > 1) {
		return OMX_ErrorUndefined;
		}
		@@ -505,6 +518,10 @@ OMX_ERRORTYPE SoftMPEG4Encoder::internalSetParameter(
		const OMX_PARAM_COMPONENTROLETYPE *roleParams =
		(const OMX_PARAM_COMPONENTROLETYPE *)params;

		if (!isValidOMXParam(roleParams)) {
		return OMX_ErrorBadParameter;
		}

		if (strncmp((const char *)roleParams->cRole,
		(mEncodeMode == H263_MODE)
		? "video_encoder.h263": "video_encoder.mpeg4",
		@@ -520,6 +537,10 @@ OMX_ERRORTYPE SoftMPEG4Encoder::internalSetParameter(
		const OMX_VIDEO_PARAM_PORTFORMATTYPE *formatParams =
		(const OMX_VIDEO_PARAM_PORTFORMATTYPE *)params;

		if (!isValidOMXParam(formatParams)) {
		return OMX_ErrorBadParameter;
		}

		if (formatParams->nPortIndex > 1) {
		return OMX_ErrorUndefined;
		}
		@@ -611,6 +632,11 @@ OMX_ERRORTYPE SoftMPEG4Encoder::internalSetParameter(
		{
		StoreMetaDataInBuffersParams *storeParams =
		(StoreMetaDataInBuffersParams*)params;

		if (!isValidOMXParam(storeParams)) {
		return OMX_ErrorBadParameter;
		}

		if (storeParams->nPortIndex != 0) {
		ALOGE("%s: StoreMetadataInBuffersParams.nPortIndex not zero!",
		__FUNCTION__);

media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -422,6 +422,10 @@ OMX_ERRORTYPE SoftVPXEncoder::internalGetParameter(OMX_INDEXTYPE index,
		OMX_VIDEO_PARAM_PORTFORMATTYPE *formatParams =
		(OMX_VIDEO_PARAM_PORTFORMATTYPE *)param;

		if (!isValidOMXParam(formatParams)) {
		return OMX_ErrorBadParameter;
		}

		if (formatParams->nPortIndex == kInputPortIndex) {
		if (formatParams->nIndex >= kNumberOfSupportedColorFormats) {
		return OMX_ErrorNoMore;
		@@ -498,6 +502,10 @@ OMX_ERRORTYPE SoftVPXEncoder::internalGetParameter(OMX_INDEXTYPE index,
		OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE *vp8AndroidParams =
		(OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE *)param;

		if (!isValidOMXParam(vp8AndroidParams)) {
		return OMX_ErrorBadParameter;
		}

		if (vp8AndroidParams->nPortIndex != kOutputPortIndex) {
		return OMX_ErrorUnsupportedIndex;
		}

media/libstagefright/codecs/opus/dec/SoftOpus.cpp

+16 −0

Original line number	Diff line number	Diff line
		@@ -134,6 +134,10 @@ OMX_ERRORTYPE SoftOpus::internalGetParameter(
		OMX_AUDIO_PARAM_ANDROID_OPUSTYPE *opusParams =
		(OMX_AUDIO_PARAM_ANDROID_OPUSTYPE *)params;

		if (!isValidOMXParam(opusParams)) {
		return OMX_ErrorBadParameter;
		}

		if (opusParams->nPortIndex != 0) {
		return OMX_ErrorUndefined;
		}
		@@ -156,6 +160,10 @@ OMX_ERRORTYPE SoftOpus::internalGetParameter(
		OMX_AUDIO_PARAM_PCMMODETYPE *pcmParams =
		(OMX_AUDIO_PARAM_PCMMODETYPE *)params;

		if (!isValidOMXParam(pcmParams)) {
		return OMX_ErrorBadParameter;
		}

		if (pcmParams->nPortIndex != 1) {
		return OMX_ErrorUndefined;
		}
		@@ -191,6 +199,10 @@ OMX_ERRORTYPE SoftOpus::internalSetParameter(
		const OMX_PARAM_COMPONENTROLETYPE *roleParams =
		(const OMX_PARAM_COMPONENTROLETYPE *)params;

		if (!isValidOMXParam(roleParams)) {
		return OMX_ErrorBadParameter;
		}

		if (strncmp((const char *)roleParams->cRole,
		"audio_decoder.opus",
		OMX_MAX_STRINGNAME_SIZE - 1)) {
		@@ -205,6 +217,10 @@ OMX_ERRORTYPE SoftOpus::internalSetParameter(
		const OMX_AUDIO_PARAM_ANDROID_OPUSTYPE *opusParams =
		(const OMX_AUDIO_PARAM_ANDROID_OPUSTYPE *)params;

		if (!isValidOMXParam(opusParams)) {
		return OMX_ErrorBadParameter;
		}

		if (opusParams->nPortIndex != 0) {
		return OMX_ErrorUndefined;
		}