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

media/libstagefright/OMXCodec.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -654,9 +654,11 @@ status_t OMXCodec::setVideoPortFormatType(
		OMX_U32 index = 0;
		for (;;) {
		format.nIndex = index;
		ALOGI("calling getparam %d size %d", index, format.nSize);
		status_t err = mOMX->getParameter(
		mNode, OMX_IndexParamVideoPortFormat,
		&format, sizeof(format));
		ALOGI("called getparam %d size %d: %d", index, format.nSize, err);

		if (err != OK) {
		return err;
		@@ -690,9 +692,11 @@ status_t OMXCodec::setVideoPortFormatType(
		}

		CODEC_LOGV("found a match.");
		ALOGI("calling setparam size %d", format.nSize);
		status_t err = mOMX->setParameter(
		mNode, OMX_IndexParamVideoPortFormat,
		&format, sizeof(format));
		ALOGI("called setparam: %d", err);

		return err;
		}

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

+26 −0

Original line number	Diff line number	Diff line
		@@ -468,6 +468,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;
		}
		@@ -535,6 +539,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;
		}
		@@ -589,6 +597,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;
		}
		@@ -629,6 +642,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)) {
		@@ -643,6 +660,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;
		}
		@@ -713,6 +734,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
		@@ -335,6 +335,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;
		}
		@@ -422,6 +426,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;
		}
		@@ -478,6 +486,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;
		}
		@@ -521,6 +534,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",
		@@ -536,6 +553,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;
		}
		@@ -627,6 +648,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

+4 −0

Original line number	Diff line number	Diff line
		@@ -353,6 +353,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;