Fix calculation of num ref frames

Varun B Patil committed 12 years ago

Commit 422d1d11 parent 9d5bc6f1 file · +2 −1Browse files

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

Unified · Split

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

@@ -346,7 +346,7 @@ int CWelsH264SVCEncoder::InitializeInternal(SWelsSvcCodingParam* pCfg) { · 345 unmodified lines
346	346	}
347	347	if (pCfg->iUsageType == SCREEN_CONTENT_REAL_TIME) {
348	348	if (pCfg->bEnableLongTermReference) {
349		− pCfg->iLTRRefNum = WELS_CLIP3(pCfg->iLTRRefNum,1,LONG_TERM_REF_NUM_SCREEN);;
	349	+ pCfg->iLTRRefNum = WELS_CLIP3(pCfg->iLTRRefNum,1,LONG_TERM_REF_NUM_SCREEN);
350	350	pCfg->iNumRefFrame = WELS_MAX(1,WELS_LOG2 (pCfg->uiGopSize)) + pCfg->iLTRRefNum;
351	351	} else {
352	352	pCfg->iLTRRefNum = 0;
@@ -355,6 +355,7 @@ int CWelsH264SVCEncoder::InitializeInternal(SWelsSvcCodingParam* pCfg) { · 2 unmodified lines
355	355	} else {
356	356	pCfg->iLTRRefNum = pCfg->bEnableLongTermReference ? WELS_CLIP3(pCfg->iLTRRefNum,1,LONG_TERM_REF_NUM) : 0;
357	357	pCfg->iNumRefFrame = ((pCfg->uiGopSize >> 1) > 1) ? ((pCfg->uiGopSize >> 1) + pCfg->iLTRRefNum) :
	358	+ (MIN_REF_PIC_COUNT + pCfg->iLTRRefNum);
358	359	pCfg->iNumRefFrame = WELS_CLIP3 (pCfg->iNumRefFrame, MIN_REF_PIC_COUNT, MAX_REFERENCE_PICTURE_COUNT_NUM);
359	360	}
360	361