Merge "Apply input buffer validation also to AVC and MPEG4 encoders" into oc-mr1-dev (c78b6dac) · Commits · e / devices / smdk4412 / android_frameworks_av

media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1170,6 +1170,12 @@ OMX_ERRORTYPE SoftAVC::setEncodeArgs(
	ps_inp_raw_buf->e_color_fmt = mIvVideoColorFormat;		ps_inp_raw_buf->e_color_fmt = mIvVideoColorFormat;
	source = NULL;		source = NULL;
	if ((inputBufferHeader != NULL) && inputBufferHeader->nFilledLen) {		if ((inputBufferHeader != NULL) && inputBufferHeader->nFilledLen) {
			OMX_ERRORTYPE error = validateInputBuffer(inputBufferHeader);
			if (error != OMX_ErrorNone) {
			ALOGE("b/69065651");
			android_errorWriteLog(0x534e4554, "69065651");
			return error;
			}
	source = inputBufferHeader->pBuffer + inputBufferHeader->nOffset;		source = inputBufferHeader->pBuffer + inputBufferHeader->nOffset;

	if (mInputDataIsMeta) {		if (mInputDataIsMeta) {

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -434,6 +434,14 @@ void SoftMPEG4Encoder::onQueueFilled(OMX_U32 /* portIndex */) {
	}		}

	if (inHeader->nFilledLen > 0) {		if (inHeader->nFilledLen > 0) {
			OMX_ERRORTYPE error = validateInputBuffer(inHeader);
			if (error != OMX_ErrorNone) {
			ALOGE("b/69065651");
			android_errorWriteLog(0x534e4554, "69065651");
			mSignalledError = true;
			notify(OMX_EventError, error, 0, 0);
			return;
			}
	const uint8_t *inputData = NULL;		const uint8_t *inputData = NULL;
	if (mInputDataIsMeta) {		if (mInputDataIsMeta) {
	inputData =		inputData =

+7 −8

Original line number	Original line	Diff line number	Diff line
	@@ -653,6 +653,13 @@ void SoftVPXEncoder::onQueueFilled(OMX_U32 /* portIndex */) {
	return;		return;
	}		}

			OMX_ERRORTYPE error = validateInputBuffer(inputBufferHeader);
			if (error != OMX_ErrorNone) {
			ALOGE("b/27569635");
			android_errorWriteLog(0x534e4554, "27569635");
			notify(OMX_EventError, error, 0, 0);
			return;
			}
	const uint8_t *source =		const uint8_t *source =
	inputBufferHeader->pBuffer + inputBufferHeader->nOffset;		inputBufferHeader->pBuffer + inputBufferHeader->nOffset;

	@@ -668,14 +675,6 @@ void SoftVPXEncoder::onQueueFilled(OMX_U32 /* portIndex */) {
	return;		return;
	}		}
	} else {		} else {
	if (inputBufferHeader->nFilledLen < frameSize) {
	android_errorWriteLog(0x534e4554, "27569635");
	notify(OMX_EventError, OMX_ErrorUndefined, 0, 0);
	return;
	} else if (inputBufferHeader->nFilledLen > frameSize) {
	ALOGW("Input buffer contains too many pixels");
	}

	if (mColorFormat == OMX_COLOR_FormatYUV420SemiPlanar) {		if (mColorFormat == OMX_COLOR_FormatYUV420SemiPlanar) {
	ConvertYUV420SemiPlanarToYUV420Planar(		ConvertYUV420SemiPlanarToYUV420Planar(
	source, mConversionBuffer, mWidth, mHeight);		source, mConversionBuffer, mWidth, mHeight);

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -664,4 +664,17 @@ OMX_ERRORTYPE SoftVideoEncoderOMXComponent::getExtensionIndex(
	return SimpleSoftOMXComponent::getExtensionIndex(name, index);		return SimpleSoftOMXComponent::getExtensionIndex(name, index);
	}		}

			OMX_ERRORTYPE SoftVideoEncoderOMXComponent::validateInputBuffer(
			const OMX_BUFFERHEADERTYPE *inputBufferHeader) {
			size_t frameSize = mInputDataIsMeta ?
			max(sizeof(VideoNativeMetadata), sizeof(VideoGrallocMetadata))
			: mWidth * mHeight * 3 / 2;
			if (inputBufferHeader->nFilledLen < frameSize) {
			return OMX_ErrorUndefined;
			} else if (inputBufferHeader->nFilledLen > frameSize) {
			ALOGW("Input buffer contains more data than expected.");
			}
			return OMX_ErrorNone;
			}

	} // namespace android		} // namespace android

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -67,6 +67,8 @@ protected:

	virtual OMX_ERRORTYPE getExtensionIndex(const char name, OMX_INDEXTYPE index);		virtual OMX_ERRORTYPE getExtensionIndex(const char name, OMX_INDEXTYPE index);

			OMX_ERRORTYPE validateInputBuffer(const OMX_BUFFERHEADERTYPE *inputBufferHeader);

	enum {		enum {
	kInputPortIndex = 0,		kInputPortIndex = 0,
	kOutputPortIndex = 1,		kOutputPortIndex = 1,