only supports fixed LTR_NUM for screen and camera

ruil2 committed 12 years ago

Commit 2626ed21 parent e138ee52 files · +4 −4Browse files

Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 2 files). Show all

Unified · Split

codec/encoder/plus/src/welsEncoderExt.cpp+2−2

@@ -355,7 +355,7 @@ int CWelsH264SVCEncoder::InitializeInternal (SWelsSvcCodingParam* pCfg) { · 354 unmodified lines
355	}	355	}
356	if (pCfg->iUsageType == SCREEN_CONTENT_REAL_TIME) {	356	if (pCfg->iUsageType == SCREEN_CONTENT_REAL_TIME) {
357	if (pCfg->bEnableLongTermReference) {	357	if (pCfg->bEnableLongTermReference) {
358	pCfg->iLTRRefNum = WELS_CLIP3 (pCfg->iLTRRefNum, 1, LONG_TERM_REF_NUM_SCREEN);	358	pCfg->iLTRRefNum = LONG_TERM_REF_NUM_SCREEN;
359	if (pCfg->iNumRefFrame == AUTO_REF_PIC_COUNT)	359	if (pCfg->iNumRefFrame == AUTO_REF_PIC_COUNT)
360	pCfg->iNumRefFrame = WELS_MAX (1, WELS_LOG2 (pCfg->uiGopSize)) + pCfg->iLTRRefNum;	360	pCfg->iNumRefFrame = WELS_MAX (1, WELS_LOG2 (pCfg->uiGopSize)) + pCfg->iLTRRefNum;
361	} else {	361	} else {
@@ -364,7 +364,7 @@ int CWelsH264SVCEncoder::InitializeInternal (SWelsSvcCodingParam* pCfg) { · 2 unmodified lines
364	pCfg->iNumRefFrame = WELS_MAX (1, pCfg->uiGopSize >> 1);	364	pCfg->iNumRefFrame = WELS_MAX (1, pCfg->uiGopSize >> 1);
365	}	365	}
366	} else {	366	} else {
367	pCfg->iLTRRefNum = pCfg->bEnableLongTermReference ? WELS_CLIP3 (pCfg->iLTRRefNum, 1, LONG_TERM_REF_NUM) : 0;	367	pCfg->iLTRRefNum = pCfg->bEnableLongTermReference ? LONG_TERM_REF_NUM : 0;
368	if (pCfg->iNumRefFrame == AUTO_REF_PIC_COUNT) {	368	if (pCfg->iNumRefFrame == AUTO_REF_PIC_COUNT) {
369	pCfg->iNumRefFrame = ((pCfg->uiGopSize >> 1) > 1) ? ((pCfg->uiGopSize >> 1) + pCfg->iLTRRefNum) :	369	pCfg->iNumRefFrame = ((pCfg->uiGopSize >> 1) > 1) ? ((pCfg->uiGopSize >> 1) + pCfg->iLTRRefNum) :
370	(MIN_REF_PIC_COUNT + pCfg->iLTRRefNum);	370	(MIN_REF_PIC_COUNT + pCfg->iLTRRefNum);