fix level-idc related input checking and a statistics calculation will change bs but tested there is little impact on RD being reviewed at: https://rbcommons.com/s/OpenH264/r/1084/

Sijia Chen committed 11 years ago

Commit f1362431 parent de68ec610 files · +7709 −7718Browse files

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

Unified · Split

codec/encoder/core/src/encoder_ext.cpp+3−6

@@ -139,12 +139,9 @@ void CheckProfileSetting (SLogContext* pLogCtx, SWelsSvcCodingParam* pParam, int · 138 unmodified lines
139	139	void CheckLevelSetting (SLogContext* pLogCtx, SWelsSvcCodingParam* pParam, int32_t iLayer, ELevelIdc uiLevelIdc) {
140	140	SSpatialLayerConfig* pLayerInfo = &pParam->sSpatialLayers[iLayer];
141	141	pLayerInfo->uiLevelIdc = uiLevelIdc;
142		− if (uiLevelIdc == LEVEL_UNKNOWN) {
143		− pLayerInfo->uiLevelIdc = LEVEL_1_0;
144		− WelsLog (pLogCtx, WELS_LOG_INFO, "change LEVEL_UNKNOWN to LEVEL_1_0");
145		− } else if ((uiLevelIdc < LEVEL_1_0) \|\| (uiLevelIdc > LEVEL_5_2)) {
146		− pLayerInfo->uiLevelIdc = LEVEL_1_0;
147		− WelsLog (pLogCtx, WELS_LOG_WARNING, "doesn't support level(%d) change to LEVEL_1_0", uiLevelIdc);
	142	+ if (uiLevelIdc > LEVEL_5_2) {
	143	+ WelsLog (pLogCtx, WELS_LOG_INFO, "change unexpected levelidc(%d) setting to LEVEL_UNKNOWN", pLayerInfo->uiLevelIdc );
	144	+ pLayerInfo->uiLevelIdc = LEVEL_UNKNOWN;
148	145	}
149	146	}
150	147	void CheckReferenceNumSetting (SLogContext* pLogCtx, SWelsSvcCodingParam* pParam, int32_t iNumRef) {