Merge pull request #1804 from sijchen/fix_over3

[Encoder] fix potential overflow under large bit rate

ruil2 committed 11 years ago

Commit 8fc2af72 parents 296ab4d 431bcee10 files · +7711 −7708Browse files

Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 10 files). Show all

Unified · Split

@@ -532,7 +532,7 @@ int32_t ParamValidationExt (SLogContext* pLogCtx, SWelsSvcCodingParam* pCodingPa · 531 unmodified lines
532	532	return ENC_RETURN_UNSUPPORTED_PARA;
533	533	}
534	534
535		− if (pCodingParam->uiMaxNalSize <= (NAL_HEADER_ADD_0X30BYTES + MAX_MACROBLOCK_SIZE_IN_BYTE)) {
	535	+ if (pCodingParam->uiMaxNalSize < (NAL_HEADER_ADD_0X30BYTES + MAX_MACROBLOCK_SIZE_IN_BYTE)) {
536	536	WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidationExt(), invalid uiMaxNalSize (%d) settings! should be larger than (NAL_HEADER_ADD_0X30BYTES + MAX_MACROBLOCK_SIZE_IN_BYTE)(%d)",
537	537	pCodingParam->uiMaxNalSize, (NAL_HEADER_ADD_0X30BYTES + MAX_MACROBLOCK_SIZE_IN_BYTE));
538	538	return ENC_RETURN_UNSUPPORTED_PARA;

Keyboard shortcuts