remove RC enable flag, use RC Mode to indicate RC on or off

volvet committed 12 years ago

Commit d98ba611 parent 501c77f12 files · +40 −44Browse files

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

Unified · Split

codec/encoder/core/src/slice_multi_threading.cpp+2−2

@@ -205,7 +205,7 @@ void DynamicAdjustSlicing (sWelsEncCtx* pCtx, · 204 unmodified lines
205	205
206	206	int32_t iNumMbInEachGom = 0;
207	207	SWelsSvcRc* pWelsSvcRc = &pCtx->pWelsSvcRc[iCurDid];
208		− if (pCtx->pSvcParam->bEnableRc) {
	208	+ if (pCtx->pSvcParam->iRCMode != RC_OFF_MODE) {
209	209	iNumMbInEachGom = pWelsSvcRc->iNumberMbGom;
210	210
211	211	if (iNumMbInEachGom <= 0) {
@@ -237,7 +237,7 @@ void DynamicAdjustSlicing (sWelsEncCtx* pCtx, · 25 unmodified lines
237	237	int32_t iNumMbAssigning = (int32_t) (kiCountNumMb * pSliceComplexRatio[iSliceIdx] + EPSN);
238	238
239	239	// GOM boundary aligned
240		− if (pCtx->pSvcParam->bEnableRc) {
	240	+ if (pCtx->pSvcParam->iRCMode != RC_OFF_MODE) {
241	241	iNumMbAssigning = (int32_t) (1.0f * iNumMbAssigning / iNumMbInEachGom + 0.5f + EPSN) * iNumMbInEachGom;
242	242	}
243	243